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
Simon
713034ed61
Cracker Merge
2010-12-27 23:21:26 +00:00
Cracker64
761ea03882
added a basic coldflame explosive, ignites from CFLM or something cold.
2010-12-27 17:29:05 -05:00
Cracker64
0dbb53606b
forgot PROP thing in powder.h, adjustments to heat glow and BOMB
2010-12-24 15:59:27 -05:00
Cracker64
65a60b3812
updated with BOMB
2010-12-24 15:00:59 -05:00
Simon
b86e6d96d0
Forgot to change particle states table
2010-12-24 15:38:14 +00:00
Simon
8f22758990
More awesome
2010-12-24 15:04:48 +00:00
Simon
1983512b3d
Hot metal glow for more views
2010-12-24 13:51:09 +00:00
Simon
db364c549f
You know, stuff.
2010-12-24 12:51:39 +00:00
Felix Wallin
2e57ba16f3
small fix for indention
2010-12-23 21:53:18 +01:00
Simon
bd9b01c3e2
Cracker Merge
2010-12-22 18:17:06 +00:00
Cracker64
321c570581
forgot to delete a note.
2010-12-22 01:31:22 -05:00
Cracker64
e5ebf1fb41
updated with latest, and FWRK crash fix, INST looks for INSL, wifi lines only show in debug mode.
2010-12-22 00:13:01 -05:00
Simon
5026bfa105
Revert "nice"
...
This reverts commit 14b4dfef87
2010-12-20 18:11:11 +00:00
Felix Wallin
14b4dfef87
nice
2010-12-20 14:34:55 +01:00
Simon
1e4e7ea475
Invis can now be used to turn photons into neutrons
2010-12-19 19:07:23 +00:00
Simon
e380237cbc
Fix merge
2010-12-19 17:29:30 +00:00
Simon
92d22ac590
Nibble is a noob, also fix for persistent mode bug
2010-12-19 14:20:38 +00:00
Cracker64
2dad930818
added spawnpoints for stickmen, so they respawn.
2010-12-18 23:22:10 -05:00
Cracker64
039a4e2f31
Added second stickman for Lulz, it works great though, controlled by wasd. 's' was moved to ctrl-s and d is ctrl-d
2010-12-18 02:14:53 -05:00
Cracker64
809676a1dc
added invertion to rotate, ctrl-shift-r, will invert x-axis. NEUT+ACID=ISOZ,GLOW+WATR=DEUT. added ` to toggle replace mode for people without insert keys
2010-12-17 01:35:27 -05:00
Cracker64
327ccb7bba
a rotate tool! ctrl-r, then select the area, it will rotate counterclockwise, no properties are saved right now, it deletes and recreates.
2010-12-16 00:17:08 -05:00
Cracker64
5b2c689394
another swch fix, desl fire fix, shift-g will make grid go down, BIZR glows from velocity in FIRE,ect. METL/BRMT/BMTL change color when heated in heat gradient view. other small changes.
2010-12-14 17:23:27 -05:00
Felix Wallin
9c805f8643
there we go
2010-12-14 21:59:37 +01:00
Felix Wallin
fae101b1df
we obviously need the particle index
2010-12-14 21:43:28 +01:00
Felix Wallin
4220fd8e35
The only thing it broke was compilation, fixed
2010-12-14 17:10:34 +01:00
Felix Wallin
455b27e3ce
started on function pointers. Pushing to master because of otherwise impossible merges
2010-12-14 17:08:37 +01:00
Simon
f1df4cae6a
Merge latest cracker changes
2010-12-12 12:24:38 +00:00
Cracker64
af72702434
few thingies before i go
2010-12-12 01:46:40 -05:00
Cracker64
dc318fa14a
more small changes/fixes. Generation count for GoL in debug, resets with 'r'.
2010-12-11 23:31:08 -05:00
Simon
be7acfd99b
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
2010-12-11 03:46:34 +00:00
Simon
d8cd71f912
cracker merge
2010-12-11 03:46:21 +00:00
Cracker64
95c4e49f53
Lots of small changes/fixes mentioned in my mod post.
2010-12-10 14:05:06 -05:00
Cracker64
d017764fbe
Photons no longer give heat to insulation type things. is basically the same as official besides a few bug fixes.
2010-12-08 14:53:53 -05:00
Cracker64
cbf41389a2
Bugfix for wifi, would cause a double spark if timed just right. updated to
2010-12-08 12:14:02 -05:00
Felix Wallin
c9f852085b
Revert "function pointers, not doing anything yet"
...
This reverts commit 048a0672c7
2010-12-08 17:34:18 +01:00
Felix Wallin
1b5f6b2dc0
Merge branches 'master' and 'function_pointers'
2010-12-08 17:14:12 +01:00
Felix Wallin
81d6cae1f2
test
2010-12-08 17:12:54 +01:00
Felix Wallin
048a0672c7
function pointers, not doing anything yet
2010-12-08 17:08:15 +01:00
Simon
46940a8e4f
Added saving of pause state and particle tmp value, removed INST from the menu
2010-12-07 16:26:53 +00:00
Cracker64
fff7ecedf8
removed battery from INST wire, some other small fixes
2010-12-06 18:54:09 -05:00
Simon
122babe356
Added ARAY, a instant ray that can create holograms and transfer electrical energy
2010-12-06 19:32:33 +00:00
Cracker64
efb7c6bc9c
updated with simon's changes
2010-12-05 21:56:46 -05:00
Simon
40ab51d79f
Cracker64 merge
2010-12-05 15:49:48 +00:00
Cracker64
2cf25c8a6a
FILT, a photon color filter, not really a filter right now, but it changes the color. Other small changes
2010-12-04 23:29:41 -05:00
Cracker64
d56684312d
WIFI, a wireless SPRK transmitter, has 25 'channels' controlled by temp. starting at 0C, every 100 degrees is a different channel, they are colored as well. Heat-gradient display, colors of elements is slightly changed based on temp. maybe some other fixes.
2010-12-04 12:24:54 -05:00
Cracker64
01a2dcaf41
lots and lots of small changes/fixes. fixed typo for water movement, made parts_avg kinda better? electronics still work.
2010-12-03 00:13:00 -05:00
Cracker64
656b5ff496
SHLD, element that grows from spark and will regrow if damaged. Lots of other small changes and fixes. replace mode ONLY draws on the element to be replaced.
2010-12-01 15:27:13 -05:00
Cracker64
491016eaf4
Fixed love crash on mac, added adjustable grid mode, hit 'g', goes up to 9.
2010-11-30 14:43:42 -05:00
Cracker64
bb16ffa2bb
PUMP is now powered and blue, fixed some wall probems, portals are more random, maybe fixed love for mac?
2010-11-29 22:42:36 -05:00
Cracker64
77a17ecaee
VINE, plant grows up the side of WOOD. INST wire is now also a battery and will charge if it doesn't give off a spark right away. Will give spark to NSCN or SWCH that is on. found some more wall defines i missed. moved wall code up 100 numbers. INVS, solid that turns invisible to elements when under pressure.
2010-11-28 16:58:57 -05:00
