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

1354 Commits

Author SHA1 Message Date
jacksonmj
a722d7a396 Change wifi so that it always takes one frame to transmit 2012-02-05 22:45:29 +08:00
jacksonmj
6bdc05cc40 Separate loop for updating life, and add SPRK life checks to most electronics 2012-02-05 22:45:29 +08:00
Simon Robertshaw
0a2cf1b1c8 Stop printing crap from BRMT function 2012-01-29 18:00:30 +00:00
Jacob1
fff85989e1 stickmen load correctly and are drawn in new save format, and fighters are drawn correctly in both 
Conflicts:

	src/save.c
 2012-01-26 22:15:57 +08:00
jacksonmj
7593f01389 Fix deco colour in prerender_save to work with other pixel formats 2012-01-26 22:15:57 +08:00
Jacob1
35270d1e37 save tmp2, show decoration color on stamps 2012-01-26 22:15:57 +08:00
jacksonmj
eaf2af6d40 Another change to the eval_move check in create_part 
Creating a particle where there was a wall but no existing particle was
broken, since eval_move returns 1 for moving into empty space.
 2012-01-26 22:15:56 +08:00
Simon Robertshaw
01fe58e20e Retrieve thumbnails, saves and info from caching server (static.powdertoy.co.uk) 2012-01-26 14:05:56 +00:00
jacksonmj
38124c5f6f Fix crash when JSON parsing fails 2012-01-25 21:33:22 +08:00
jacksonmj
a9c198dd46 Fix WARP destroying DMND 
If WARP moved in its update function, then the x/y variables in the main
loop were out of date. When the normal movement code ran, changes were
made to the wrong place in the pmap. This resulted in some particles
with low IDs being destroyed by the addition of WARP+SING.

This change might also fix the WARP+PRTI crash that I never managed to
reproduce.
 2012-01-25 21:33:22 +08:00
jacksonmj
32c9ff3099 Make RBDM/WATR explosion work again, by not killing fire created by WATR 2012-01-25 21:33:22 +08:00
jacksonmj
748a528fe0 Only check the bits actually used for wavelength in photon ctype 
Fixes black photons not being killed after passing through pipe
 2012-01-25 21:33:22 +08:00
jacksonmj
f0730818e4 OPS thumbnail crash fix, and blank thumbnails for saves from a newer version 2012-01-25 21:33:22 +08:00
Jacob1
4af8385a0e If you cancel an update, the yellow update box stays away 2012-01-25 21:33:21 +08:00
jacksonmj
44545d4c96 Solids wall description, and check build_save was successful when saving a stamp 2012-01-25 21:33:21 +08:00
Jacob1
509f1d2139 ability to delete corrupted stamps 2012-01-25 21:33:21 +08:00
jacksonmj
8a11b6b31d Check coordinates of signs before using them to read pmap or pressure 2012-01-25 21:33:21 +08:00
jacksonmj
ff6aa0227d transform_save should check wall coordinates against size in blocks, not the actual size 
Fixes crash when rotating a section of wall that is wider than YRES
 2012-01-25 21:33:21 +08:00
jacksonmj
edcf6d7b2f Whoops, eval_move returning 1 should not allow particle creation 2012-01-25 21:33:20 +08:00
jacksonmj
bdf277e687 Implement PROP_NEUTABSORB 2012-01-25 21:33:20 +08:00
jacksonmj
16ea042bab Make transform_save work with new save functions 
Conflicts:

	src/powder.c
 2012-01-25 13:31:05 +00:00
Simon Robertshaw
15310d0165 Revert "transform_save should check wall coordinates against size in blocks, not the actual size" 
This reverts commit 34c6043014.
 2012-01-25 13:29:45 +00:00
jacksonmj
34c6043014 transform_save should check wall coordinates against size in blocks, not the actual size 
Fixes crash when rotating a section of wall that is wider than YRES

Conflicts:

	src/save.c
 2012-01-25 13:27:28 +00:00
Simon Robertshaw
a27074fc47 Revert "Some fixes for compiling with Visual Studio - void* and inline" 
This reverts commit ea619f5542.
 2012-01-25 13:26:10 +00:00
