summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2011-01-29Merge remote branch 'cracker64' into devjacksonmj7-14/+77
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-29finally fixed visual studio compiling, yayCracker642-1/+2
2011-01-29fix some visual studio issues.Cracker643-3/+4
2011-01-29Other things overwritten, and changes from jacksonmjCracker643-22/+25
2011-01-29oops, silly copy file, and fixed the new GoL from simon's fail merging.Cracker644-6291/+74
2011-01-28update to latestCracker6473-15735/+22083
2011-01-28INWR should cool after being sparked; and correct function parametersjacksonmj2-5/+5
Also correct grule size and replicate existing freezing point behaviour for lava with strange ctypes.
2011-01-28Restore cracker64 changes overwritten by mergejacksonmj2-23/+30
2011-01-28Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-ToySimon64-63/+65
2011-01-28Change include file for element update functionsjacksonmj63-63/+63
2011-01-27Fix disappearing WTRVjacksonmj1-0/+2
If water is sparked then quickly heated past 100C, the resulting WTRV will disappear after a few frames.
2011-01-27Merge with jacksonmj, Warning: potential for lot of bugsSimon72-15735/+15803
2011-01-23Fix SIGFPE when opening creations with exactly 50 up/down votesjacksonmj1-6/+7
Only occurs on optimised (using $(OFLAGS) in Makefile) builds
2011-01-20quartz shouldn't have prop_conducts, and fixed visual studio compilingCracker641-2/+2
2011-01-19ctrl-'=' will reset sparksCracker641-0/+10
2011-01-19some photon fixes, and better resets on reload/clearCracker642-6/+10
2011-01-19revert all limit changes, a little too glitchy, can be done later when ↵Cracker644-878/+893
current limit is reached.
2011-01-19made all the shifts and type checks use defines, so it can be changed ↵Cracker643-783/+783
easier, and put it back to normal with a shift of 8.
2011-01-18missed some bitshifts, which caused a few glitches. Everything seems normalCracker641-7/+7
2011-01-18test with increased element limit, there seems to be no performace decrease ↵Cracker644-782/+786
to me anyway. element limit of 4096
2011-01-17more life types using states, put them in new menu. Maybe get some way to ↵Cracker642-3/+17
switch to new menu on mouseover of last spot of current life menu
2011-01-16fix loading of old GoL saves, and fix wall crashCracker642-2/+7
2011-01-16Made GoL code work with more advanced rules with different life states, ↵Cracker642-10/+56
giving more interesting rules.
2011-01-15Misc small fixes and tidyupjacksonmj6-42/+32
2011-01-15Fix E-holejacksonmj1-20/+22
Was broken for powders by fixing fast moving particles going through obstacles. For gasses, was broken in upstream.
2011-01-15Merge branch 'cracker64' into devjacksonmj3-18/+108
Conflicts: includes/powder.h src/graphics.c src/main.c src/powder.c
2011-01-15Temporarily undo photon reflection fix (causes inaccuracies).jacksonmj1-24/+23
2011-01-15Attempt fix for some cases of fast particles going through obstaclesjacksonmj1-180/+220
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-15fix photon causing infinite sparksCracker641-1/+3
2011-01-14oops, didn't need the floodfill thing there.Cracker641-3/+6
2011-01-14a fix so photons can be deleted and show up on HUD :)Cracker642-4/+20
2011-01-13Split elements/misc.c into separate functionsjacksonmj8-49/+56
2011-01-13Correct spellingjacksonmj1-3/+3
2011-01-13Merge element state into ptypes.jacksonmj7-34/+34
All of the pstates array except .state was replaced by ptransitions.
2011-01-13Fix permanent stickman death.jacksonmj3-0/+4
2011-01-13Exaggerate convection, misc rearrangement + fixesjacksonmj4-87/+91
2011-01-13fix some rare SWCH problemsCracker641-1/+1
2011-01-12fix photon heating particle number 0Cracker641-1/+1
2011-01-12portal was invisible in debug, oopsCracker641-0/+2
2011-01-12line for portals. wifi channels reset on reload.Cracker642-0/+32
2011-01-11Small fixes and cleanupjacksonmj5-12/+12
2011-01-11fix 1px brush replace modeCracker641-1/+9
2011-01-11Merge branch 'upstream' into devjacksonmj10-23/+108
2011-01-10Rearrange some code, make heat transfer run fasterjacksonmj2-112/+87
2011-01-10fix QRTZ spot saving, rotate should change FAN vector as wellCracker643-6/+21
2011-01-10Finish update function cleanupjacksonmj28-496/+486
2011-01-10More update functions cleanup.jacksonmj16-266/+247
2011-01-09fix c-5 floodfillCracker641-3/+3
2011-01-09Better channel handlingjacksonmj4-13/+7
2011-01-09Fix photon reflection (second attempt).jacksonmj1-8/+8
Previous attempt broke photons in glass.