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

247 Commits

Author SHA1 Message Date
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
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
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