matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,327 Commits 13 Branches 426 Tags 113 MiB
d6d40f88d1
Commit Graph

379 Commits

Author SHA1 Message Date
jacksonmj
892a2b11c7 Make middle click work with photon map 2011-05-05 20:34:22 +01:00
savask
f0c5960b56 Some work on bubbles. Added "bubble x,y" command to console. 
Also made them save like regular soap.
 2011-05-05 20:24:42 +01:00
Simon Robertshaw
fb408ab82b Revert "Dem bubbles" 
This reverts commit 607572cf0d.
 2011-05-05 20:08:13 +01:00
unknown
607572cf0d Dem bubbles 2011-05-05 19:58:30 +01:00
Simon Robertshaw
b26648e6ae Fix pause with gravity and test deuterium improvements 2011-04-25 20:41:45 +01:00
Cracker64
24f5905020 portal now uses particles as storage, so it keeps everything. 2011-04-25 19:00:27 +01:00
Simon Robertshaw
4c153d2f34 gravmutex = NULL not liked by some compilers (It's not actually correct anyway) 2011-04-25 16:59:04 +01:00
Simon Robertshaw
28d9328959 Dialog box for changing simulation options, gravity toggle needs implementing 2011-04-25 16:39:28 +01:00
jacksonmj
7b82eae82e Jacksonmj: Move console functions into seperate file 2011-04-25 12:07:55 +01:00
Cracker64
0ccd04b848 More decoration improvements. still TODO: text boxes that will change current color, as well as display current color. A menu with some basic color swatches. 2011-04-24 20:04:05 +01:00
Simon Robertshaw
3acf9aae2a Asynchronous thread for gravity processing 2011-04-24 17:49:33 +01:00
Cracker64
bd8de4c842 Decorations! ,still messing with it. It does not save currently. TODO: fix typing in boxes to update the color. Line/box tools. Some basic color selections like an element menu. 2011-04-23 14:00:51 +01:00
jacksonmj
aa3f475edc Stricter frame rate limiting 2011-04-23 07:52:59 +08:00
jacksonmj
f3b341c7b2 Remove limit on size of console scripts 
Also fix regex to work with x,y instead of needing x+0,y+0
 2011-04-23 07:52:59 +08:00
Simon Robertshaw
13ff21bb22 Gravitaaaay (Needs tweeking for performance) 2011-04-22 17:06:09 +01:00
Simon
d37bd56eb6 'M' For selected element swap, 'dae' var for showing a selected element box upon element change (not implemented) 2011-04-17 20:34:54 +01:00
jacksonmj
24808344f4 Fix some memory leaks in save build/parse 2011-04-16 17:26:18 +01:00
Simon
605c957955 <.< >.> Nobody saw that... 2011-04-13 21:39:46 +01:00
Simon
664b578d13 Fix segfault with renderer 2011-04-12 12:39:28 +01:00
Simon
67531c2434 Game save renderer 2011-04-12 12:19:21 +01:00
Simon
6c3ac2af5c Remove more warnings 2011-04-08 15:39:55 +01:00
Simon
626cc8fa6a Remove a TON of warnings 2011-04-08 15:28:57 +01:00
Simon
f8f8b71869 Re-add install hotkey, removed in astyle commit 2011-04-08 13:10:35 +01:00
jacksonmj
c36c90e800 Workaround for some argument parsing bugginess 2011-04-08 11:11:48 +01:00
jacksonmj
6ac508a5de Start register_extension support for linux 
Also fix a limitation on the length of open: paths
 2011-04-08 11:11:20 +01:00
Simon
767d73c5fc astyle 2011-04-08 11:09:42 +01:00
Simon
a2edfa11b8 Installer 2011-04-06 13:48:41 +01:00
jacksonmj
45b1b2bc96 Fix banned user message 
error_ui does not support separate title text
 2011-04-04 16:11:16 +01:00
jacksonmj
bff7d73a64 Fix crashes when pasting on top of walls 2011-04-04 16:11:05 +01:00
jacksonmj
68f9b59f08 Use floats for temperature in both consoles (old and python) 2011-04-04 16:10:54 +01:00
jacksonmj
e18480006e Clear particle data in parse_save 
Fixes QRTZ sometimes growing when copied and pasted
 2011-04-04 16:10:41 +01:00
jacksonmj
0232fc9301 Use floats for vx,vy in old console 2011-04-04 16:10:28 +01:00
jacksonmj
d2d3956e72 Improved frame rate limiting 2011-04-04 16:10:20 +01:00
jacksonmj
592b923b66 Finish WIN32 register_extension, fix Visual Studio compile 2011-04-04 16:10:03 +01:00
jacksonmj
cf00540303 Restore new stamp manipulation 
Overwritten by: Python console 2e401babb7
 2011-04-04 16:06:35 +01:00
jacksonmj
a5f01099d7 console2345 always evaluates to true, check string is not empty instead 
Also, initialise to empty strings - if sscanf does not find something to
put in a string, it will leave it unchanged.
 2011-04-04 16:06:23 +01:00
Simon
630ab09f63 Copy text UI 2011-04-01 22:26:29 +01:00
Simon
a7d5239738 Added session check fallback 2011-04-01 10:41:09 +01:00
Simon
c7b441602f More PYCONSOLE macros 2011-04-01 10:19:44 +01:00
Simon
2f6bc8fe80 Move pygood and pyready outside of macro 2011-04-01 10:14:53 +01:00
Simon
9c44767e44 Move console_more declaration outside pythonconsole macro 2011-04-01 10:08:54 +01:00
Cracker64
96b93d0964 forgot to remove some EQVE stuff, wasn't working 2011-03-30 18:58:17 +01:00
Cracker64
8fc59be944 set_vx and vy fixes, float to int is not good. 2011-03-30 18:58:07 +01:00
Simon
b7a004986f A cracker commit with some nice comments 2011-03-30 18:57:49 +01:00
Cracker64
83590424b0 some keyword fixes, "from" is a reserved name. 2011-03-29 18:24:08 +01:00
Cracker64
ed244f42cb WIND works with line tool, BOMB shine affected by velocity and flickers 2011-03-29 18:23:34 +01:00
Simon
812798d70d 64bit fixes and other 2011-03-29 17:47:53 +01:00
Lieuwe
3d71ab5582 64bit fixes, thanks a ton jacksonmj :D 2011-03-26 16:45:38 +01:00
Lieuwe
05730797d8 misc stuff 2011-03-26 16:40:03 +01:00
Simon
d17694dcc6 Added Lieuwe 2011-03-25 12:03:51 +00:00
Simon
bc58ff1479 Message box with save ID info on new save 2011-03-24 21:34:42 +00:00
Simon
bb0907bc96 Fix underflow/segfault from negative ctypes and debug text 2011-03-24 20:08:44 +00:00
Simon
b538a760d0 Fix text overflow for large life values 2011-03-24 19:57:33 +00:00
Simon
df005748fc Open file command line 2011-03-23 11:54:47 +00:00
Simon
2e401babb7 Python console 2011-03-22 17:58:52 +00:00
Simon
c096b2b14a More cracker fixes 2011-03-22 17:25:29 +00:00
Simon
7d56b33589 Fix some WIND bugs 2011-03-22 17:14:45 +00:00
Lieuwe
d7cfbed2cd cleanup :D 2011-03-19 15:49:36 +01:00
Lieuwe
6c000478f2 changed zip filename 2011-03-18 23:10:38 +01:00
jacksonmj
f316b1fdb9 Remove redundant rotate/invert code and correct rotation direction 2011-03-18 20:14:19 +00:00
jacksonmj
d46a3bdcb0 Better rotation and inversion, also does single pixel translation 2011-03-18 19:33:38 +00:00
Lieuwe
7e27282b92 you can now disable(tpt.disable_python) or enable(python) the python console :D 2011-03-18 19:42:23 +01:00
Lieuwe
96959503cd now warns about a disabled python console. 2011-03-18 19:02:09 +01:00
Lieuwe
8b22ca5064 no longer crashes on mangled console.py and other python initialisation errors. 2011-03-18 17:23:08 +01:00
Lieuwe
9c39875ef0 ... 2011-03-18 17:04:51 +01:00
jacksonmj
56f966b4db Add some arguments to save build/parse functions 
To make clipboard manipulation easier.
 2011-03-18 12:41:36 +00:00
Cracker64
6ef9f0300e check bounds for wind, causes some funny glitches though. 2011-03-18 00:35:09 +00:00
jacksonmj
b2252ce9b2 Fix incorrect pitch in sdl_seticon 
Was causing garbled icon on linux. 16 pixels * 4 bytes per pixel = 64, not 128.
 2011-03-17 22:08:36 +00:00
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
jacksonmj
a6dabf2072 Visual Studio 2011-03-16 19:09:12 +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
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
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
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
Lieuwe
fc70b5bb78 tpt_console.py now internal 2011-03-03 21:12:57 +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
Cracker64
57d24f3ffa update readme for console 2011-03-02 16:00:49 -05:00
Cracker64
9fffbb88da console things, set commands use keywords for arguments. 2011-03-02 15:43:20 -05: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
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
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
Simon
0028dc8431 Increase debug coords string buffer to prevent crashes 2011-02-23 17:15:25 +00: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
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
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
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
Cracker64
b08c37342b Commands in signs, some don't fit 2011-02-14 20:32:01 -05:00
Simon
809289b13d ALL GLORY TO THE SAVASK 2011-02-13 14:38:42 +00:00
Simon
e6ab5b0f36 Fix Clickable signs 2011-02-13 14:03:06 +00:00
Simon
b0b736d49e Moved Gravity identifiers, added gravity mode and air mode to save format 2011-02-13 13:42:38 +00:00
jacksonmj
d57c5ef5e0 Visual Studio compatibility 
Also fix two compiler warnings
 2011-02-13 00:30:54 +00:00
Cracker64
e882dfecf9 update with latest 2011-02-10 19:46:34 -05:00
Simon
3de4d163a5 Merge branch 'dev' of git://github.com/jacksonmj/The-Powder-Toy 2011-02-09 15:56:30 +00:00
Cate
d5fe05d760 "Added Air modes using Gravitymode code" 2011-02-09 23:52:28 +08:00
jacksonmj
6bbc5328fc Sound device not compulsory 2011-02-08 14:30:02 +00:00
Cracker64
30d86813fc hidden menu shows up correctly 2011-02-06 13:29:37 -05:00
jacksonmj
e791e21c3e Fix x,y not always updating and particle # not showing when BETA defined 2011-02-06 17:52:35 +00:00
Cracker64
9844636593 particle # shows up again 2011-02-06 12:50:04 -05:00
FacialTurd
3a4b7f6983 Uninitialised pointer segfault if not previously logged in - jacksonmj 2011-02-06 04:41:48 -08:00
jacksonmj
196ccd1e36 Uninitialised pointer segfault if not previously logged in 2011-02-04 20:53:15 +00:00
jacksonmj
2569d244d4 Merge branch 'upstream' into dev 
Conflicts:
	src/powder.c
 2011-02-04 19:59:50 +00:00
Simon
aef66fbfe3 Session checking on startup and compatibility fixes 2011-02-04 12:16:45 +00:00
Simon
dd5ca12223 We don't want any buffer overflow, especially when reading file and user input 2011-02-04 11:42:11 +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
1755f08e44 variables and if statements for scripts, GoL is glitchy for me, i don't know why 2011-02-03 16:38:58 -05:00
jacksonmj
d21d1f7ba5 Merge branch 'upstream' into dev 2011-02-03 18:47:23 +00:00
Simon
525a59e280 Fixes from cracker64, also lolsounds 2011-02-03 15:37:55 +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
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
Simon
c78d4203ee Small changes from cracker 2011-01-31 22:17:44 +00:00