Commit Graph

528 Commits

Author SHA1 Message Date
jacksonmj
3b3a173dc9 Remove neutrons from pmap 2011-03-17 21:42:07 +00:00
Lieuwe
bc8af4e210 fuck the wrong branch. also, particle delete function. 2011-03-17 18:59:42 +01:00
Lieuwe
295b384466 fixed keyrepeat api call 2011-03-17 16:35:00 +01:00
Cracker64
15deb1145b PRTO fix 2011-03-16 20:49:33 +00:00
jacksonmj
a6dabf2072 Visual Studio 2011-03-16 19:09:12 +00:00
Cracker64
ffc3e0a5ee PRTO fix 2011-03-16 14:58:58 -04:00
Lieuwe
b4a3b12d3d broke stuff 2011-03-16 16:53:20 +01:00
jacksonmj
0208410952 flood_parts uninitialised variable 2011-03-16 11:39:31 +00:00
Lieuwe
a7408b93c0 nother bugfix 2011-03-15 21:05:19 +01:00
Lieuwe
5066ecab0c small bugfix 2011-03-15 20:59:37 +01:00
Lieuwe
f7bd1198b1 MERGE 2011-03-15 20:48:23 +01:00
Lieuwe
fe5e4a6ddc 64bit really fixed now, does need PYEXT to be defined tho. 2011-03-15 20:09:23 +01:00
Lieuwe
34051303cf no need to include tpt_console.py on 64bit anymore. 2011-03-15 19:18:31 +01:00
jacksonmj
3b7cf24757 Display element contained by PIPE in debug mode 2011-03-15 15:57:12 +00:00
jacksonmj
db91bd37f0 Display photon wavelengths in HUD 2011-03-15 15:47:09 +00:00
Lieuwe
c073c73c56 another 64bit fix 2011-03-14 22:17:26 +01:00
Lieuwe
67b68e32ff this might fix the python console on 64bit without #define PYEXT 2011-03-14 21:37:02 +01:00
Lieuwe
c33f6adae7 added #define PYEXT so you can use an external tpt_console.py on 64bit OSes 2011-03-13 18:45:40 +01:00
jacksonmj
72a4490bb5 Save ID is useful, so display it! 2011-03-12 18:12:29 +00:00
jacksonmj
24e053ca62 Limit length of save title and username at bottom of screen 2011-03-12 17:08:35 +00:00
jacksonmj
0a3b44ee14 Update fancy mode to use the new GLOW graphics 2011-03-12 14:01:58 +00:00
Cracker64
a3cc010aae forgot some files, and a few fixes, set commands use 'setfrom' instead of 'from' as a keyword, wind brush fixes. 2011-03-11 20:58:43 -05:00
jacksonmj
fbae5fb16a Flashing BRAY fix
We should just be thankful that negative life will not save correctly...
2011-03-10 23:50:20 +00:00
Cracker64
3b048f8a06 merge merge merge 2011-03-10 15:43:27 -05:00
Simon
2339084d15 Remove some redundant code 2011-03-10 18:30:28 +00:00
Simon
4942cc14b0 Testing commit 2011-03-10 18:19:31 +00:00
Simon
9699477e9e Alter year, useless commit 2011-03-10 17:58:27 +00:00
Simon
0ded22493e Fix makefile for OS X 2011-03-09 18:01:53 +00:00
Lieuwe
db07c1ee0c added #define to disable PYCONSOLE 2011-03-09 15:41:50 +01:00
Cracker64
ca1cd0da06 check bounds for wind, causes some funny glitches though. 2011-03-07 00:32:04 -05:00
Lieuwe
51f994f8d5 COMMIT DAMNIT 2011-03-06 21:08:18 +01:00
Lieuwe
f599959efe more work on the chat client, it now supports nick changes 2011-03-06 15:39:50 +01:00
Lieuwe
11a7be5c68 added irc client extension, it only listens for now. 2011-03-05 21:41:11 +01:00
Lieuwe
d6d661c434 keyboard/mouse handling 2011-03-05 20:08:41 +01:00
Lieuwe
20b6a64228 moar graphics stuff 2011-03-05 17:50:05 +01:00
Lieuwe
5cb538f081 got draw_pixel and draw_text to work 2011-03-05 17:09:37 +01:00
Lieuwe
6596155c8a trying to get a putpixel command working but it segfaults atm 2011-03-05 15:54:47 +01:00
Lieuwe
85a2ba9a6e implemented a step hook and modified the makefile to call getheader.py 2011-03-05 15:09:15 +01:00
Simon
30462ec28d Python console changes 2011-03-04 11:14:34 +00:00
Lieuwe
04f4a0d9fe Merge branches 'pyconsole_internal' and 'master' into pyconsole_internal 2011-03-03 21:18:14 +01:00
Lieuwe
0a9ea3819f Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy 2011-03-03 21:14:28 +01:00
Lieuwe
fc70b5bb78 tpt_console.py now internal 2011-03-03 21:12:57 +01:00
Lieuwe
eab871c774 getheader now compiles python files 2011-03-03 20:33:48 +01:00
Lieuwe
9f8811159c pulled some code by cracker which makes output even more awesome :P 2011-03-03 19:38:06 +01:00
Cracker64
9e8b7440ba a get_pmap and get_prop function for python so fancier scripts can be made. Made a demo of increasing element type by one, import example, example.increment() 2011-03-02 23:30:04 -05:00
Simon
920e589d62 Enable key repeat for console 2011-03-02 22:22:46 +00:00
Cracker64
57d24f3ffa update readme for console 2011-03-02 16:00:49 -05:00
Lieuwe
364759ff08 python console 2011-03-03 04:54:19 +08:00
Cracker64
9fffbb88da console things, set commands use keywords for arguments. 2011-03-02 15:43:20 -05:00
jacksonmj
647ff2bff0 Fix some potential crashes, better handling of empty server responses 2011-03-03 04:07:12 +08:00
jacksonmj
e055eb5893 Fix ETRD not conducting correctly to adjacent particles 2011-03-03 04:07:12 +08:00
Cracker64
20edfacae5 fix "water spark bounce" 2011-03-03 04:05:51 +08:00
Cracker64
4f4796b469 INST works with caps lock/replace mode, and fix some replace mode out of screen crashes. 2011-03-03 04:05:51 +08:00
Cracker64
13e90886c1 fix "water spark bounce" 2011-03-01 13:33:10 -05:00
Cracker64
30ceffa46d INST works with caps lock/replace mode, and fix some replace mode out of screen crashes. 2011-02-28 19:48:53 -05:00
jacksonmj
57630e561d Fix some potential crashes, better handling of empty server responses 2011-02-26 20:58:22 +00:00
jacksonmj
ded7bdf30d Merge branch 'upstream' into dev
Conflicts:
	src/main.c
2011-02-26 19:32:51 +00: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
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
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
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
72e6fdd9f6 Preventing creation of invalid types also prevented use of air/temp tools 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
jacksonmj
1b23302513 FLAG_STAGNANT usage lost during rewrite 2011-02-19 07:06:21 +08:00
jacksonmj
dab9f85024 Fix incorrect liquids movement 2011-02-19 07:06:21 +08:00
Cracker64
7c123cdb00 NEUT fixed to dust and fwrk reaction. 2011-02-19 07:04:54 +08:00