Commit Graph

4246 Commits

Author SHA1 Message Date
jacksonmj
8aaaae1daf Make PTCT/NTCT cool down even when covered with spark
Also fix typo in update_PHOT
2011-02-03 00:08:56 +00:00
jacksonmj
9d716cba47 Add menu sections (prevents menu_count exceeding msections size) 2011-02-02 21:12:34 +00:00
jacksonmj
5b1210714d More fixes
Fix PHOT and FWRK.
Fix QRTZ conductivity (broken by removing PROP_CONDUCTS)
Add some things lost during rewrite: NTCT/PTCT not heated if INSL in the way;
boiling point varies with pressure.
2011-02-02 17:49:56 +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
jacksonmj
77bcac1a56 Small fixes
Fix nearest_part distance calculation
Rename air constants to avoid PLOSS clash with math.h
Prevent crashes due to bad lava ctype.
2011-02-01 16:06:48 +00: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
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
jacksonmj
d52fa30a45 Attempt fix for liquids 2011-01-31 22:00:12 +00:00
Simon
5ec884993f Fix login for non-elevated users 2011-01-31 20:25:27 +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
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
c6db32f829 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-01-30 20:11:10 +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
FacialTurd
d61efca4e5 Missing header for CM_COUNT 2011-01-29 09:42:01 -08:00
Simon
7522e95a9d Missing file, also fix cmode saving 2011-01-29 12:19:48 +00: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
01304db892 fix some visual studio issues. 2011-01-28 20:53:02 -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
jacksonmj
2654996599 Fix disappearing WTRV
If water is sparked then quickly heated past 100C, the resulting
WTRV will disappear after a few frames.
2011-01-27 22:38:47 +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