Commit Graph

116 Commits

Author SHA1 Message Date
Cracker64
b08c37342b Commands in signs, some don't fit 2011-02-14 20:32:01 -05:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility
Also fix two compiler warnings
2011-02-13 00:30:54 +00:00
Cracker64
e882dfecf9 update with latest 2011-02-10 19:46:34 -05:00
jacksonmj
cb74b0bacf Improve console element parsing
GOL, 34, 2x2 now work. Element types can no longer be referred to by
number, to remove ambiguity between type and particle number.
2011-02-07 17:13:31 +00:00
jacksonmj
5fbb37ba60 Fix console particle number, coordinate parsing 2011-02-07 15:56:10 +00:00
jacksonmj
2569d244d4 Merge branch 'upstream' into dev
Conflicts:
	src/powder.c
2011-02-04 19:59:50 +00:00
Simon
0d863dce94 Nobody likes extra line breaks] 2011-02-04 12:17:24 +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
5383311cba testing playing .wav files. lol sounds 2011-02-01 20:35:41 -05:00
Cracker64
fea297b2ac Update with simon, and drawing SPRK on walls crash fix. 2011-01-31 22:53:32 -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
Simon
5ec884993f Fix login for non-elevated users 2011-01-31 20:25:27 +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
3babc0586c stupid git, didn't take description change 2011-01-31 00:49:50 -05: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
Simon
61292f5355 Fix bugs with console. 2011-01-30 23:20:12 +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
bcbcb0063b Command buffer, limit is 9, I think 2011-01-30 21:38:24 +00: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
Simon
f391b896d4 Use Sessions instead of saving password 2011-01-29 12:16:13 +00:00
Cracker64
bcea95c5ca update to latest 2011-01-28 18:54:50 -05:00
jacksonmj
58a700fbb0 Fix SIGFPE when opening creations with exactly 50 up/down votes
Only occurs on optimised (using $(OFLAGS) in Makefile) builds
2011-01-23 15:40:01 +00: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
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
jacksonmj
ed8c0031f4 Astyle. 2011-01-06 22:26:31 +00:00
Cracker64
081ad28435 updated with simons small changes 2010-12-29 17:55:14 -05:00
Simon
b2129bd129 Fix a bit of code readability 2010-12-29 21:33:21 +00:00
Cracker64
25b95e211e new display, Life, shows life in a grayscale gradient, will ONLY show up in debug mode, on shift-1, fix filt floodfill, portal has bigger storage, other fixes. 2010-12-29 09:44:12 -05:00
Cracker64
039a4e2f31 Added second stickman for Lulz, it works great though, controlled by wasd. 's' was moved to ctrl-s and d is ctrl-d 2010-12-18 02:14:53 -05:00
Cracker64
5b2c689394 another swch fix, desl fire fix, shift-g will make grid go down, BIZR glows from velocity in FIRE,ect. METL/BRMT/BMTL change color when heated in heat gradient view. other small changes. 2010-12-14 17:23:27 -05:00
Cracker64
23f828135a updated with icons, and some more fixes. 2010-12-12 20:13:05 -05:00
Cracker64
cbf41389a2 Bugfix for wifi, would cause a double spark if timed just right. updated to 2010-12-08 12:14:02 -05:00
Cracker64
efb7c6bc9c updated with simon's changes 2010-12-05 21:56:46 -05:00
Cracker64
2cf25c8a6a FILT, a photon color filter, not really a filter right now, but it changes the color. Other small changes 2010-12-04 23:29:41 -05:00
Cracker64
d56684312d WIFI, a wireless SPRK transmitter, has 25 'channels' controlled by temp. starting at 0C, every 100 degrees is a different channel, they are colored as well. Heat-gradient display, colors of elements is slightly changed based on temp. maybe some other fixes. 2010-12-04 12:24:54 -05:00
Cracker64
77a17ecaee VINE, plant grows up the side of WOOD. INST wire is now also a battery and will charge if it doesn't give off a spark right away. Will give spark to NSCN or SWCH that is on. found some more wall defines i missed. moved wall code up 100 numbers. INVS, solid that turns invisible to elements when under pressure. 2010-11-28 16:58:57 -05:00
Philip
a38dddaf5a Made wall code use #defines. small fix for adjustabl brush. 2010-11-19 22:03:52 -05:00
Philip
5d0da4b138 Added PIPE, yay. Added whole menu sections to be able to be specifically deleted. 2010-11-18 00:01:46 -05:00
Philip
9383c1ca4c Added a different velocity/pressure display. Added old fireworks i made. 2010-11-16 19:47:18 -05:00
Philip
663db5374f Added BCLN LOVE WTF. description on forum post. A fix for loading COAL. made everything use the #defines for cmode (ex. CM_HEAT instead of 5). 2010-11-15 11:57:37 -05:00
Philip
ebcded767e First release of the mod 2010-11-12 12:46:02 -05:00
Philip
ac6fdb49e8 stupid git, no icon for nothing display, why would there be one 2010-11-11 21:42:56 -05:00
Philip
c23938eb6a Nothing display, for pilojo, called it cracker display for lulz, also won the race against antb, which didnt last long, he went on a baloon trip. 2010-11-11 21:38:43 -05:00
Philip
179a9f731a Updating with all new changes 2010-11-10 19:42:42 -05:00
Philip
a23d46a9f6 GOL works 100% now. todo: make some way to set GSPEED from ingame, and is the number of frames per generation. 2010-11-05 21:25:02 -04:00
Philip
4e46f51bcf changed moving sign code so it doesn't modify the sign itself. 2010-11-01 23:56:06 -04:00
Philip
176ecb1197 eraser uses shift-alt instead of alt because linux alt-click is normally move window 2010-11-01 17:37:27 -04:00
Philip
8f397f3a03 moving signs! i think everything still works, click the weird random extra button, someone can add an icon later. 2010-10-29 23:37:15 -04:00
Philip
bb3b1a52ac added specific element eraser again for my own uses sinces everyone else thinks its useless. alt-click to pick and then alt-click in the game to erase the picked element. you could then have right and left click be two different elements and alt-click on the eraser to keep two elements selected and an easy to use eraser as well 2010-10-28 19:31:06 -04:00
Philip
bff5961d60 updating 2010-10-28 19:18:06 -04:00
Philip
e4f9f77de9 Updating 2010-10-04 00:29:37 -04:00