jacksonmj
ea619f5542 Some fixes for compiling with Visual Studio - void* and inline 2012-01-25 13:25:44 +00:00
jacksonmj
ff55050b9b Change variable declarations to make Visual Studio happy 2012-01-15 06:26:26 +08:00
jacksonmj
7f850ad049 Add 4 byte ctype saving to OPS, for PHOT colours 2012-01-05 08:46:12 +08:00
jacksonmj
56b45c982b eval_move in create_part if a particle already exists in the requested position 
To allow Lua tpt.create to create photons in glass
 2012-01-05 08:46:11 +08:00
jacksonmj
6bd8c4c3cd Fix zero length save crash, ignore sign tool walls, allocate parts starting at beginning of array 
Allocating parts starting at end was making saves loaded from OPS files run slower, because
no particles could be skipped by using parts_lastActiveIndex.
 2012-01-05 08:46:11 +08:00
Simon Robertshaw
8b88557047 Fix missing and incorrect bitshifts preventing the correct reading of life, tmp and dcolour 2012-01-02 14:04:42 +00:00
Simon Robertshaw
4741e7682a Save active menu 2012-01-02 13:59:28 +00:00
Simon Robertshaw
dc67615780 Air mode and Gravity mode on Simulation options, improvements to list box 2012-01-01 19:11:12 +00:00
Simon Robertshaw
0d8238fe8b Water equalisation in save 2012-01-01 18:32:07 +00:00
Simon Robertshaw
e41a3af8c5 BRMT + BREL = THRM at high temperatures 2012-01-01 16:32:02 +00:00
Simon Robertshaw
6fd4b2a80c prerender_save_OPS 2012-01-01 14:35:37 +00:00
Simon Robertshaw
b1aaa32116 16bit descriptor and variable temp field size, sign saving and reading 2011-12-31 18:57:42 +00:00
jacksonmj
8a2be10598 Store number of parts at each position instead of storing x/y coords 
Also fix blockW/H calculation and PT_NUM check
 2012-01-01 01:15:40 +08:00
jacksonmj
3da26ef96d Change LIGH and FIGH descriptions 2012-01-01 01:15:40 +08:00
Simon Robertshaw
b4b4a90f00 Almost finished new save format, just signs and thumbnail rendering needed 2011-12-30 19:48:11 +00:00
Simon Robertshaw
b617a264f2 Fix header include for case sensitive filesystems 2011-12-30 13:56:48 +00:00
Simon Robertshaw
d657dd2182 Make OPS optional (disabled by default) with define SAVE_OPS 2011-12-30 02:10:27 +00:00
Simon Robertshaw
5b21f4a66c Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-12-30 02:06:53 +00:00
Simon Robertshaw
86369670aa Add checks for prerender_save in save_filename_ui, pass vx, vy and pv air data into parse and build save methods. New save format: OPS, basic reading and writing complete, uses BSON, BSON.c/h (Binary JSON) implementation from MongoDB. (Is License OK?) 2011-12-30 02:06:31 +00:00
jacksonmj
f04577598b Fix creation of invalid wall tiles by sign tool 2011-12-29 06:39:59 +08:00
jacksonmj
2553dac942 Update can_move, recount menu items and clear graphics cache when tpt.el is changed 2011-12-29 06:39:59 +08:00
jacksonmj
23d6823bc3 Fix gravmap memset, and restrict_flt for temperatures 2011-12-29 06:39:59 +08:00
Simon Robertshaw
29b9859a00 Fix FPS in HUD in stable/nonbeta releases 2011-12-24 20:31:29 +00:00
Simon Robertshaw
835d9f1f3d Fix crash with clear_sim if gravity not initialised, fix renderer 2011-12-24 18:22:58 +00:00
Simon Robertshaw
fc7f872d8b Fix issue where heat transition would turn TNT to fire, TNT uses tmp for trigger state while Fire uses it for water vapourness. 2011-12-21 20:23:27 +00:00
Simon Robertshaw
a716c59610 Added some heat to TNT and IGNC 2011-12-21 17:39:53 +00:00
Simon Robertshaw
fcac7dbe09 Support for element names and hex constants for the PROP tool 2011-12-21 16:47:46 +00:00
Simon Robertshaw
b1532d6433 Fix legacy grav_diff not being updated correctly 2011-12-20 01:07:46 +00:00
Simon Robertshaw
b4b1086026 Gravity.c - Include sys\types.h to resolve issues with some mingw/pthreads configurations 2011-12-19 22:52:04 +00:00
Simon Robertshaw
810adc81fe Use reduced resolution gravity maps for improved performance 2011-12-19 21:35:40 +00:00
Simon Robertshaw
a523dcab79 Attempt to speed up tpt.parts without using billions of memory 2011-12-19 17:03:42 +00:00
Simon Robertshaw
5e0bec261c CLST+NITR = TNT, Use ARAY to clear large arrays of STOR 2011-12-19 15:21:27 +00:00
Simon Robertshaw
d6953be3a8 New element: Ignition cord 2011-12-19 14:29:01 +00:00
Simon Robertshaw
9d73a5f5bf Revert "Directly read/write element type properties" 
This reverts commit 0da91a783f.
 2011-12-19 12:43:28 +00:00
