summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-01-31Small changes from crackerSimon2-11/+30
2011-01-31Fix for liquids - jacksonmjSimon6-288/+436
2011-01-31Attempt fix for liquidsjacksonmj1-5/+5
2011-01-31Fix login for non-elevated usersSimon1-1/+9
2011-01-31Fix version for LoginSimon1-2/+2
2011-01-31merge jacksonmj's and simon's changes, and made mouse coords show up in ↵Cracker646-79/+240
debug so it is easier to get them.
2011-01-31ALL GLORY TO THE SAVASKSimon5-3/+79
2011-01-31Console improvementsjacksonmj3-66/+131
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-31Merge branch 'cracker64' into devjacksonmj2-275/+325
Conflicts: src/interface.c src/main.c
2011-01-31stupid git, didn't take description changeCracker641-4/+7
2011-01-31Moved console commands into own function. Added running script files so ↵Cracker643-255/+337
console commands can be run instantly. Added create command. element names work, from jacksonmj.
2011-01-31Make console recognise element namesjacksonmj3-17/+50
2011-01-31Merge branch 'upstream' into devjacksonmj2-1/+4
2011-01-30Fix bugs with console.Simon2-2/+8
2011-01-30possible fix from jacksonmj, cursor gets set to end while changing commands ↵Cracker642-2/+6
with up/down
2011-01-30Console segfault fixjacksonmj2-1/+4
ed.str is deallocated when console_ui returns. Dereferencing the returned pointer to ed.str therefore results in bad things.
2011-01-30Merge branch 'upstream' into devjacksonmj7-27/+459
2011-01-30update with latestCracker648-45/+158
2011-01-30Command buffer, limit is 9, I thinkSimon1-1/+65
2011-01-30Merge branch 'master' of github.com:FacialTurd/The-Powder-ToySimon1-0/+1
2011-01-30Merge with crackers consoleSimon4-2/+324
2011-01-30added 'load' command, and a basic error message.Cracker643-5/+22
2011-01-30Added a console! it is pretty self explanitoryCracker644-2/+307
2011-01-29Missing header for CM_COUNTFacialTurd1-0/+1
2011-01-29Missing file, also fix cmode savingSimon1-3/+9
2011-01-29Use Sessions instead of saving passwordSimon4-23/+62
2011-01-29Consistent use of NGOL, better NSCN descriptionjacksonmj4-7/+7
2011-01-29Merge remote branch 'cracker64' into devjacksonmj10-31/+95
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, yayCracker644-3/+5
2011-01-29fix some visual studio issues.Cracker643-3/+4
2011-01-29Other things overwritten, and changes from jacksonmjCracker644-24/+27
2011-01-29oops, silly copy file, and fixed the new GoL from simon's fail merging.Cracker647-6317/+116
2011-01-28update to latestCracker6480-16149/+22610
2011-01-28INWR should cool after being sparked; and correct function parametersjacksonmj3-8/+8
Also correct grule size and replicate existing freezing point behaviour for lava with strange ctypes.
2011-01-28Restore cracker64 changes overwritten by mergejacksonmj3-34/+40
2011-01-28Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-ToySimon65-63/+73
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 functionsjacksonmj64-63/+70
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 bugsSimon80-16150/+16324
2011-01-27Fixes from crackerSimon3-9/+23
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 compilingCracker642-3/+3
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 ↵Cracker646-923/+935
current limit is reached.
2011-01-19made all the shifts and type checks use defines, so it can be changed ↵Cracker644-783/+786
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 ↵Cracker645-784/+788
to me anyway. element limit of 4096
2011-01-17Cracker mergeSimon6-146/+283