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

449 Commits

Author SHA1 Message Date
Cate
d3452b01c8 OMG FIXES. Lots of fixes for triangle brush to make sure it works, from Cracker. Edited CLST to prevent "popcorning" when its float hits weird numbers. Also fixed it so it freezes nicely when cooled. Fingers are back! :DDD 2011-07-12 18:46:33 +01:00
Cate
45fe00bef9 Added Cracker changes for adding a triangle brush! :DDD Seems to work without any issues. 2011-07-12 23:29:22 +08:00
Simon Robertshaw
d7053422f1 fix potential crashes with LIFE - jacksonmj 2011-07-12 06:54:47 -07:00
jacksonmj
1be79e581d Line snapping (hold down Alt when drawing a line) 
Specific element select changed to Ctrl+Alt
 2011-07-12 21:48:54 +08:00
Cate
0ce4104c7a Added CLST element, which is Clay dust, for making concrete with water. :D Neat due to element cohesion with itself, which causes it to sludge downwards in a way very uncharacteristic of any current powder. Cohesion is very easy to modify. Thanks to Savask for help with cohesion code. :D 2011-07-12 21:00:21 +08:00
Simon Robertshaw
d42e06f37a Merge all GOL types into PT_LIFE, behaviour is determined by ctype 2011-07-09 18:22:25 +01:00
Cate
d2eb6f1cb3 Deleted whole repository due to weirdness with recognizing folder. From current source, added Cracker64's changes that make 1px pipe several times faster than thicker pipe. Doesn't break saves. :D 2011-07-08 18:09:16 +01:00
Simon Robertshaw
25a2b52b64 Savask experimental heat transfer 2011-07-01 11:32:10 +01:00
Simon Robertshaw
437f13f424 Powered Breakable clone, Gravity Pump, New menu section for powered elements (needs icon) 2011-06-28 13:58:16 +01:00
Simon Robertshaw
3fe82bf525 Jagged arcs 2011-06-27 18:16:25 +01:00
Simon Robertshaw
36ee81fc6b Better photons for persistent display, ability to toggle gravity view (ctrl+g) 2011-06-27 14:01:07 +01:00
jacksonmj
4043dba74c Small fixes for liquids in radial/Newtonian gravity 2011-06-25 15:51:38 +01:00
jacksonmj
636b1db4d2 Better liquids movement in radial/Newtonian gravity 2011-06-25 15:51:07 +01:00
jacksonmj
e67ec08052 Fix fast photons reflecting through obstacles 2011-06-25 15:50:51 +01:00
jacksonmj
9d325dbb7c Fix walls for SING explosions 2011-06-25 15:50:41 +01:00
jacksonmj
fb79865186 Fix gravmap build up during repeated frame stepping 2011-06-25 15:50:32 +01:00
Simon Robertshaw
8f97f6c5c7 Revert "Heat simulation improvement." 
This reverts commit 5e43bb0510.
 2011-06-15 13:11:29 +01:00
Simon Robertshaw
daa67b13bd Revert "Prevent photons stealing heat energy" 
This reverts commit aac8898f42.
 2011-06-15 13:10:45 +01:00
Simon Robertshaw
aac8898f42 Prevent photons stealing heat energy 2011-06-14 18:41:01 +01:00
savask
5e43bb0510 Heat simulation improvement. 2011-06-14 17:13:25 +01:00
Simon Robertshaw
304a2fa819 Revert "Better heat treatment." 
This reverts commit 37df2abe90731f2da814a4463f406b0afe9308f9.
 2011-06-14 17:11:24 +01:00
savask
0fbc55dfe8 Better heat treatment. 2011-06-14 16:50:04 +01:00
Simon Robertshaw
1f7106acb1 Gravity zoning 2011-06-09 22:35:00 +01:00
jacksonmj
1144e3e2d7 Create mercury with tmp value 2011-06-08 12:48:18 +01:00
jacksonmj
2ddb24d5b0 Fix WL_DESTROYALL for fast particles; and no H2 ignition from SPRK 
H2 igniting from spark causes too many problems for electrolysis
 2011-06-08 12:47:03 +01:00
savask
a48e477fca Moved detach(i) function to powder.c, made soap display connections when 
it's double-joined, made portal in detach soap before teleportating
(works strangely)
 2011-06-05 01:09:02 +08:00
jacksonmj
469de0cae0 Fix air-particle heat transfer 
Heat transfer rate is proportional to temperature difference.

Previously, the code caused the temperature change to be proportional to
absolute temperature.
 2011-06-02 20:19:46 +01:00
