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
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
60d3f0047b
quartz shouldn't have prop_conducts, and fixed visual studio compiling
2011-01-20 14:10:34 -05: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
5c65d69dac
missed some bitshifts, which caused a few glitches. Everything seems normal
2011-01-18 00:45:14 -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
db5bb618c1
fix loading of old GoL saves, and fix wall crash
2011-01-16 13:54:36 -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
c5670d39c1
Misc small fixes and tidyup
2011-01-15 20:21:22 +00:00
jacksonmj
de58e9a2e7
Fix E-hole
...
Was broken for powders by fixing fast moving particles going through obstacles.
For gasses, was broken in upstream.
2011-01-15 17:01:20 +00: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
c7213127e5
Temporarily undo photon reflection fix (causes inaccuracies).
2011-01-15 15:36:42 +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
2d79fa5cfe
fix photon causing infinite sparks
2011-01-14 21:23:23 -05:00
Cracker64
e33fb40e2d
oops, didn't need the floodfill thing there.
2011-01-14 11:05:08 -05: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
