summaryrefslogtreecommitdiff
path: root/includes
AgeCommit message (Collapse)AuthorFilesLines
2011-02-22Merge branch 'upstream' into devjacksonmj3-9/+8
Conflicts: src/main.c
2011-02-22Update versionSimon1-2/+2
2011-02-21UI improvements for elements menuSimon2-7/+6
2011-02-21Zoom key conflict with international keyboardsjacksonmj1-2/+0
Change zoom key to only use keysym.sym, like all the other keyboard controls. This may mean it is no longer the 'z' key on all systems, but will prevent it conflicting with the other keyboard controls.
2011-02-20Zoom key conflict with international keyboardsjacksonmj1-2/+0
Change zoom key to only use keysym.sym, like all the other keyboard controls. This may mean it is no longer the 'z' key on all systems, but will prevent it conflicting with the other keyboard controls.
2011-02-20Fix some compiler warningsjacksonmj1-0/+1
2011-02-19Fix saving of display mode from keys and fix persistent displaySimon1-0/+1
2011-02-19Minor versionSimon1-1/+1
2011-02-19Move reset code to own functionjacksonmj2-0/+2
Also clear persistent view when loading a save or clearing the screen.
2011-02-13Visual Studio compatibilityjacksonmj1-0/+4
Also fix two compiler warnings
2011-02-11update with latestCracker642-11/+13
2011-02-09Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-ToySimon2-8/+9
2011-02-09"Added Air modes using Gravitymode code"Cate1-0/+1
2011-02-08Sound device not compulsoryjacksonmj1-1/+1
2011-02-07Prevent crashes in the event of ridiculous temperaturesjacksonmj1-4/+5
2011-02-07Improve console element parsingjacksonmj1-3/+3
GOL, 34, 2x2 now work. Element types can no longer be referred to by number, to remove ambiguity between type and particle number.
2011-02-04Fix AntimatterSimon1-1/+1
2011-02-04Merge with cracker, also fix versionSimon2-9/+9
2011-02-04merge jacksonmj's and much better string parsing because of a function i found.Cracker642-7/+7
2011-02-03missed some corrections, fixes GoLCracker642-4/+4
2011-02-01Update with simon, and drawing SPRK on walls crash fix.Cracker641-2/+2
2011-01-31Fix for liquids - jacksonmjSimon3-4/+7
2011-01-31Fix version for LoginSimon1-2/+2
2011-01-31merge jacksonmj's and simon's changes, and made mouse coords show up in ↵Cracker642-2/+5
debug so it is easier to get them.
2011-01-31ALL GLORY TO THE SAVASKSimon1-0/+2
2011-01-31Console improvementsjacksonmj1-2/+3
Can use x,y coordinates to specify which particle. ctype now also accepts element names. More sanity checking of input. delete command added.
2011-01-31Moved console commands into own function. Added running script files so ↵Cracker641-0/+2
console commands can be run instantly. Added create command. element names work, from jacksonmj.
2011-01-31Make console recognise element namesjacksonmj1-0/+2
2011-01-30Merge branch 'upstream' into devjacksonmj3-3/+8
2011-01-30update with latestCracker643-14/+15
2011-01-30Merge with crackers consoleSimon2-0/+3
2011-01-30added 'load' command, and a basic error message.Cracker641-1/+1
2011-01-30Added a console! it is pretty self explanitoryCracker642-0/+3
2011-01-29Use Sessions instead of saving passwordSimon2-3/+5
2011-01-29Consistent use of NGOL, better NSCN descriptionjacksonmj2-4/+4
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.