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 |
|
Cracker64
|
1eeda3f5cc
|
ANAR, behaves opposite of dust. fix fuse loading, floodfilling of neut/photons.
|
2010-11-25 01:01:28 -05:00 |
|
Philip
|
f02d504656
|
Added PSTE, a colloid element that turns solid under pressure. WTF is now radioactive with neutrons. boom.
|
2010-11-24 00:42:20 -05:00 |
|
Philip
|
d89e7e4abe
|
added ISOZ, isotope z, radioactive liquid, reacts with photons, not neutrons.Has a solid form that slowly decays away. uses negative pressure. Instant wire INST, conducts instantly, like walls. Only takes spark from PSCN and only gives it to NSCN. Portal elements. PRTI is the 'in' side, and PRTO is where they come out. you don't need a lot.
|
2010-11-23 13:28:57 -05:00 |
|
Philip
|
50f4da5996
|
plnt eats smoke and gives off o2. GLAS acts as insulation for acid, kind of
|
2010-11-22 15:54:35 -05:00 |
|
Philip
|
60e4c076cb
|
floodfill fix, @_@ elements, grav changes color
|
2010-11-22 15:36:24 -05:00 |
|
Simon
|
9684fdc377
|
Small changes
|
2010-11-22 20:06:20 +00:00 |
|
Philip
|
3d2292890b
|
Fixed ehole, made wall code use defines, wall specific deletion.
|
2010-11-21 01:08:33 -05:00 |
|
Philip
|
a38dddaf5a
|
Made wall code use #defines. small fix for adjustabl brush.
|
2010-11-19 22:03:52 -05:00 |
|
Philip
|
c1182db42d
|
Fixed SWCH for real. Fix repeating spark while creating it. Adjustable x and y for brushes.
|
2010-11-19 18:01:56 -05:00 |
|
Philip
|
435f71c781
|
Added FRZZ FRZW GRAV. add square brush, hit tab to switch between the two. pipe ctype saves.
|
2010-11-18 23:27:24 -05:00 |
|