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

386 Commits

Author SHA1 Message Date
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
Cracker64
225dab24ea fix some rare SWCH problems 2011-01-12 19:11:46 -05:00
Cracker64
1c8df0f09e fix photon heating particle number 0 2011-01-12 16:36:08 -05:00
jacksonmj
daa6af0cc2 Small fixes and cleanup 2011-01-11 21:17:02 +00:00
Cracker64
c7f1e2e423 fix 1px brush replace mode 2011-01-11 10:45:16 -05:00
jacksonmj
4006bdf4c2 Merge branch 'upstream' into dev 2011-01-11 13:44:52 +00:00
jacksonmj
cf1ef72584 Rearrange some code, make heat transfer run faster 2011-01-10 23:33:58 +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
Cracker64
d6837437f2 fix c-5 floodfill 2011-01-09 16:16:59 -05:00
jacksonmj
88d107f18a Better channel handling 2011-01-09 21:12:25 +00:00
jacksonmj
6094753eb1 Fix photon reflection (second attempt). 
Previous attempt broke photons in glass.
 2011-01-09 20:42:52 +00:00
jacksonmj
134d8a6874 Prevent cloning PSCN/NSCN by PCLN. 2011-01-09 19:31:34 +00:00
jacksonmj
144e4bdb69 Begin cleanup of update functions 2011-01-09 19:23:05 +00:00
jacksonmj
56a3ad373c Fix photon reflection. 
In cases such as photons travelling horizontally left towards a line
with a shallow slope downwards from left to right.

Direction map now includes directions parallel to photon
velocity in these cases.
 2011-01-09 14:15:09 +00:00
Cracker64
6b06d37ca5 update with simon, and some other changes from jacksonmj. 2011-01-08 21:23:46 -05:00
Cracker64
164681f4e6 GoL speed improvements from jacksonmj (thank you very much) 2011-01-08 17:55:14 -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
Simon
ad7dc345d2 Fix 2 stickman bug 2011-01-08 18:30:29 +00: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
Simon
b83b2f1d27 Convection 2011-01-08 17:38:36 +00:00
jacksonmj
f53826b150 Speed up heat transfer calculations. 2011-01-08 11:00:43 +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
74f6ee8eb5 Oops, fix INWR conductivity. 2011-01-07 20:37:51 +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
fa1868314c Shrink GOL wrapping code. GSPEED now works. 2011-01-07 18:15:36 +00:00
Cracker64
52573e94f9 two red BRAYS will toggle SWCH, could be used for something... 2011-01-07 13:07:46 -05: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
a46a484f2e Fix acid drawing and 'purple acid' 2011-01-05 20:36:09 +00:00
Simon
e2d4ae5763 Damn it git, WHAT ARE YOU DOING? 2011-01-05 20:05:40 +00:00
Simon
71c5d53f7f Changes by cracker 2011-01-05 19:42:31 +00:00
Cracker64
cf2489916c some ARAY changes so that more complex things can be made, http://powdertoy.co.uk/Browse/View.html?ID=103300 2011-01-05 14:12:31 -05: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
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
c3eb6e11f9 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2011-01-01 12:43:44 +00:00
Cracker64
28f1b88ea0 fix INST crash, forgot to change PCLN to work with all GoL. 2011-01-01 01:01:19 -05: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
97e7850de5 oops, was testing 2010-12-30 16:56:11 -05:00
Cracker64
2b253cf73c simon update and small SING change to make it betterer. 2010-12-30 16:55:02 -05:00
Simon
265b360078 Less laggy SDEUT 2010-12-30 21:42:50 +00:00
Cracker64
8604d27c7a simon updates, and SING improvements 2010-12-30 14:59:39 -05:00
FacialTurd
e561aeb321 Whoops 2010-12-30 04:26:48 -08:00
Simon
99e8ce0542 Testing Some DEUT 2010-12-30 11:48:32 +00: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
c913fd55d3 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-29 22:24:29 +00:00
Cracker64
8df470662f ARAY gets colored by FILT, woo 2010-12-29 17:22:18 -05:00