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

261 Commits

Author SHA1 Message Date
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
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
c5c88529c2 slight temp loading change so PUMP will load with 0C if saved at 0C. fix visual studio compiling 2010-12-26 09:47:25 -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
16f7cdaef6 Merge branch 'master' of git://github.com/cracker64/The-Powder-Toy 2010-12-24 18:13:13 +00:00
Simon
8f22758990 More awesome 2010-12-24 15:04:48 +00:00
Simon
db364c549f You know, stuff. 2010-12-24 12:51:39 +00:00
Cracker64
41d9dca73f oops, that wasn't needed 2010-12-23 15:48:11 -05:00
Cracker64
ff1255afd2 a fix for 1 pixel brush and flood fill crashing in certain builds. 2010-12-23 15:46:06 -05:00
Simon
bd9b01c3e2 Cracker Merge 2010-12-22 18:17:06 +00: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
314e937ec8 Allow building with Visual Studio, at the loss of some functionality, also, updates to version number 2010-12-19 18:39:39 +00:00
Simon
e380237cbc Fix merge 2010-12-19 17:29:30 +00:00
Simon
24e662bc2d BRAY is not blocked by INWR or ARAY 2010-12-19 15:46:02 +00:00
Simon
49a1baffe2 Correct file 2010-12-19 14:32:40 +00:00
Cracker64
ee4bb84395 missed some parenthesis, caused some creating problems 2010-12-19 00:51:25 -05: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