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

443 Commits

Author SHA1 Message Date
jacksonmj
db5cb5e2f9 Minor optimisations for startup and render_fire 2011-07-27 01:25:34 +08:00
savask
dbd3272933 Generalized stick man's update functions. Got rid of some unnecessary 
variables.
 2011-07-25 12:47:38 +07:00
Simon Robertshaw
e7907f9ea3 Prevent gravity vel-maps from flipping when paused 2011-07-24 14:31:24 +01:00
jacksonmj
89cc8d4ded Fix life cloning 2011-07-24 20:10:43 +08:00
jacksonmj
7ed0255f04 Disable old life elements 2011-07-24 20:07:15 +08:00
cracker64
2f714606d7 active menu and hud enable are global. 2011-07-22 10:08:13 -04:00
Simon Robertshaw
68404608f6 Lensing effect for gravity, adds 3 new gravity maps (full resolution, linear interpolation for faux accuracy), old ones should be removed in time. 2011-07-18 23:58:08 +01:00
Simon
0fbe6e2d3f Fix PBCN saving and increment major version 2011-07-13 12:03:30 +01:00
jacksonmj
02848f9e0c Fix scaling bug when drawing lines 2011-07-13 04:57:40 +08:00
Simon Robertshaw
4c685c7665 Revert variable names for Brush 2011-07-12 19:06:59 +01:00
Cate
d3452b01c8 OMG FIXES. Lots of fixes for triangle brush to make sure it works, from Cracker. Edited CLST to prevent "popcorning" when its float hits weird numbers. Also fixed it so it freezes nicely when cooled. Fingers are back! :DDD 2011-07-12 18:46:33 +01:00
jacksonmj
1be79e581d Line snapping (hold down Alt when drawing a line) 
Specific element select changed to Ctrl+Alt
 2011-07-12 21:48:54 +08:00
jacksonmj
52b4473f0f Fix bounds check for WIND line 2011-07-12 21:47:41 +08:00
Simon Robertshaw
d42e06f37a Merge all GOL types into PT_LIFE, behaviour is determined by ctype 2011-07-09 18:22:25 +01:00
jacksonmj
11dbdb9314 Fix crashing when pipe has a negative tmp value 2011-07-06 17:44:56 +08:00
jacksonmj
3d82cea94f Fix stickman head in renderer 2011-07-04 00:11:43 +08:00
Simon Robertshaw
36ee81fc6b Better photons for persistent display, ability to toggle gravity view (ctrl+g) 2011-06-27 14:01:07 +01:00
Simon Robertshaw
1dcefb2895 Keep opened files 2011-06-25 16:59:25 +01:00
jacksonmj
d515575612 Allow changing of stkm spawn element by setting ctype 2011-06-25 16:06:44 +01:00
jacksonmj
c18009dd9c Check particle exists in tpt.set_property, and sdl_scale mouse coords for Lua step 2011-06-25 15:52:52 +01:00
jacksonmj
9b83bf27a8 Use malloc in parse_save to avoid stack overflow 
918 KiB arrays should not be allocated on the stack...
 2011-06-25 15:52:02 +01:00
jacksonmj
f417d7a4df Include ambient heat in undo 2011-06-25 15:50:59 +01:00
jacksonmj
fb79865186 Fix gravmap build up during repeated frame stepping 2011-06-25 15:50:32 +01:00
jacksonmj
a054a784af Fix soap stamp crashes, and fix stkm head colour 2011-06-25 15:50:07 +01:00
Simon Robertshaw
2dd04b917d Add access to the local saving features 2011-06-14 15:13:27 +01:00
jacksonmj
93316a9f1d Fix a load of memory leaks 
Also fix some compiler warnings (missing headers, wrong pointer type for
modf, etc) and move variable declarations for Visual Studio.
 2011-06-11 13:00:42 +01:00
Simon Robertshaw
1f7106acb1 Gravity zoning 2011-06-09 22:35:00 +01:00
Simon Robertshaw
09a3670d64 Clean up signs when reading 2011-06-08 18:09:03 +01:00
Simon Robertshaw
3ea25c83b7 message_box and input for Lua API, also autorun.lua 2011-06-08 16:30:36 +01:00
Simon Robertshaw
b5c9d86fbe Less blurry thumbnail scaling 2011-06-08 13:30:39 +01:00
jacksonmj
e182e7422c Loads of error messages for lua, and hopefully fix lua stack overflow 
Also fix game exiting when an error occurs in a step function.