jacksonmj
099ab10a37 Walls no longer limit fast particles to 2 pixels per frame 2011-06-02 20:19:18 +01:00
jacksonmj
bc44af6a0b INVS should leave photons alone when under pressure 2011-06-02 20:19:10 +01:00
Simon Robertshaw
c003fee63e Ambient heat (disabled by default) 2011-06-01 20:18:19 +01:00
jacksonmj
f603e33e74 Small speed improvement to eval_move 
Warning: may be buggy, test thoroughly.
 2011-05-29 13:36:11 +01:00
jacksonmj
5e414e64dc Fix WIND decoration, and reset dcolour in create_part 2011-05-29 13:35:00 +01:00
jacksonmj
6a2f357efd Revert "Pass decorations to saving functions (doesn't actually save yet)" 
This reverts commit 7fe99f3210.

Conflicts:

	src/main.c
 2011-05-29 13:34:37 +01:00
jacksonmj
ab7cd2e5f6 Skip some calls to do_move for liquids 
No liquid can occupy the same space as itself unless in E-Hole
 2011-05-28 18:51:57 +08:00
jacksonmj
420f8e7442 Make NBHL/NWHL eat things in the same way as BHOL/WHOL 
Also make ANAR move opposite to Newtonian gravity
 2011-05-28 18:51:57 +08:00
jacksonmj
7482e4d071 Small fix for liquid and powder movement 2011-05-19 22:53:23 +08:00
jacksonmj
68c4d6d621 Make sure WIND can't be created 
Revert this if the element number is reused for something useful
 2011-05-19 22:53:23 +08:00
jacksonmj
e4b03fb2e2 Photons and neutrons go through portal instead of reflecting 2011-05-19 22:53:23 +08:00
jacksonmj
e675fb3cc1 Fix crash with negative lava ctype 
E.g. "set type prti lava"
 2011-05-14 13:44:44 +01:00
