summaryrefslogtreecommitdiff
path: root/includes
AgeCommit message (Collapse)AuthorFilesLines
2011-01-29Merge remote branch 'cracker64' into devjacksonmj3-17/+18
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-2/+3
2011-01-29Other things overwritten, and changes from jacksonmjCracker641-2/+2
2011-01-29oops, silly copy file, and fixed the new GoL from simon's fail merging.Cracker642-16/+16
2011-01-28update to latestCracker647-414/+527
2011-01-28INWR should cool after being sparked; and correct function parametersjacksonmj1-3/+3
Also correct grule size and replicate existing freezing point behaviour for lava with strange ctypes.
2011-01-28Restore cracker64 changes overwritten by mergejacksonmj1-11/+10
2011-01-28Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-ToySimon1-0/+8
2011-01-28Fix some problems with restrict_fltjacksonmj1-0/+1
This change fixes pressure glitches, burning substances cooling by themselves to absolute zero, and SING having temperatures of minus several million Kelvin.
2011-01-28Change include file for element update functionsjacksonmj1-0/+7
2011-01-27Merge with jacksonmj, Warning: potential for lot of bugsSimon6-414/+519
2011-01-27Fixes from crackerSimon1-1/+1
2011-01-20quartz shouldn't have prop_conducts, and fixed visual studio compilingCracker641-1/+1
2011-01-19revert all limit changes, a little too glitchy, can be done later when ↵Cracker642-45/+42
current limit is reached.
2011-01-19made all the shifts and type checks use defines, so it can be changed ↵Cracker641-0/+3
easier, and put it back to normal with a shift of 8.
2011-01-18test with increased element limit, there seems to be no performace decrease ↵Cracker641-2/+2
to me anyway. element limit of 4096
2011-01-17Cracker mergeSimon3-41/+70
2011-01-17more life types using states, put them in new menu. Maybe get some way to ↵Cracker643-9/+21
switch to new menu on mouseover of last spot of current life menu
2011-01-16Made GoL code work with more advanced rules with different life states, ↵Cracker642-25/+40
giving more interesting rules.
2011-01-15Merge branch 'cracker64' into devjacksonmj1-0/+2
Conflicts: includes/powder.h src/graphics.c src/main.c src/powder.c
2011-01-15Attempt fix for some cases of fast particles going through obstaclesjacksonmj1-0/+1
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-14a fix so photons can be deleted and show up on HUD :)Cracker641-0/+2
2011-01-13Split elements/misc.c into separate functionsjacksonmj1-7/+13
2011-01-13Correct spellingjacksonmj1-14/+14
2011-01-13Merge element state into ptypes.jacksonmj1-307/+146
All of the pstates array except .state was replaced by ptransitions.
2011-01-13Exaggerate convection, misc rearrangement + fixesjacksonmj1-4/+4
2011-01-11Merge branch 'upstream' into devjacksonmj2-6/+12
2011-01-10fix QRTZ spot saving, rotate should change FAN vector as wellCracker641-1/+1
2011-01-10Finish update function cleanupjacksonmj1-3/+3
2011-01-09Better channel handlingjacksonmj1-3/+3
2011-01-09Begin cleanup of update functionsjacksonmj1-0/+7
2011-01-09Version changeSimon1-1/+1
2011-01-09update with simon, and some other changes from jacksonmj.Cracker642-13/+15
2011-01-08Merge branch 'master' of git://github.com/cracker64/The-Powder-ToySimon1-0/+1
2011-01-08Improvements to fancy displaySimon1-1/+1
2011-01-08add ctype transfer to portalCracker641-0/+1
2011-01-08Function pointers + minor adjustments.jacksonmj1-10/+12
2011-01-08VersonSimon1-1/+1
2011-01-08New Element from cracker - BOYLSimon1-1/+4
2011-01-08forgot BOYL descriptionCracker641-1/+1
2011-01-08BOYL, a gas that evens out pressure related to its temp, kind of a gas PUMP, ↵Cracker641-1/+4
but not really, BOYL+WATR=FOG BOYL+O2=WATR, possibly hydrogen in the future?
2011-01-08Changes from crackerSimon1-4/+4
2011-01-08Yet more function pointers.jacksonmj1-6/+11
2011-01-07Further function pointers.jacksonmj1-8/+14
2011-01-07More electricity rewrite.jacksonmj1-2/+4
2011-01-07Tidy up.jacksonmj1-1/+1
2011-01-07Some more function pointersjacksonmj1-19/+38
2011-01-07Rewrite electricity code.jacksonmj1-2/+2
2011-01-07Use PROP_CONDUCTS more.jacksonmj1-9/+9
2011-01-07More function pointers.jacksonmj1-24/+46