summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
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 w...Cracker642-2/+6
2011-01-30Console segfault fixjacksonmj2-1/+4
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
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
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
2011-01-28Change include file for element update functionsjacksonmj64-63/+70
2011-01-27Fix disappearing WTRVjacksonmj1-0/+2
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
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 curren...Cracker646-923/+935
2011-01-19made all the shifts and type checks use defines, so it can be changed easier,...Cracker644-783/+786
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 t...Cracker645-784/+788
2011-01-17Cracker mergeSimon6-146/+283
2011-01-17more life types using states, put them in new menu. Maybe get some way to swi...Cracker645-12/+38
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, givin...Cracker644-35/+96
2011-01-15Misc small fixes and tidyupjacksonmj6-42/+32
2011-01-15Fix E-holejacksonmj1-20/+22
2011-01-15Merge branch 'cracker64' into devjacksonmj4-18/+110
2011-01-15Temporarily undo photon reflection fix (causes inaccuracies).jacksonmj1-24/+23
2011-01-15Attempt fix for some cases of fast particles going through obstaclesjacksonmj2-180/+221
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 :)Cracker643-4/+22
2011-01-13Split elements/misc.c into separate functionsjacksonmj9-56/+69