jacksonmj
7fe99f3210 Pass decorations to saving functions (doesn't actually save yet) 2011-05-14 13:44:02 +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
jacksonmj
882a839205 Fix high speed photons when reflecting near glass 2011-05-14 13:39:14 +01:00
Simon Robertshaw
fa54c005b2 Use properties for life decrement/kill 2011-05-14 13:38:52 +01:00
Simon Robertshaw
73f2f9f57f fix neutron cloning 2011-05-14 13:34:06 +01:00
Simon Robertshaw
16f014b06a Move wall drawing to graphics.c 2011-05-14 13:28:02 +01:00
Simon Robertshaw
33eb485c9f Revert "-a" 
This reverts commit 550d270af2.
 2011-05-14 13:09:46 +01:00
Simon Robertshaw
550d270af2 -a 2011-05-14 13:02:36 +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
jacksonmj
b5a334c2af Improve piling of powders 2011-05-05 20:36:14 +01:00
jacksonmj
a7b5718c6a Fixes for previous commit 
Previous commit caused buggy movement in walls
 2011-05-05 20:33:42 +01:00
jacksonmj
ddaed2ad69 Slight speed improvement for liquids and powders 2011-05-05 20:33:09 +01:00
jacksonmj
7543a3d05e Fix plut lava 
type already set to ctype and ctype already cleared, whoops.
 2011-05-05 20:31:46 +01:00
savask
3ea306cc77 Some changes to soap. 2011-05-05 20:24:21 +01:00
Simon Robertshaw
5aefd0cb01 Initial soap commit 2011-05-05 20:14:35 +01:00
Simon Robertshaw
981e17927b Fix BMTL and gravity breaking 2011-04-26 16:57:04 +01:00
Simon Robertshaw
06c0949beb Gravity breaks elements like pressure does (Doesn't work for broken metal and needs tweaking a little) 2011-04-26 16:46:57 +01:00
Simon Robertshaw
b26648e6ae Fix pause with gravity and test deuterium improvements 2011-04-25 20:41:45 +01:00
jacksonmj
3bfa39ecf3 Fix crash when setting fan direction with caps lock on 2011-04-23 07:52:59 +08:00
Simon Robertshaw
13ff21bb22 Gravitaaaay (Needs tweeking for performance) 2011-04-22 17:06:09 +01:00
jacksonmj
d6a28b6427 Use malloc in transform_save 
Should fix crashes on Windows caused by stack overflow
 2011-04-16 17:26:07 +01:00
Simon
767d73c5fc astyle 2011-04-08 11:09:42 +01:00
Simon
922befd844 Fix O2 and H2 files, also fix zero life death 2011-04-04 16:40:22 +01:00
jacksonmj
4d80abc399 Fix neutrons crash 
Also fix neutrons causing unwanted movement of parts[0]
 2011-04-04 16:12:52 +01:00
Simon
651208c5fb Prevent dust residue from FWRK 
Conflicts:

	src/powder.c
 2011-04-04 16:09:05 +01:00
Simon
b7a004986f A cracker commit with some nice comments 2011-03-30 18:57:49 +01:00
Cracker64
53bc3b817d QRTZ grow changes, uses ctype. 2011-03-29 18:25:11 +01:00
Simon
82d0d63be9 Awesome QRTZ from Cate 2011-03-24 20:06:22 +00:00
Simon
3ab47ae9d7 Effects for PRTO and PRTI 2011-03-24 19:41:45 +00:00
Simon
fe90c86fa1 SING pops when it runs out of life 2011-03-24 15:47:44 +00:00
Simon
7d56b33589 Fix some WIND bugs 2011-03-22 17:14:45 +00:00
Simon
cf4572ec5f Fixes from jacksonmj 2011-03-22 16:15:41 +00:00
jacksonmj
df27f8420d Fix crash when trying to move to invalid co-ordinates 2011-03-21 16:26:58 +00:00
jacksonmj
f316b1fdb9 Remove redundant rotate/invert code and correct rotation direction 2011-03-18 20:14:19 +00:00
jacksonmj
d46a3bdcb0 Better rotation and inversion, also does single pixel translation 2011-03-18 19:33:38 +00:00
jacksonmj
1802c160c4 Remove code to delete SPAWN when stickman produced 
Code doesn't actually do anything in official source, due to operator
precedence and lack of brackets.
 2011-03-18 00:26:12 +00:00
jacksonmj
3b3a173dc9 Remove neutrons from pmap 2011-03-17 21:42:07 +00:00
jacksonmj
0208410952 flood_parts uninitialised variable 2011-03-16 11:39:31 +00:00
Cracker64
20edfacae5 fix "water spark bounce" 2011-03-03 04:05:51 +08:00
Cracker64
4f4796b469 INST works with caps lock/replace mode, and fix some replace mode out of screen crashes. 2011-03-03 04:05:51 +08:00
Cracker64
13e90886c1 fix "water spark bounce" 2011-03-01 13:33:10 -05:00
Cracker64
30ceffa46d INST works with caps lock/replace mode, and fix some replace mode out of screen crashes. 2011-02-28 19:48:53 -05:00
jacksonmj
ded7bdf30d Merge branch 'upstream' into dev 
Conflicts:
	src/main.c
 2011-02-26 19:32:51 +00:00
Simon
fd6f6c5406 WIND from cracker! 2011-02-24 17:11:05 +00:00
Cracker64
83d89ad4cd rename drag to wind 2011-02-24 00:52:37 -05:00
Cracker64
98a61e0e20 a drag tool! 2011-02-24 00:26:37 -05:00
Cracker64
879dd43e31 Fix GoL to not set gol2 on other things 2011-02-24 09:16:17 +08:00
jacksonmj
3011367eb0 Fix particles displaced by liquids moving to overlapping positions 2011-02-24 09:15:39 +08:00
jacksonmj
a64c202834 Fix lava freezing point 2011-02-24 09:15:39 +08:00
jacksonmj
71a6654c03 Fix particles displaced by liquids moving to overlapping positions 2011-02-24 00:57:13 +00:00
jacksonmj
7ecaa16362 Fix lava freezing point 2011-02-23 21:15:54 +00:00
Cracker64
cf80586ddc Fix GoL to not set gol2 on other things 2011-02-23 13:33:36 -05:00
Cracker64
9b3c25227a Reduce GoL lag 2011-02-24 01:04:43 +08:00
Cracker64
bdcc6e3fba Reduce GoL lag 2011-02-22 20:55:50 -05:00
Cracker64
a8439f221e updating 2011-02-22 20:55:09 -05:00
jacksonmj
b3278cf888 Fix some compiler warnings 2011-02-20 20:46:26 +00:00
jacksonmj
72e6fdd9f6 Preventing creation of invalid types also prevented use of air/temp tools 2011-02-19 07:07:08 +08:00
jacksonmj
df8c13cc58 create_box improvements 
Boxes now have sharp corners - they fill only the specified rectangle and not 1 pixel extra
on all sides.
 2011-02-19 07:06:22 +08:00
jacksonmj
81ce5d74cc Crash when element with invalid type is created 
Generally due to an invalid ctype for clone.
 2011-02-19 07:06:22 +08:00
jacksonmj
1b23302513 FLAG_STAGNANT usage lost during rewrite 2011-02-19 07:06:21 +08:00
jacksonmj
dab9f85024 Fix incorrect liquids movement 2011-02-19 07:06:21 +08:00
jacksonmj
914cf28fa7 create_box improvements 
Boxes now have sharp corners - they fill only the specified rectangle and not 1 pixel extra
on all sides.
 2011-02-16 21:22:39 +00:00
jacksonmj
29a63795dd Preventing creation of invalid types also prevented use of air/temp tools 2011-02-16 20:56:43 +00:00
jacksonmj
7ef2363f90 Crash when element with invalid type is created 
Generally due to an invalid ctype for clone.
 2011-02-15 22:24:29 +00:00
jacksonmj
8c531c5286 FLAG_STAGNANT usage lost during rewrite 2011-02-13 21:59:45 +00:00
jacksonmj
99be47c8bd Fix incorrect liquids movement 2011-02-13 21:43:19 +00:00
Simon
b0b736d49e Moved Gravity identifiers, added gravity mode and air mode to save format 2011-02-13 13:42:38 +00:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility 
Also fix two compiler warnings
 2011-02-13 00:30:54 +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
7c100f29c0 gol2 not resetting properly 
Causes life to malfunction severely in some cases
 2011-02-08 22:32:06 +00:00
jacksonmj
ee100cb4f0 Fix GoL deleting particle 0 2011-02-07 15:24:08 +00:00
jacksonmj
6749eb1960 More flood_parts fixes 
kill_part needs to update photon map, otherwise delete_part keeps
deleting the same photon, leading to infinite flood_parts recursion.
 2011-02-06 20:24:20 +00:00
jacksonmj
b7e50f521c Fix flood_parts crashes 
Crashes due to infinite recursion in flood_parts, which seemed to be caused by
the pmap being incorrect.
 2011-02-06 17:16:49 +00:00
Cracker64
9064cabf28 merge jacksonmj's and much better string parsing because of a function i found. 2011-02-04 01:00:03 -05:00
jacksonmj
d21d1f7ba5 Merge branch 'upstream' into dev 2011-02-03 18:47:23 +00:00
jacksonmj
54caad7a69 Possible fix for liquids transferring spark through INSL 2011-02-03 12:04:11 +00:00
jacksonmj
5b1210714d More fixes 
Fix PHOT and FWRK.
Fix QRTZ conductivity (broken by removing PROP_CONDUCTS)
Add some things lost during rewrite: NTCT/PTCT not heated if INSL in the way;
boiling point varies with pressure.
 2011-02-02 17:49:56 +00:00
jacksonmj
77bcac1a56 Small fixes 
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
 2011-02-01 16:06:48 +00:00
Cracker64
c558df240b made set work with all of one type of a particle (set type dust deut) turns all dust into deut 2011-01-31 23:30:53 -05:00
Cracker64
fea297b2ac Update with simon, and drawing SPRK on walls crash fix. 2011-01-31 22:53:32 -05:00
jacksonmj
d52fa30a45 Attempt fix for liquids 2011-01-31 22:00:12 +00: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
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
jacksonmj
2654996599 Fix disappearing WTRV 
If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.
 2011-01-27 22:38:47 +00:00
Cracker64
60d3f0047b quartz shouldn't have prop_conducts, and fixed visual studio compiling 2011-01-20 14:10:34 -05:00
Cracker64
b25a6ecd59 some photon fixes, and better resets on reload/clear 2011-01-19 16:24:54 -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
ff01973658 made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8. 2011-01-19 13:48:59 -05:00
Cracker64
5c65d69dac missed some bitshifts, which caused a few glitches. Everything seems normal 2011-01-18 00:45:14 -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
db5bb618c1 fix loading of old GoL saves, and fix wall crash 2011-01-16 13:54:36 -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
c5670d39c1 Misc small fixes and tidyup 2011-01-15 20:21:22 +00:00
jacksonmj
de58e9a2e7 Fix E-hole 
Was broken for powders by fixing fast moving particles going through obstacles.
For gasses, was broken in upstream.
 2011-01-15 17:01:20 +00: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
c7213127e5 Temporarily undo photon reflection fix (causes inaccuracies). 2011-01-15 15:36:42 +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
2d79fa5cfe fix photon causing infinite sparks 2011-01-14 21:23:23 -05:00
Cracker64
e33fb40e2d oops, didn't need the floodfill thing there. 2011-01-14 11:05:08 -05:00
Cracker64
b673be0ac2 a fix so photons can be deleted and show up on HUD :) 2011-01-14 00:29:32 -05: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