summaryrefslogtreecommitdiff
path: root/src/main.c
AgeCommit message (Collapse)AuthorFilesLines
2011-02-26Merge branch 'upstream' into devjacksonmj1-28/+41
Conflicts: src/main.c
2011-02-24Pretty transparent consoleSimon1-18/+22
2011-02-24WIND from cracker!Simon1-2/+15
2011-02-23Increase debug coords string buffer to prevent crashesSimon1-1/+1
2011-02-22Make the help screen a bit cleanerSimon1-7/+3
2011-02-22Merge branch 'upstream' into devjacksonmj1-84/+123
Conflicts: src/main.c
2011-02-21Sound and scripts are opt-in, to speed up loading and closingSimon1-79/+98
2011-02-21Merge branch 'master' of github.com:FacialTurd/The-Powder-ToySimon1-16/+10
2011-02-21Zoom key conflict with international keyboardsjacksonmj1-1/+1
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-21Reduce overlap of HUD text when in debug/beta modejacksonmj1-15/+9
Also reduce duplication of some HUD code
2011-02-20Zoom key conflict with international keyboardsjacksonmj1-1/+1
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-20Reduce overlap of HUD text when in debug/beta modejacksonmj1-15/+9
Also reduce duplication of some HUD code
2011-02-20Fix some compiler warningsjacksonmj1-14/+13
2011-02-19Notication of authentication improvementSimon1-4/+23
2011-02-19Fix saving of display mode from keys and fix persistent displaySimon1-2/+3
2011-02-19Always save last display modejacksonmj1-1/+0
2011-02-19Move reset code to own functionjacksonmj1-39/+29
Also clear persistent view when loading a save or clearing the screen.
2011-02-13ALL GLORY TO THE SAVASKSimon1-4/+1
2011-02-13Fix Clickable signsSimon1-4/+3
2011-02-13Moved Gravity identifiers, added gravity mode and air mode to save formatSimon1-37/+42
2011-02-13Visual Studio compatibilityjacksonmj1-7/+9
Also fix two compiler warnings
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-06Fix x,y not always updating and particle # not showing when BETA definedjacksonmj1-4/+3
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.