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

249 Commits

Author SHA1 Message Date
Simon Robertshaw
5919cefa85 Decorations are per particle TODO: remove references to the decorations buffer 2011-05-27 14:44:56 +01:00
jacksonmj
956218736b Fix a few solids affected by n-gravity 2011-05-24 21:49:09 +08:00
jacksonmj
fc4de9640c Fix sim options description, GOO and DEUT 2011-05-24 21:49:08 +08:00
Simon Robertshaw
dadac37264 Move Diamond into solids menu, add gravity elements 2011-05-20 13:00:34 +01:00
jacksonmj
c4140955de Life decrement property for soap 2011-05-14 13:44:33 +01:00
jacksonmj
cbfc73d8d6 Turn WIND into a tool 2011-05-14 13:43:51 +01:00
jacksonmj
26dbf70709 Fix overlapping particles 2011-05-14 13:39:40 +01:00
Simon Robertshaw
fa54c005b2 Use properties for life decrement/kill 2011-05-14 13:38:52 +01:00
jacksonmj
c23124e0d7 Shrink draw_tool_xy 2011-05-14 13:28:24 +01:00
Simon Robertshaw
16f014b06a Move wall drawing to graphics.c 2011-05-14 13:28:02 +01:00
Cracker64
59bd280fad ANAR changes, WHOL absorbs ANAR and gets colder. ANAR burns with CFLM strangely. 2011-05-05 20:38:30 +01:00
Simon Robertshaw
5aefd0cb01 Initial soap commit 2011-05-05 20:14:35 +01:00
Cracker64
24f5905020 portal now uses particles as storage, so it keeps everything. 2011-04-25 19:00:27 +01:00
Cate
5fd31116a0 Added IRON to Prop_heatglowsomething. :D So it doesn't look as weird when it comes out of lava. Just a visual touch. 2011-04-19 18:09:46 +01:00
Simon
626cc8fa6a Remove a TON of warnings 2011-04-08 15:28:57 +01:00
Simon
c51c31c12d IRON now in menu 2011-04-08 14:47:08 +01:00
Simon
767d73c5fc astyle 2011-04-08 11:09:42 +01:00
AntB
db406494bd Added H2: 
Will reduce DESL to WATR and OIL under pressure
	Will fuse with O2 under pressure to make WATR
 2011-04-04 23:18:26 +08:00
Simon
d48f7fc73a O2 header changes 2011-03-29 19:20:46 +01:00
Cracker64
53bc3b817d QRTZ grow changes, uses ctype. 2011-03-29 18:25:11 +01:00
Simon
a589f78429 ... and wood 2011-03-25 11:46:17 +00:00
Simon
eb5826c3da Fix neutron penetration for PLANT 2011-03-25 11:44:20 +00:00
Simon
a186714a7f Move thunder to explosive 2011-03-24 21:11:46 +00:00
Simon
3639fd96b1 Move Portal to special and Photons to nuclear 2011-03-24 20:19:26 +00:00
Simon
3ab47ae9d7 Effects for PRTO and PRTI 2011-03-24 19:41:45 +00:00
Simon
c096b2b14a More cracker fixes 2011-03-22 17:25:29 +00:00
jacksonmj
d46a3bdcb0 Better rotation and inversion, also does single pixel translation 2011-03-18 19:33:38 +00:00
Cracker64
3b048f8a06 merge merge merge 2011-03-10 15:43:27 -05:00
Simon
fd6f6c5406 WIND from cracker! 2011-02-24 17:11:05 +00:00
Cracker64
bf24a26139 forgot powder.h, and renamed drag to wind 2011-02-24 00:51:09 -05:00
Simon
5d4d815ad3 Fancier glow, now affected by Velocity, Pressure and Heat 2011-02-23 20:35:02 +00:00
Cracker64
a8439f221e updating 2011-02-22 20:55:09 -05:00
Simon
bb0b4e6802 UI improvements for elements menu 2011-02-21 17:57:17 +00:00
Cracker64
e882dfecf9 update with latest 2011-02-10 19:46:34 -05:00
Simon
3de4d163a5 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-02-09 15:56:30 +00:00
Cate
d5fe05d760 "Added Air modes using Gravitymode code" 2011-02-09 23:52:28 +08:00
jacksonmj
b85c29dee4 Prevent crashes in the event of ridiculous temperatures 2011-02-07 20:29:11 +00:00
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
Cracker64
b6f1ba977c missed some corrections, fixes GoL 2011-02-03 17:28:08 -05:00
Cracker64
8ed2947b4c update with latest 2011-01-30 16:46:50 -05: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
Simon
0eb4089b08 Easier fancy effects, by Mur 2011-01-04 19:42:50 +00:00
Cracker64
5a37f32ca1 update with simon, and shift-v now does every other frame properly 2011-01-04 13:26:28 -05:00
Simon
3a2bc76643 Gravity control by Moach 2011-01-04 13:35:16 +00:00
Simon
6340ff2ac9 Merged new life types from cracker 2010-12-31 11:26:52 +00:00
Cracker64
6519fc167e 7 more gol types, fixed gol code to work with it. 2010-12-31 00:52:40 -05:00
Simon
c98099f8df Small changes to SING from cracker 2010-12-30 22:38:27 +00:00
Cracker64
2b253cf73c simon update and small SING change to make it betterer. 2010-12-30 16:55:02 -05:00
Simon
b92e6b391f Merge recent cracker changes 2010-12-30 09:55:43 +00:00
Cracker64
2212d04fb0 added SING, QRTZ and PQRT, see mod thread on forum. 2010-12-30 00:46:35 -05:00
Simon
3715925dd9 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-29 21:15:40 +00:00
Cracker64
25b95e211e new display, Life, shows life in a grayscale gradient, will ONLY show up in debug mode, on shift-1, fix filt floodfill, portal has bigger storage, other fixes. 2010-12-29 09:44:12 -05:00