Returning -1 seems to prevent lua from restoring the stack to the
state it was in before the C function call - see bottom of
luaD_precall() in lua source (ldo.c)
 2011-06-08 12:47:19 +01:00
Simon Robertshaw
c003fee63e Ambient heat (disabled by default) 2011-06-01 20:18:19 +01:00
Simon Robertshaw
3d600c6955 Add gravity field manipulation to Lua api, move gravity processing to after the particle update (Means a delay of 1 frame, but we get the ability to manipulate the field with Lua) 2011-06-01 12:16:33 +01:00
Simon Robertshaw
2c8c4bc567 Pass mouse coordinates (mousex, mousey, mouseb, mousebq) and Lua click handling 2011-05-31 18:38:13 +01:00
Simon Robertshaw
79a27c2c90 Basics for Lua 2011-05-30 16:22:39 +01:00
jacksonmj
f603e33e74 Small speed improvement to eval_move 
Warning: may be buggy, test thoroughly.
 2011-05-29 13:36:11 +01:00
jacksonmj
5e414e64dc Fix WIND decoration, and reset dcolour in create_part 2011-05-29 13:35:00 +01:00
jacksonmj
a2c171fbf9 Remove remaining references to old decorations buffer 2011-05-29 13:34:50 +01:00
jacksonmj
6a2f357efd Revert "Pass decorations to saving functions (doesn't actually save yet)" 
This reverts commit 7fe99f3210.

Conflicts:

	src/main.c
 2011-05-29 13:34:37 +01:00
Simon Robertshaw
a40d1dc121 Decorations saving 2011-05-28 20:37:26 +01:00
Simon Robertshaw
577ad4eb47 Gravity state now saved 2011-05-28 18:54:12 +01:00
Simon Robertshaw
95e51bc7f4 Render uses resample_img 2011-05-28 15:29:33 +01:00
Simon Robertshaw
edc6339369 Render changes 2011-05-28 14:57:07 +01:00
Simon Robertshaw
2c7b8a6902 Fix renderer, add image decode/code methods 2011-05-28 13:49:07 +01:00
Simon Robertshaw
a52344f399 Decorations improvements 2011-05-24 15:01:18 +01:00
Simon Robertshaw
2d9e0b75e4 jacksonmj's decorations commit 2011-05-24 14:57:46 +01:00
Simon Robertshaw
453c69d39a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-05-24 14:55:29 +01:00
Simon Robertshaw
eafcdf8ec9 Improve error handling on display initialisation 2011-05-24 14:54:14 +01:00
jacksonmj
ee39c06152 Decorations toggle and brush size keys 2011-05-24 21:49:08 +08:00
jacksonmj
fc4de9640c Fix sim options description, GOO and DEUT 2011-05-24 21:49:08 +08:00
Simon Robertshaw
1622974c0a Fix message notifications for non-elevated users 2011-05-19 21:41:13 +01:00
Simon Robertshaw
af68469f6a pthread Win32 static linking 2011-05-19 15:32:50 +01:00
Simon Robertshaw
3ff800ec9a Message notification changes 2011-05-19 08:08:59 +01:00
Simon Robertshaw
9d70d60ee9 New message notification on session check TODO: Clickable link to conversations on website 2011-05-16 12:46:08 +01:00
Simon Robertshaw
1ddff1ad3b Runtime fullscreen toggle TODO: Fix bug that prevents from closing the window after a fullscreen toggle 2011-05-15 20:40:08 +01:00
Simon Robertshaw
d8e7c82f1c Fix n-gravity toggle 2011-05-15 19:45:45 +01:00
jacksonmj
203c3a0151 Translate invisible particles to decorated diamond when loading 2011-05-14 13:44:22 +01:00
jacksonmj
7fe99f3210 Pass decorations to saving functions (doesn't actually save yet) 2011-05-14 13:44:02 +01:00
jacksonmj
cbfc73d8d6 Turn WIND into a tool 2011-05-14 13:43:51 +01:00
Simon Robertshaw
16f014b06a Move wall drawing to graphics.c 2011-05-14 13:28:02 +01:00
Simon Robertshaw
d0f236d6b9 Condition variable instead of busy wait 2011-05-14 13:21:44 +01:00
Simon Robertshaw
3196690b03 Runtime scale switching 2011-05-13 10:44:39 +01:00
Simon Robertshaw
351565c6e2 Fix some thread sync and gravity sync issues 2011-05-12 18:45:14 +01:00
Simon Robertshaw
ee962dc8bb Newtonian gravity toggle, disabled by default 2011-05-12 18:04:29 +01:00
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