Simon Robertshaw
12bf65f954 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-12-19 12:38:50 +00:00
jacksonmj
3c37540cfd Fix undeclared variables in luaconsole.c 2011-12-19 20:35:59 +08:00
Simon Robertshaw
a9914dca2f Improvements to render_ui, fix merge errors 2011-12-18 16:29:07 +00:00
Simon Robertshaw
61e86ca72d Merge with new lua functionality 2011-12-18 15:14:07 +00:00
Simon Robertshaw
58b9996958 More icons for display modes 2011-12-18 14:41:42 +00:00
jacksonmj
33271ce3e2 Fix creating particles in autorun.lua 2011-12-18 22:04:48 +08:00
jacksonmj
46068833d1 Make PIPE detach SOAP particles (crash fix) 2011-12-18 22:04:47 +08:00
jacksonmj
2015499ff1 Fix grav wall 2011-12-18 22:04:47 +08:00
jacksonmj
c819e2655e Fix some gravity memsets, remove gravx/y 2011-12-18 22:04:47 +08:00
jacksonmj
934d1da66e Move Newtonian gravity into a new file 2011-12-18 22:04:47 +08:00
Simon Robertshaw
8ae0384f09 Add option for lua parts array to use native data using ffi 2011-12-17 21:30:00 +00:00
Simon Robertshaw
03352ca1f4 Fix memory leaks, allow changing of element name (To fix: element names in some arrays out of sync) 2011-12-10 19:03:31 +00:00
Simon Robertshaw
eec2363dc0 Fix spelling error 2011-12-10 18:42:19 +00:00
jacksonmj
bcfea42d18 Set BIZR/G/S ctype when loading a save, set BIZS ctype in create_part 2011-12-10 18:38:30 +00:00
savask
c7d0bf48b6 Fixed gravity for stick man. 2011-12-10 18:38:22 +00:00
jacksonmj
20dd54f36e Set BIZR/G/S ctype when loading a save, set BIZS ctype in create_part 2011-12-10 23:53:42 +08:00
Simon Robertshaw
799091f004 Allow both BrE and AmE spellings of colour with Lua 2011-12-10 15:50:55 +00:00
savask
f9603fd4a9 Fixed gravity for stick man. 2011-12-10 21:14:13 +07:00
Simon Robertshaw
e519aa911b Element transitions also editable now 2011-12-09 16:30:33 +00:00
Simon Robertshaw
f5a58d14f2 Use static table for parts array, Uses a tonne of memory but improves performance a lot. 2011-12-09 12:06:22 +00:00
Simon Robertshaw
9dcdccc066 Fix error in element_func where function was being read as the last parameter 2011-12-09 11:53:19 +00:00
Simon Robertshaw
d5f58d995e Directly accessible parts array (no pmap yet) 2011-12-08 12:16:50 +00:00
Simon Robertshaw
55cc6e3b05 Revert "Directly read/write element type properties" 
This reverts commit 0da91a783f.
 2011-12-08 09:56:18 +00:00
