Lieuwe
7d615c2a87
try eval first
2011-02-26 21:32:53 +01:00
Lieuwe
9de1949dab
redirecting bullocks
2011-02-26 21:18:21 +01:00
Lieuwe
c8380551c2
broke a lot of stuff. semi-fixed the console itself.
2011-02-26 20:50:06 +01:00
jacksonmj
ded7bdf30d
Merge branch 'upstream' into dev
...
Conflicts:
src/main.c
2011-02-26 19:32:51 +00:00
Lieuwe
cca82c3d97
removed error.log
2011-02-26 18:15:36 +01:00
Lieuwe
5387f235f9
python console
2011-02-26 11:49:23 +01:00
jacksonmj
a972644c4f
Fix ETRD not conducting correctly to adjacent particles
2011-02-24 19:24:37 +00:00
Simon
669a672b3d
Pretty transparent console
2011-02-24 18:04:08 +00:00
Simon
fd6f6c5406
WIND from cracker!
2011-02-24 17:11:05 +00:00
Cracker64
83d89ad4cd
rename drag to wind
2011-02-24 00:52:37 -05:00
Cracker64
bf24a26139
forgot powder.h, and renamed drag to wind
2011-02-24 00:51:09 -05:00
Cracker64
98a61e0e20
a drag tool!
2011-02-24 00:26:37 -05:00
Cracker64
a53d956d8d
transparent console....
2011-02-23 21:55:33 -05:00
Cracker64
879dd43e31
Fix GoL to not set gol2 on other things
2011-02-24 09:16:17 +08:00
jacksonmj
3011367eb0
Fix particles displaced by liquids moving to overlapping positions
2011-02-24 09:15:39 +08:00
jacksonmj
a64c202834
Fix lava freezing point
2011-02-24 09:15:39 +08:00
jacksonmj
71a6654c03
Fix particles displaced by liquids moving to overlapping positions
2011-02-24 00:57:13 +00:00
jacksonmj
7ecaa16362
Fix lava freezing point
2011-02-23 21:15:54 +00:00
Simon
1b9b1752a7
Switch life to ctype for, photons apparently use the GLOW ctype for something
2011-02-23 20:54:11 +00:00
Simon
5d4d815ad3
Fancier glow, now affected by Velocity, Pressure and Heat
2011-02-23 20:35:02 +00:00
Cracker64
cf80586ddc
Fix GoL to not set gol2 on other things
2011-02-23 13:33:36 -05:00
Simon
fa76c4b45c
Increase minor version
2011-02-23 17:16:13 +00:00
Simon
0028dc8431
Increase debug coords string buffer to prevent crashes
2011-02-23 17:15:25 +00:00
Cracker64
9b3c25227a
Reduce GoL lag
2011-02-24 01:04:43 +08:00
Cracker64
bdcc6e3fba
Reduce GoL lag
2011-02-22 20:55:50 -05:00
Cracker64
a8439f221e
updating
2011-02-22 20:55:09 -05:00
Simon
417b740d46
Make the help screen a bit cleaner
2011-02-22 17:51:51 +00:00
jacksonmj
c9725c6004
Merge branch 'upstream' into dev
...
Conflicts:
src/main.c
2011-02-22 15:18:04 +00:00
Simon
a84234dcd4
Improvement to scrolling menu
2011-02-22 00:51:01 +00:00
Simon
ff1aca9524
Update version
2011-02-22 00:15:48 +00:00
Simon
bb0b4e6802
UI improvements for elements menu
2011-02-21 17:57:17 +00:00
Simon
383eaff5b2
Sound and scripts are opt-in, to speed up loading and closing
2011-02-21 16:24:03 +00:00
Simon
064579c9e4
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
2011-02-21 16:10:05 +00:00
jacksonmj
6f2965d0d0
Zoom key conflict with international keyboards
...
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
2011-02-22 00:08:20 +08:00
jacksonmj
1419337374
Reduce overlap of HUD text when in debug/beta mode
...
Also reduce duplication of some HUD code
2011-02-22 00:08:20 +08:00
jacksonmj
dc35feeac9
Fix console preventing window from closing
2011-02-22 00:05:52 +08:00
jacksonmj
ac7eda80a5
Zoom key conflict with international keyboards
...
Change zoom key to only use keysym.sym, like all the other keyboard
controls. This may mean it is no longer the 'z' key on all
systems, but will prevent it conflicting with the
other keyboard controls.
2011-02-20 22:47:08 +00:00
jacksonmj
317ddab617
Reduce overlap of HUD text when in debug/beta mode
...
Also reduce duplication of some HUD code
2011-02-20 20:55:47 +00:00
jacksonmj
b3278cf888
Fix some compiler warnings
2011-02-20 20:46:26 +00:00
jacksonmj
1ae599d63e
Fix console preventing window from closing
2011-02-20 19:08:50 +00:00
Simon
9002a87d61
Notication of authentication improvement
2011-02-19 19:28:39 +00:00
Simon
1307af5c57
Fix saving of display mode from keys and fix persistent display
2011-02-19 18:59:07 +00:00
Simon
c6e2d17ffe
Minor version
2011-02-19 18:36:08 +00:00
jacksonmj
e640e2dd42
Always save last display mode
2011-02-19 15:51:10 +00:00
jacksonmj
a2091ede76
Move reset code to own function
...
Also clear persistent view when loading a save or clearing the screen.
2011-02-19 15:41:44 +00:00
jacksonmj
32f8e85d50
Merge branch 'upstream' into dev
2011-02-18 23:14:42 +00:00
jacksonmj
72e6fdd9f6
Preventing creation of invalid types also prevented use of air/temp tools
2011-02-19 07:07:08 +08:00
jacksonmj
8c6f93cd20
Makefile - libregex for mingw32, and change icc spaces to tab
2011-02-19 07:07:08 +08:00
jacksonmj
df8c13cc58
create_box improvements
...
Boxes now have sharp corners - they fill only the specified rectangle and not 1 pixel extra
on all sides.
2011-02-19 07:06:22 +08:00
jacksonmj
81ce5d74cc
Crash when element with invalid type is created
...
Generally due to an invalid ctype for clone.
2011-02-19 07:06:22 +08:00