jacksonmj
b85c29dee4
Prevent crashes in the event of ridiculous temperatures
2011-02-07 20:29:11 +00: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
Simon
bb3964138c
Fix Antimatter
2011-02-04 13:09:48 +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
b6f1ba977c
missed some corrections, fixes GoL
2011-02-03 17:28:08 -05:00
Cracker64
fea297b2ac
Update with simon, and drawing SPRK on walls crash fix.
2011-01-31 22:53:32 -05:00
Simon
b033a9655d
Fix for liquids - jacksonmj
2011-01-31 22:10:34 +00:00
Simon
76e2193318
Fix version for Login
2011-01-31 20:16:12 +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
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
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
Simon
f391b896d4
Use Sessions instead of saving password
2011-01-29 12:16:13 +00:00
jacksonmj
5d34cae2e4
Consistent use of NGOL, better NSCN description
2011-01-29 11:20:34 +00:00
jacksonmj
9938378c0d
Merge remote branch 'cracker64' into dev
...
Conflicts:
includes/element.h
includes/powder.h
src/elements/firw.c
src/elements/legacy.c
src/elements/phot.c
src/elements/sprk.c
src/graphics.c
src/main.c
src/powder.c
2011-01-29 10:50:43 +00:00
Cracker64
4b5337c03a
finally fixed visual studio compiling, yay
2011-01-28 21:57:20 -05: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
fe033ce859
INWR should cool after being sparked; and correct function parameters
...
Also correct grule size and replicate existing freezing point behaviour for lava
with strange ctypes.
2011-01-28 23:14:46 +00:00
jacksonmj
a5ff51f5a5
Restore cracker64 changes overwritten by merge
2011-01-28 21:46:40 +00:00
Simon
079d35f1a0
Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy
2011-01-28 19:56:44 +00:00
jacksonmj
086e3151ad
Fix some problems with restrict_flt
...
This change fixes pressure glitches, burning substances cooling by themselves to absolute
zero, and SING having temperatures of minus several million Kelvin.
2011-01-28 19:41:00 +00:00
jacksonmj
bdfbc7c409
Change include file for element update functions
2011-01-28 19:36:26 +00:00
Simon
e9ae32b0cc
Merge with jacksonmj, Warning: potential for lot of bugs
2011-01-27 20:32:34 +00:00
Simon
aedb16efb9
Fixes from cracker
2011-01-27 20:14:20 +00:00
Cracker64
60d3f0047b
quartz shouldn't have prop_conducts, and fixed visual studio compiling
2011-01-20 14:10:34 -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
Simon
ce0708eccd
Cracker merge
2011-01-17 14:06:27 +00:00
Cracker64
926450a9a3
more life types using states, put them in new menu. Maybe get some way to switch to new menu on mouseover of last spot of current life menu
2011-01-16 20:54:41 -05:00
Cracker64
b1e09d4216
Made GoL code work with more advanced rules with different life states, giving more interesting rules.
2011-01-16 01:29:49 -05:00
jacksonmj
1833be451f
Merge branch 'cracker64' into dev
...
Conflicts:
includes/powder.h
src/graphics.c
src/main.c
src/powder.c
2011-01-15 16:23:51 +00:00
jacksonmj
42d7b56602
Attempt fix for some cases of fast particles going through obstacles
...
Also change direction_to_map again, to revert to original version
(which has problems with some diagonal surfaces, but doesn't have noticeable inaccuracies)
for refraction.
2011-01-15 15:25:39 +00:00
Cracker64
b673be0ac2
a fix so photons can be deleted and show up on HUD :)
2011-01-14 00:29:32 -05:00
jacksonmj
0221cdd355
Split elements/misc.c into separate functions
2011-01-13 22:51:55 +00:00
jacksonmj
7fb086065a
Correct spelling
2011-01-13 21:56:17 +00:00
jacksonmj
9707443b24
Merge element state into ptypes.
...
All of the pstates array except .state was replaced by ptransitions.
2011-01-13 21:31:24 +00:00
jacksonmj
def10c41ae
Exaggerate convection, misc rearrangement + fixes
2011-01-13 15:24:01 +00:00
jacksonmj
4006bdf4c2
Merge branch 'upstream' into dev
2011-01-11 13:44:52 +00:00
Cracker64
f242566e30
fix QRTZ spot saving, rotate should change FAN vector as well
2011-01-10 09:43:16 -05:00
jacksonmj
54f9f872b9
Finish update function cleanup
2011-01-10 14:41:03 +00:00