Simon Robertshaw
0da91a783f Directly read/write element type properties 2011-12-08 09:52:44 +00:00
Simon Robertshaw
dda9eb5120 Fix missing render_mode array change when switching to some display types. 2011-12-06 16:27:47 +00:00
Jacob1
939a599b80 Fix tnt/prop crash, it was using up all the memory on the computer 2011-12-06 16:08:05 +08:00
Simon Robertshaw
ee43158ec0 Commit fail, missing file :( 2011-12-03 01:00:06 +00:00
Simon Robertshaw
55a53a0c0f Back to old LCRY rendering 2011-12-03 00:36:12 +00:00
Simon Robertshaw
cb75e1d924 Fix spark effect on BOMB, another attempt at TNT (Explosive with more pressure) 2011-12-03 00:11:19 +00:00
Jacob1
52d2facf91 cmodes closer to what they used to be, change icons 2011-12-02 23:09:39 +00:00
Simon Robertshaw
93f5837974 Fix bug with PIPE where particles would have an incorrect colour if they didn't explicitly set the colr/g/b in its own graphics update 2011-11-26 12:50:28 +00:00
Simon Robertshaw
047a39498d Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-26 12:45:15 +00:00
Simon Robertshaw
d17336b467 Allow pipe to grab from photon map, BRAY beam takes temp from ARAY 2011-11-26 12:44:52 +00:00
jacksonmj
769b26ea7e Check value of decorations_enable in graphics_LCRY 2011-11-21 08:50:41 +08:00
Simon Robertshaw
4c2f8d56f1 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-21 00:48:53 +00:00
Simon Robertshaw
876c861c42 Fix LCRY/ELEC infinite loop, BIZR turns photons into electrons, SING explodes with electrons, electrons react with deut. 2011-11-21 00:48:39 +00:00
savask
92e72e004b Fixes for stick man drawing in heat and normal colormodes. 2011-11-20 00:35:17 +07:00
Simon Robertshaw
8c6e7caaff Fix draw_other effects logic 2011-11-18 22:22:02 +00:00
Simon Robertshaw
0ed3ca771e Bomb effects to effects render and sprk glow moved to fire 2011-11-18 22:20:05 +00:00
Simon Robertshaw
f508013332 New tables in lua API: el and version: element ids and version info respectively. New lua functions: element (get element id from name) and element_func for hooking/overriding element update functions 2011-11-18 19:38:08 +00:00
Simon Robertshaw
8a962b2f96 Live parts rendering for render_ui 2011-11-18 15:36:58 +00:00
Simon Robertshaw
c1ec9e24ae Smaller radio buttons 2011-11-18 15:32:33 +00:00
Simon Robertshaw
534c0edc33 Larger radio boxes 2011-11-18 15:20:07 +00:00
Simon Robertshaw
394a0e9ee0 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-18 14:58:09 +00:00
Simon Robertshaw
d94914040b Portal In/Out effects 2011-11-18 14:57:49 +00:00
savask
aac78386ff Radio buttons for some options. 
Conflicts:

	src/interface.c
 2011-11-18 21:54:50 +07:00
Jacob1
f135dbb734 Added back heat gradient display 2011-11-18 14:44:58 +00:00
Jacob1
f2759c7f2c Better looking icons in render_ui 2011-11-18 14:28:20 +00:00
Jacob1
8f493b62c3 Add blob display back. Also fix small nothing mode bug. 2011-11-18 14:15:49 +00:00
Jacob1
2d1a0d474f Add back in number keys to change render/display/color _mode variables 2011-11-18 14:13:50 +00:00
Simon Robertshaw
dd10e780d6 Fix decorations 2011-11-14 17:38:08 +00:00
Simon Robertshaw
33ac464441 Saving and loading for graphics modes 2011-11-14 16:41:01 +00:00
Simon Robertshaw
9dd0f24667 More stuff for render_uI 2011-11-14 14:26:50 +00:00
Simon Robertshaw
cef8dfa517 Colour mode and display mode added to render_ui 2011-11-14 11:11:25 +00:00
Simon Robertshaw
c63dff45e4 Basic render modes for Render_ui 2011-11-13 21:02:46 +00:00
Simon Robertshaw
0f4c0915d9 Replace cmode with more flexible render options, TODO: Saving and render options UI 2011-11-12 20:44:15 +00:00
Simon Robertshaw
1b984200f3 Grid Mode 2011-11-12 17:25:21 +00:00
Simon Robertshaw
bca76b0796 Trim down UItext, remove Generations and Version 2011-11-12 16:37:01 +00:00
Simon Robertshaw
ee72977da8 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-12 16:24:39 +00:00
Simon Robertshaw
2bd9d61ab5 Listbox for Property tool property field 2011-11-12 16:24:21 +00:00
Simon Robertshaw
b9f15e16cc open_ui: Load correct thumbnail for dated saves 2011-11-12 14:19:10 +00:00
savask
73460283a2 "Pipe with ..." message when pipe is filled. 2011-11-12 21:07:19 +07:00
Simon Robertshaw
859022ccb1 Fix memory leaks and thumb caching for datestamped saves 2011-11-12 13:55:18 +00:00
Simon Robertshaw
9b4e3b9436 Merge pull request #51 from atlaua/master 
todo resolved
 2011-11-12 04:50:25 -08:00
jacksonmj
5b9faa39c0 Fix a few things in stamps browser 
Incorrect number of stamps per page, pause button visible, and one page
too many when stamp_count is an integer multiple of per_page.

Using GRID_X/Y since those are the values used in the rest of stamp_ui
 2011-11-12 20:46:47 +08:00
jacksonmj
05fbb92420 Make PIPE reset (ready to generate pattern) when ctype is cleared and life is 0 2011-11-12 20:46:47 +08:00
Simon Robertshaw
93dc4cc477 Update src/main.c 2011-11-12 12:42:08 +00:00
Simon Robertshaw
c983de144d Cursor in ZooM 2011-11-08 12:35:07 +00:00
Simon Robertshaw
bc2b5e7945 Pixel grid for Zoom 2011-11-08 12:16:13 +00:00
Simon Robertshaw
b71214b8cf MSVC compatibility 2011-11-04 21:33:44 +00:00
Simon Robertshaw
6615fbca03 Fix shader compilation for ATi and Intel 2011-11-04 20:07:51 +00:00
atlaua
ae26ecaf8d Prevented a malloc-related problem in interface.c from occuring. 2011-11-03 19:25:49 +01:00
atlaua
e084d91b55 Resolved a todo in main.c 2011-11-03 14:24:20 +01:00
Simon Robertshaw
cfb8ec7af5 Error logging for shader compilation 2011-11-02 20:24:04 +00:00
Simon Robertshaw
640d4e9e3a Fix Air inversion 2011-11-02 19:37:52 +00:00
savask
7de6526a1e CAUS now kills stick man. Also stick mans can have gas power now. 2011-11-02 22:22:27 +07:00
Simon Robertshaw
9c26ef45b6 OpenGL headers for OS X in graphics.c 2011-11-02 10:39:48 +00:00
Simon Robertshaw
3723147a1d ACEL and DCEL, need to be in a better section 2011-11-01 20:44:49 +00:00
Simon Robertshaw
b0458bd5fa OpenGL on Windows 2011-11-01 19:29:13 +00:00
savask
98e23875c8 Fixes for stick mans in heat mode. 2011-11-01 23:44:44 +07:00
savask
9ac04e2c18 Right color for air stick man. 2011-11-01 23:44:31 +07:00
savask
3e5fb5942d Made fighters shoot anything deadly. 2011-11-01 23:44:17 +07:00
savask
8e00d07f35 Some works on FIGH's AI. 2011-11-01 23:44:02 +07:00
Simon Robertshaw
6de8346cdb Fix Wireworld graphics 2011-11-01 13:35:18 +00:00
Simon Robertshaw
241a12104b Fix scaling, no runtime scale switching yet :( 2011-11-01 13:21:47 +00:00
Simon Robertshaw
a9046fe7a6 OpenGl Improvements 2011-11-01 11:42:44 +00:00
Simon Robertshaw
ec3fdfed1c Deco apply to fire mode 2011-10-31 21:57:13 +00:00
Simon Robertshaw
c26cfa29c2 LCRY tweaks 2011-10-31 15:35:27 +00:00
Simon Robertshaw
4124738a0e Electrons Hydrolysis. 2011-10-30 21:13:33 +00:00
Simon Robertshaw
856f9574b6 Change LCRy workings and add ELEC (wip) 2011-10-30 16:22:33 +00:00
Simon Robertshaw
3daf9e1e29 Fix nothing display and LCRY with decoration 2011-10-29 21:21:30 +01:00
Simon Robertshaw
f4b6cbf34d Fix passing of PMODE_GLOW into Heat display 2011-10-29 15:55:42 +01:00