summaryrefslogtreecommitdiff
path: root/src/main.c
AgeCommit message (Collapse)AuthorFilesLines
2011-02-11update with latestCracker641-121/+227
2011-02-09Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-ToySimon1-107/+113
2011-02-09"Added Air modes using Gravitymode code"Cate1-1/+29
2011-02-08Sound device not compulsoryjacksonmj1-3/+10
2011-02-06hidden menu shows up correctlyCracker641-1/+1
2011-02-06Fix x,y not always updating and particle # not showing when BETA definedjacksonmj1-4/+3
2011-02-06particle # shows up againCracker641-1/+1
2011-02-06Uninitialised pointer segfault if not previously logged in - jacksonmjFacialTurd1-1/+1
2011-02-04Uninitialised pointer segfault if not previously logged injacksonmj1-1/+1
2011-02-04Merge branch 'upstream' into devjacksonmj1-16/+160
Conflicts: src/powder.c
2011-02-04Session checking on startup and compatibility fixesSimon1-2/+75
2011-02-04We don't want any buffer overflow, especially when reading file and user inputSimon1-2/+2
2011-02-04Merge with cracker, also fix versionSimon1-14/+85
2011-02-04merge jacksonmj's and much better string parsing because of a function i found.Cracker641-43/+7
2011-02-03variables and if statements for scripts, GoL is glitchy for me, i don't know whyCracker641-6/+113
2011-02-03Merge branch 'upstream' into devjacksonmj1-17/+176
2011-02-03Fixes from cracker64, also lolsoundsSimon1-8/+167
2011-02-02HERE are the doubled memsetsCracker641-4/+0
2011-02-02fix a few things, some memsets were doubled.Cracker641-2/+2
2011-02-02testing playing .wav files. lol soundsCracker641-3/+85
2011-02-01made set work with all of one type of a particle (set type dust deut) turns ↵Cracker641-1/+82
all dust into deut
2011-01-31Small changes from crackerSimon1-1/+19
2011-01-31Fix for liquids - jacksonmjSimon1-256/+306
2011-01-31merge jacksonmj's and simon's changes, and made mouse coords show up in ↵Cracker641-47/+84
debug so it is easier to get them.
2011-01-31ALL GLORY TO THE SAVASKSimon1-0/+29
2011-01-31Console improvementsjacksonmj1-45/+34
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 devjacksonmj1-270/+316
Conflicts: src/interface.c src/main.c
2011-01-31Moved console commands into own function. Added running script files so ↵Cracker641-255/+316
console commands can be run instantly. Added create command. element names work, from jacksonmj.
2011-01-31Make console recognise element namesjacksonmj1-17/+32
2011-01-31Merge branch 'upstream' into devjacksonmj1-1/+1
2011-01-30possible fix from jacksonmj, cursor gets set to end while changing commands ↵Cracker641-1/+4
with up/down
2011-01-30Console segfault fixjacksonmj1-0/+3
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 devjacksonmj1-2/+270
2011-01-30update with latestCracker641-5/+9
2011-01-30Merge with crackers consoleSimon1-2/+270
2011-01-30added 'load' command, and a basic error message.Cracker641-1/+15
2011-01-30Added a console! it is pretty self explanitoryCracker641-2/+256
2011-01-29Consistent use of NGOL, better NSCN descriptionjacksonmj1-1/+1
2011-01-29Other things overwritten, and changes from jacksonmjCracker641-12/+19
2011-01-29oops, silly copy file, and fixed the new GoL from simon's fail merging.Cracker641-1/+1
2011-01-28update to latestCracker641-2099/+2051
2011-01-28Restore cracker64 changes overwritten by mergejacksonmj1-16/+27
2011-01-27Merge with jacksonmj, Warning: potential for lot of bugsSimon1-2099/+2051
2011-01-19ctrl-'=' will reset sparksCracker641-0/+10
2011-01-19some photon fixes, and better resets on reload/clearCracker641-4/+8
2011-01-19revert all limit changes, a little too glitchy, can be done later when ↵Cracker641-19/+19
current limit is reached.
2011-01-19made all the shifts and type checks use defines, so it can be changed ↵Cracker641-13/+13
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-17/+17
to me anyway. element limit of 4096
2011-01-17more life types using states, put them in new menu. Maybe get some way to ↵Cracker641-1/+1
switch to new menu on mouseover of last spot of current life menu
2011-01-16fix loading of old GoL saves, and fix wall crashCracker641-1/+6