jacksonmj
77bcac1a56
Small fixes
...
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
2011-02-01 16:06:48 +00:00
jacksonmj
d52fa30a45
Attempt fix for liquids
2011-01-31 22:00:12 +00:00
jacksonmj
5d34cae2e4
Consistent use of NGOL, better NSCN description
2011-01-29 11:20:34 +00:00
jacksonmj
9938378c0d
Merge remote branch 'cracker64' into dev
...
Conflicts:
includes/element.h
includes/powder.h
src/elements/firw.c
src/elements/legacy.c
src/elements/phot.c
src/elements/sprk.c
src/graphics.c
src/main.c
src/powder.c
2011-01-29 10:50:43 +00:00
Cracker64
964ecf2ecf
Other things overwritten, and changes from jacksonmj
2011-01-28 20:13:29 -05:00
Cracker64
880ed33fc7
oops, silly copy file, and fixed the new GoL from simon's fail merging.
2011-01-28 19:58:54 -05:00
Cracker64
bcea95c5ca
update to latest
2011-01-28 18:54:50 -05:00
jacksonmj
fe033ce859
INWR should cool after being sparked; and correct function parameters
...
Also correct grule size and replicate existing freezing point behaviour for lava
with strange ctypes.
2011-01-28 23:14:46 +00:00
jacksonmj
a5ff51f5a5
Restore cracker64 changes overwritten by merge
2011-01-28 21:46:40 +00:00
jacksonmj
2654996599
Fix disappearing WTRV
...
If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.
2011-01-27 22:38:47 +00:00
Cracker64
60d3f0047b
quartz shouldn't have prop_conducts, and fixed visual studio compiling
2011-01-20 14:10:34 -05:00
Cracker64
b25a6ecd59
some photon fixes, and better resets on reload/clear
2011-01-19 16:24:54 -05:00
Cracker64
1b35811bd4
revert all limit changes, a little too glitchy, can be done later when current limit is reached.
2011-01-19 14:25:56 -05:00
Cracker64
ff01973658
made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8.
2011-01-19 13:48:59 -05:00
Cracker64
5c65d69dac
missed some bitshifts, which caused a few glitches. Everything seems normal
2011-01-18 00:45:14 -05:00
Cracker64
e1eeaf9e9a
test with increased element limit, there seems to be no performace decrease to me anyway. element limit of 4096
2011-01-17 19:11:30 -05:00
Cracker64
db5bb618c1
fix loading of old GoL saves, and fix wall crash
2011-01-16 13:54:36 -05:00
Cracker64
b1e09d4216
Made GoL code work with more advanced rules with different life states, giving more interesting rules.
2011-01-16 01:29:49 -05:00
jacksonmj
c5670d39c1
Misc small fixes and tidyup
2011-01-15 20:21:22 +00:00
jacksonmj
de58e9a2e7
Fix E-hole
...
Was broken for powders by fixing fast moving particles going through obstacles.
For gasses, was broken in upstream.
2011-01-15 17:01:20 +00:00
jacksonmj
1833be451f
Merge branch 'cracker64' into dev
...
Conflicts:
includes/powder.h
src/graphics.c
src/main.c
src/powder.c
2011-01-15 16:23:51 +00:00
jacksonmj
c7213127e5
Temporarily undo photon reflection fix (causes inaccuracies).
2011-01-15 15:36:42 +00:00
jacksonmj
42d7b56602
Attempt fix for some cases of fast particles going through obstacles
...
Also change direction_to_map again, to revert to original version
(which has problems with some diagonal surfaces, but doesn't have noticeable inaccuracies)
for refraction.
2011-01-15 15:25:39 +00:00
Cracker64
2d79fa5cfe
fix photon causing infinite sparks
2011-01-14 21:23:23 -05:00
Cracker64
e33fb40e2d
oops, didn't need the floodfill thing there.
2011-01-14 11:05:08 -05:00
Cracker64
b673be0ac2
a fix so photons can be deleted and show up on HUD :)
2011-01-14 00:29:32 -05:00
jacksonmj
9707443b24
Merge element state into ptypes.
...
All of the pstates array except .state was replaced by ptransitions.
2011-01-13 21:31:24 +00:00
jacksonmj
def10c41ae
Exaggerate convection, misc rearrangement + fixes
2011-01-13 15:24:01 +00:00
Cracker64
225dab24ea
fix some rare SWCH problems
2011-01-12 19:11:46 -05:00
Cracker64
1c8df0f09e
fix photon heating particle number 0
2011-01-12 16:36:08 -05:00
jacksonmj
daa6af0cc2
Small fixes and cleanup
2011-01-11 21:17:02 +00:00
Cracker64
c7f1e2e423
fix 1px brush replace mode
2011-01-11 10:45:16 -05:00
jacksonmj
4006bdf4c2
Merge branch 'upstream' into dev
2011-01-11 13:44:52 +00:00
jacksonmj
cf1ef72584
Rearrange some code, make heat transfer run faster
2011-01-10 23:33:58 +00:00
Cracker64
f242566e30
fix QRTZ spot saving, rotate should change FAN vector as well
2011-01-10 09:43:16 -05:00
jacksonmj
54f9f872b9
Finish update function cleanup
2011-01-10 14:41:03 +00:00
Cracker64
d6837437f2
fix c-5 floodfill
2011-01-09 16:16:59 -05:00
jacksonmj
88d107f18a
Better channel handling
2011-01-09 21:12:25 +00:00
jacksonmj
6094753eb1
Fix photon reflection (second attempt).
...
Previous attempt broke photons in glass.
2011-01-09 20:42:52 +00:00
jacksonmj
134d8a6874
Prevent cloning PSCN/NSCN by PCLN.
2011-01-09 19:31:34 +00:00
jacksonmj
144e4bdb69
Begin cleanup of update functions
2011-01-09 19:23:05 +00:00
jacksonmj
56a3ad373c
Fix photon reflection.
...
In cases such as photons travelling horizontally left towards a line
with a shallow slope downwards from left to right.
Direction map now includes directions parallel to photon
velocity in these cases.
2011-01-09 14:15:09 +00:00
Cracker64
6b06d37ca5
update with simon, and some other changes from jacksonmj.
2011-01-08 21:23:46 -05:00
Cracker64
164681f4e6
GoL speed improvements from jacksonmj (thank you very much)
2011-01-08 17:55:14 -05:00
Simon
75e898e45b
Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy
2011-01-08 21:05:52 +00:00
Cracker64
0958a6e6da
add ctype transfer to portal
2011-01-08 15:33:54 -05:00
jacksonmj
7f83cb1061
Function pointers + minor adjustments.
2011-01-08 19:39:17 +00:00
Simon
548d052018
New Element from cracker - BOYL
2011-01-08 18:51:22 +00:00
Simon
ad7dc345d2
Fix 2 stickman bug
2011-01-08 18:30:29 +00:00
Cracker64
76304bac8d
BOYL, a gas that evens out pressure related to its temp, kind of a gas PUMP, but not really, BOYL+WATR=FOG BOYL+O2=WATR, possibly hydrogen in the future?
2011-01-08 13:16:14 -05:00
