Simon
|
1307af5c57
|
Fix saving of display mode from keys and fix persistent display
|
2011-02-19 18:59:07 +00:00 |
|
Simon
|
809289b13d
|
ALL GLORY TO THE SAVASK
|
2011-02-13 14:38:42 +00:00 |
|
Simon
|
e6ab5b0f36
|
Fix Clickable signs
|
2011-02-13 14:03:06 +00:00 |
|
Simon
|
b0b736d49e
|
Moved Gravity identifiers, added gravity mode and air mode to save format
|
2011-02-13 13:42:38 +00:00 |
|
jacksonmj
|
d57c5ef5e0
|
Visual Studio compatibility
Also fix two compiler warnings
|
2011-02-13 00:30:54 +00:00 |
|
Simon
|
3de4d163a5
|
Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy
|
2011-02-09 15:56:30 +00:00 |
|
Cate
|
d5fe05d760
|
"Added Air modes using Gravitymode code"
|
2011-02-09 23:52:28 +08:00 |
|
jacksonmj
|
6bbc5328fc
|
Sound device not compulsory
|
2011-02-08 14:30:02 +00:00 |
|
jacksonmj
|
e791e21c3e
|
Fix x,y not always updating and particle # not showing when BETA defined
|
2011-02-06 17:52:35 +00:00 |
|
FacialTurd
|
3a4b7f6983
|
Uninitialised pointer segfault if not previously logged in - jacksonmj
|
2011-02-06 04:41:48 -08:00 |
|
jacksonmj
|
196ccd1e36
|
Uninitialised pointer segfault if not previously logged in
|
2011-02-04 20:53:15 +00:00 |
|
jacksonmj
|
2569d244d4
|
Merge branch 'upstream' into dev
Conflicts:
src/powder.c
|
2011-02-04 19:59:50 +00:00 |
|
Simon
|
aef66fbfe3
|
Session checking on startup and compatibility fixes
|
2011-02-04 12:16:45 +00:00 |
|
Simon
|
dd5ca12223
|
We don't want any buffer overflow, especially when reading file and user input
|
2011-02-04 11:42:11 +00:00 |
|
Simon
|
9469a3b46a
|
Merge with cracker, also fix version
|
2011-02-04 10:24:35 +00:00 |
|
Cracker64
|
9064cabf28
|
merge jacksonmj's and much better string parsing because of a function i found.
|
2011-02-04 01:00:03 -05:00 |
|
Cracker64
|
1755f08e44
|
variables and if statements for scripts, GoL is glitchy for me, i don't know why
|
2011-02-03 16:38:58 -05:00 |
|
jacksonmj
|
d21d1f7ba5
|
Merge branch 'upstream' into dev
|
2011-02-03 18:47:23 +00:00 |
|
Simon
|
525a59e280
|
Fixes from cracker64, also lolsounds
|
2011-02-03 15:37:55 +00:00 |
|
Cracker64
|
db038e9643
|
HERE are the doubled memsets
|
2011-02-02 00:18:22 -05:00 |
|
Cracker64
|
2fb7c944cd
|
fix a few things, some memsets were doubled.
|
2011-02-02 00:15:57 -05:00 |
|
Cracker64
|
5383311cba
|
testing playing .wav files. lol sounds
|
2011-02-01 20:35:41 -05:00 |
|
Cracker64
|
c558df240b
|
made set work with all of one type of a particle (set type dust deut) turns all dust into deut
|
2011-01-31 23:30:53 -05:00 |
|
Simon
|
c78d4203ee
|
Small changes from cracker
|
2011-01-31 22:17:44 +00:00 |
|
Simon
|
b033a9655d
|
Fix for liquids - jacksonmj
|
2011-01-31 22:10:34 +00:00 |
|
Cracker64
|
c1ca8bae29
|
merge jacksonmj's and simon's changes, and made mouse coords show up in debug so it is easier to get them.
|
2011-01-31 13:12:29 -05:00 |
|
Simon
|
8363a21f23
|
ALL GLORY TO THE SAVASK
|
2011-01-31 16:54:13 +00:00 |
|
jacksonmj
|
5bf8755655
|
Console improvements
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-31 16:36:40 +00:00 |
|
jacksonmj
|
363a3e38f1
|
Merge branch 'cracker64' into dev
Conflicts:
src/interface.c
src/main.c
|
2011-01-31 14:05:05 +00:00 |
|
Cracker64
|
b7f768e4b3
|
Moved console commands into own function. Added running script files so console commands can be run instantly. Added create command. element names work, from jacksonmj.
|
2011-01-31 00:12:47 -05:00 |
|
jacksonmj
|
cdd7399cc1
|
Make console recognise element names
|
2011-01-31 02:42:34 +00:00 |
|
jacksonmj
|
f85ef31b1f
|
Merge branch 'upstream' into dev
|
2011-01-31 02:25:55 +00:00 |
|
Cracker64
|
6aaa9e78cd
|
possible fix from jacksonmj, cursor gets set to end while changing commands with up/down
|
2011-01-30 18:15:53 -05:00 |
|
jacksonmj
|
e2b916a91f
|
Console segfault fix
ed.str is deallocated when console_ui returns. Dereferencing the
returned pointer to ed.str therefore results in bad things.
|
2011-01-30 22:37:59 +00:00 |
|
jacksonmj
|
f97990fedd
|
Merge branch 'upstream' into dev
|
2011-01-30 22:36:15 +00:00 |
|
Cracker64
|
8ed2947b4c
|
update with latest
|
2011-01-30 16:46:50 -05:00 |
|
Simon
|
8510421b37
|
Merge with crackers console
|
2011-01-30 20:05:47 +00:00 |
|
Cracker64
|
fcf958da21
|
added 'load' command, and a basic error message.
|
2011-01-30 15:00:54 -05:00 |
|
Cracker64
|
e18337a70a
|
Added a console! it is pretty self explanitory
|
2011-01-30 01:23:24 -05:00 |
|
jacksonmj
|
5d34cae2e4
|
Consistent use of NGOL, better NSCN description
|
2011-01-29 11:20:34 +00:00 |
|
Cracker64
|
964ecf2ecf
|
Other things overwritten, and changes from jacksonmj
|
2011-01-28 20:13:29 -05:00 |
|
Cracker64
|
880ed33fc7
|
oops, silly copy file, and fixed the new GoL from simon's fail merging.
|
2011-01-28 19:58:54 -05:00 |
|
Cracker64
|
bcea95c5ca
|
update to latest
|
2011-01-28 18:54:50 -05:00 |
|
jacksonmj
|
a5ff51f5a5
|
Restore cracker64 changes overwritten by merge
|
2011-01-28 21:46:40 +00:00 |
|
Simon
|
e9ae32b0cc
|
Merge with jacksonmj, Warning: potential for lot of bugs
|
2011-01-27 20:32:34 +00:00 |
|
Cracker64
|
e7f2eb92c5
|
ctrl-'=' will reset sparks
|
2011-01-19 17:56:55 -05:00 |
|
Cracker64
|
b25a6ecd59
|
some photon fixes, and better resets on reload/clear
|
2011-01-19 16:24:54 -05:00 |
|
Cracker64
|
1b35811bd4
|
revert all limit changes, a little too glitchy, can be done later when current limit is reached.
|
2011-01-19 14:25:56 -05:00 |
|
Cracker64
|
ff01973658
|
made all the shifts and type checks use defines, so it can be changed easier, and put it back to normal with a shift of 8.
|
2011-01-19 13:48:59 -05:00 |
|
Cracker64
|
e1eeaf9e9a
|
test with increased element limit, there seems to be no performace decrease to me anyway. element limit of 4096
|
2011-01-17 19:11:30 -05:00 |
|