matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
617 Commits 13 Branches 426 Tags 113 MiB
cb74b0bacf
Commit Graph

160 Commits

Author SHA1 Message Date
jacksonmj
cb74b0bacf Improve console element parsing 
GOL, 34, 2x2 now work. Element types can no longer be referred to by
number, to remove ambiguity between type and particle number.
 2011-02-07 17:13:31 +00:00
Simon
bb3964138c Fix Antimatter 2011-02-04 13:09:48 +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
4b5337c03a finally fixed visual studio compiling, yay 2011-01-28 21:57:20 -05: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
Simon
e9ae32b0cc Merge with jacksonmj, Warning: potential for lot of bugs 2011-01-27 20:32:34 +00:00
Cracker64
60d3f0047b quartz shouldn't have prop_conducts, and fixed visual studio compiling 2011-01-20 14:10:34 -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
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
926450a9a3 more life types using states, put them in new menu. Maybe get some way to switch to new menu on mouseover of last spot of current life menu 2011-01-16 20:54:41 -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
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
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
b673be0ac2 a fix so photons can be deleted and show up on HUD :) 2011-01-14 00:29:32 -05:00
jacksonmj
0221cdd355 Split elements/misc.c into separate functions 2011-01-13 22:51:55 +00:00
jacksonmj
7fb086065a Correct spelling 2011-01-13 21:56:17 +00: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
jacksonmj
4006bdf4c2 Merge branch 'upstream' into dev 2011-01-11 13:44:52 +00:00
jacksonmj
54f9f872b9 Finish update function cleanup 2011-01-10 14:41:03 +00:00
jacksonmj
88d107f18a Better channel handling 2011-01-09 21:12:25 +00:00
jacksonmj
144e4bdb69 Begin cleanup of update functions 2011-01-09 19:23:05 +00:00
Cracker64
6b06d37ca5 update with simon, and some other changes from jacksonmj. 2011-01-08 21:23:46 -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
Cracker64
b4fb2bf20a forgot BOYL description 2011-01-08 13:21:09 -05: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
Simon
cd08a7102c Changes from cracker 2011-01-08 17:40:30 +00:00
jacksonmj
d17758cc08 Yet more function pointers. 2011-01-08 09:00:59 +00:00
jacksonmj
9af0072b21 Further function pointers. 2011-01-07 23:05:26 +00:00
jacksonmj
685ede0643 More electricity rewrite. 2011-01-07 22:20:47 +00:00
jacksonmj
6908f3dd0b Tidy up. 2011-01-07 20:26:09 +00:00
jacksonmj
b69712bbdb Some more function pointers 2011-01-07 20:03:58 +00:00
jacksonmj
cb02bdfe21 Rewrite electricity code. 2011-01-07 18:00:31 +00:00
jacksonmj
aebcc0ebe4 Use PROP_CONDUCTS more. 2011-01-07 16:56:15 +00:00
jacksonmj
f3ded5f08c More function pointers. 2011-01-07 16:18:22 +00:00
jacksonmj
b661418d7e Replace pstates and some pressure ifs with array. 2011-01-07 14:47:10 +00:00
jacksonmj
1ab4d328a6 Start function pointers 2011-01-07 14:14:35 +00:00
jacksonmj
ed8c0031f4 Astyle. 2011-01-06 22:26:31 +00:00
Cracker64
45078b5933 update, and another small ARAY feature, goes through SWCH. 2011-01-05 18:34:39 -05:00
Simon
7e3530a705 Few changes and fixes from cracker for ptypes 2011-01-05 20:41:20 +00:00
Simon
5d7c0194f1 INST enabled. INST modifier for ARAY - makes it not stop 2011-01-05 17:42:39 +00:00
Cracker64
fd2f0c905b better liquid movement in radial gravity, '=' resets pressure, cannot draw stickman on clone anymore, 'w' does not work when stickman2 is out, use shift-w. 2011-01-04 20:53:24 -05:00