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
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
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
Simon
b3735bb84b
Version change
2011-01-09 12:20:15 +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
Simon
764e3966bb
Improvements to fancy display
2011-01-08 21:03:43 +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
4a046e77c2
Verson
2011-01-08 19:01:43 +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
Simon
2a3af54e92
Kiosk mode, full screen. requested by dante3rd
2011-01-06 08:55:10 +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