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

708 Commits

Author SHA1 Message Date
Simon Robertshaw
1c4bce1f22 Lua methods for reading/writing the bmap and emap (no mapped walltypes yet 2012-02-20 12:02:52 +00:00
jacksonmj
3702438482 Prevent gaps in beams of photons from powered clone 2012-02-19 00:49:04 +00:00
chaos.powdertoy.co.uk
161452783b Version Increment 2012-02-05 14:47:56 +00:00
chaos.powdertoy.co.uk
125f40496f Version Increment 2012-01-29 18:04:33 +00:00
chaos.powdertoy.co.uk
f19e57e35c Version Increment 2012-01-26 14:17:26 +00:00
Simon Robertshaw
22acb277c0 Save PSv for now 2012-01-26 14:16:59 +00:00
chaos.powdertoy.co.uk
ed2132b7d8 Version Increment 2012-01-26 14:08:05 +00:00
Simon Robertshaw
01fe58e20e Retrieve thumbnails, saves and info from caching server (static.powdertoy.co.uk) 2012-01-26 14:05:56 +00:00
chaos.powdertoy.co.uk
5b527e7a9d Version Increment 2012-01-25 13:37:47 +00:00
jacksonmj
44545d4c96 Solids wall description, and check build_save was successful when saving a stamp 2012-01-25 21:33:21 +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
4741e7682a Save active menu 2012-01-02 13:59:28 +00:00
Simon Robertshaw
e41a3af8c5 BRMT + BREL = THRM at high temperatures 2012-01-01 16:32:02 +00: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
9c31393547 Backlashforwardslashbackslashbacklashforwardslash 2011-12-30 15:41:11 +00:00
Simon Robertshaw
c0a84f4558 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-12-30 15:07:46 +00:00
Simon Robertshaw
83387b45c0 int64_t on for 64bit systems 2011-12-30 15:07:26 +00:00
chaos.powdertoy.co.uk
358a7a6833 Version Increment 2011-12-30 14:59:45 +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
2553dac942 Update can_move, recount menu items and clear graphics cache when tpt.el is changed 2011-12-29 06:39:59 +08:00
chaos.powdertoy.co.uk
ad2b000a8a Version Increment 2011-12-24 20:32:08 +00:00
chaos.powdertoy.co.uk
25363fe5ef Version Increment 2011-12-24 18:24:50 +00:00
chaos.powdertoy.co.uk
0ac69dc14e Version Increment 2011-12-24 17:27:33 +00:00
chaos.powdertoy.co.uk
02e58cdee1 Version Increment 2011-12-24 17:22:01 +00:00
chaos.powdertoy.co.uk
b6d9d8d608 Version Increment 2011-12-22 17:50:44 +00:00
chaos.powdertoy.co.uk
342a4efd6c Version Increment 2011-12-22 17:30:31 +00:00
chaos.powdertoy.co.uk
0f59a82ade Version Increment 2011-12-20 01:11:15 +00:00
chaos.powdertoy.co.uk
d8830c53a7 Version Increment 2011-12-19 22:53:07 +00:00
chaos.powdertoy.co.uk
64f8ef2c8a Version Increment 2011-12-19 22:48:29 +00:00
chaos.powdertoy.co.uk
2b77894082 Version Increment 2011-12-19 21:42:04 +00:00
Simon Robertshaw
810adc81fe Use reduced resolution gravity maps for improved performance 2011-12-19 21:35:40 +00:00
Simon Robertshaw
d6953be3a8 New element: Ignition cord 2011-12-19 14:29:01 +00:00
Simon Robertshaw
3812034d2b Fix version in defines 2011-12-19 13:45:12 +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
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
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
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
chaos.powdertoy.co.uk
ffb4c1c5a8 Version Increment 2011-12-09 16:35:39 +00:00
Simon Robertshaw
e519aa911b Element transitions also editable now 2011-12-09 16:30:33 +00:00
chaos.powdertoy.co.uk
1585eda5f0 Version Increment 2011-12-08 17:48:51 +00:00
chaos.powdertoy.co.uk
274df46a37 Test 2011-12-08 17:44:55 +00:00
chaos.powdertoy.co.uk
7c8007dff5 Version Increment 2011-12-08 17:37:23 +00:00
chaos.powdertoy.co.uk
d469b55758 Version Increment 2011-12-08 17:03:47 +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
chaos.powdertoy.co.uk
73fd961d82 Version Increment 2011-12-06 16:28:41 +00:00
chaos.powdertoy.co.uk
27641f54dc Version Increment 2011-12-03 01:00:48 +00:00
chaos.powdertoy.co.uk
d7341e3b86 Version Increment 2011-12-03 00:44:06 +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
Simon Robertshaw
d17336b467 Allow pipe to grab from photon map, BRAY beam takes temp from ARAY 2011-11-26 12:44:52 +00:00
Simon Robertshaw
0ed3ca771e Bomb effects to effects render and sprk glow moved to fire 2011-11-18 22:20:05 +00:00
chaos.powdertoy.co.uk
dfc4183015 Version Increment 2011-11-18 20:08:58 +00:00
Simon Robertshaw
274257687b Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-11-18 19:38:22 +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
chaos.powdertoy.co.uk
eb62ae485d Version Increment 2011-11-18 15:39:38 +00:00
Jacob1
f135dbb734 Added back heat gradient display 2011-11-18 14:44:58 +00:00
Jacob1
8f493b62c3 Add blob display back. Also fix small nothing mode bug. 2011-11-18 14:15:49 +00:00
chaos.powdertoy.co.uk
c5e19c6a66 Version Increment 2011-11-14 17:38:49 +00:00
chaos.powdertoy.co.uk
49e7d1d9d2 Version Increment 2011-11-14 16:48:09 +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
2bd9d61ab5 Listbox for Property tool property field 2011-11-12 16:24:21 +00: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
chaos.powdertoy.co.uk
a3a9af4b6e Version Increment 2011-11-09 14:17:31 +00:00
chaos.powdertoy.co.uk
aade1ff2e2 Version Increment 2011-11-08 22:59:04 +00:00
Simon Robertshaw
c983de144d Cursor in ZooM 2011-11-08 12:35:07 +00:00
chaos.powdertoy.co.uk
d43740feca Version Increment 2011-11-04 16:11:02 -04:00
Simon Robertshaw
6615fbca03 Fix shader compilation for ATi and Intel 2011-11-04 20:07:51 +00:00
chaos.powdertoy.co.uk
85c638bf71 Version Increment 2011-11-02 16:24:41 -04: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
chaos.powdertoy.co.uk
f53fdaa1c2 Version Increment 2011-11-02 06:42:50 -04:00
Simon Robertshaw
3723147a1d ACEL and DCEL, need to be in a better section 2011-11-01 20:44:49 +00:00
savask
3e5fb5942d Made fighters shoot anything deadly. 2011-11-01 23:44:17 +07:00
Simon Robertshaw
6de8346cdb Fix Wireworld graphics 2011-11-01 13:35:18 +00:00
Simon Robertshaw
ec3fdfed1c Deco apply to fire mode 2011-10-31 21:57:13 +00:00
chaos.powdertoy.co.uk
5207c6f7c0 Version Increment 2011-10-31 11:40:15 -04:00
Simon Robertshaw
856f9574b6 Change LCRy workings and add ELEC (wip) 2011-10-30 16:22:33 +00:00
chaos.powdertoy.co.uk
cb05f5c77e Version Increment 2011-10-29 16:22:04 -04:00
chaos.powdertoy.co.uk
33fc44d78b Version Increment 2011-10-28 18:50:23 -04:00
Simon Robertshaw
e46f26684b Fix Life and heat display, implement alpha, blend and add, fix FILT, INVS and BRAY + others 2011-10-28 23:48:57 +01:00
Simon Robertshaw
41448e92bf Add Decorations toggle to quick menu 2011-10-28 22:35:50 +01:00
chaos.powdertoy.co.uk
eab192c605 Version Increment 2011-10-26 17:05:16 -04:00
Simon Robertshaw
e2c9882692 Merge latest FIGH additions 2011-10-26 17:10:21 +01:00
savask
03902ec9a4 Made a special structure for stick mans. 2011-10-26 15:36:00 +01:00
savask
a075fd5a9a Fix one merging error, and adjusted fighters' array. 2011-10-26 15:34:54 +01:00
savask
00d604820d Added fighters. 2011-10-26 15:31:55 +01:00
Simon Robertshaw
18ca4024c1 Remove references to python console 2011-10-26 14:55:26 +01:00
Simon Robertshaw
e46ef289e1 Remove Python console stuff 2011-10-26 14:50:50 +01:00
Simon Robertshaw
6fc1ec3749 Fixes to EMP and speed/zoom for FBO texture 2011-10-25 12:13:45 +01:00
Simon Robertshaw
ef3bab249a Fix syntax errors 2011-10-25 11:40:41 +01:00
Simon Robertshaw
07a1f21df4 Merge latest with graphicstest 2011-10-25 11:31:21 +01:00
Simon Robertshaw
c3b9c698d2 Prevent UI text from overlapping intro message 2011-10-24 18:43:45 +01:00
Simon Robertshaw
8f91f948c1 Generate fire/plasma gradients at runtime, makes editing easier 2011-10-24 17:20:18 +01:00
Simon Robertshaw
b04c20e747 More MSVC fixes 2011-10-23 18:24:51 +01:00
chaos.powdertoy.co.uk
aca5faed90 Version Increment 2011-10-23 12:06:11 -04:00
Simon Robertshaw
1c7b9d9949 Pass particle pointer to graphics update function instead of index. Make PIPE use subcall to get graphics info. Cache for particle graphics properties. Stickman PSPEC_STICKMAN added and implemented 2011-10-23 13:52:26 +01:00
chaos.powdertoy.co.uk
b84371357a Version Increment 2011-10-22 14:40:23 -04:00
Simon Robertshaw
58d667281f Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-10-22 19:39:48 +01:00
Simon Robertshaw
84522d2594 Fix Options meny in scale:2 and make tooltip more readable 2011-10-22 19:39:24 +01:00
Simon Robertshaw
014c1fbad6 Embed shaders 2011-10-22 19:24:32 +01:00
chaos.powdertoy.co.uk
c20e248764 Version Increment 2011-10-22 13:07:49 -04:00
Simon Robertshaw
9cf65de1c3 Quick options menu 2011-10-21 19:41:12 +01:00
Simon Robertshaw
08009ebbaa Screenshot for lua 2011-10-21 17:37:26 +01:00
Simon Robertshaw
09d3cacf9c Implement Blur mode and embed shaders 2011-10-20 16:28:49 +01:00
Simon Robertshaw
2b56d31610 Rendering, Glow and UI alpha fixes 2011-10-20 15:37:21 +01:00
chaos.powdertoy.co.uk
447b8b9d2e Version Increment 2011-10-19 06:03:06 -04:00
chaos.powdertoy.co.uk
813f833cfc Version Increment 2011-10-19 05:48:09 -04:00
Simon Robertshaw
8052c4bfdf Some testing with OpenGL 2011-10-18 21:56:32 +01:00
Simon Robertshaw
7d9d504abf Debug performance/time graph 2011-10-17 00:28:01 +01:00
Simon Robertshaw
44a0008d4e Debug performance/time graph 2011-10-17 00:16:43 +01:00
chaos.powdertoy.co.uk
cae9ad50d0 Version Increment 2011-10-14 13:08:55 -04:00
jacksonmj
3f4d55fbcc Remove unused pixel buffer 2011-10-15 01:05:01 +08:00
jacksonmj
8e877594c9 Allow STKM to use lightning 2011-10-15 01:04:58 +08:00
chaos.powdertoy.co.uk
b32663f667 Version Increment 2011-10-14 12:55:29 -04:00
chaos.powdertoy.co.uk
83b4f7e1ec Version Increment 2011-10-14 05:58:35 -04:00
Simon Robertshaw
bbe5aabf4f Allow use of OpenGL enabled surface for future use 2011-10-13 22:25:06 +01:00
jacksonmj
2f46dca7c1 Some work on DEST, EMP, LIGH 
Change indentation to tabs, respect temperature limit (if a hotter
reaction is required, should raise temp limit instead of ignoring it).

DEST: fix TYPE_SOLID check, and prevent it displacing DMND
EMP: randomise DLAY delay instead of heating it (since DLAY does not melt
and does not transfer heat)

Fix nearest_part so that t=-1 does not include dead particles
 2011-10-14 00:33:20 +08:00
Simon Robertshaw
7a62500eb3 Implement remaining graphics functions for particles 2011-10-12 18:40:00 +01:00
Simon Robertshaw
2cf9ef60aa Implement more particle graphics 2011-10-12 12:37:04 +01:00
Simon Robertshaw
8dad37bf00 New part rendering completed 2011-10-11 18:35:26 +01:00
chaos.powdertoy.co.uk
265ce68e81 Version Increment 2011-10-11 05:35:37 -04:00
chaos.powdertoy.co.uk
51aab692e9 Version Increment 2011-10-10 19:26:21 -04:00
Simon Robertshaw
aaf17208a2 Version Increment 2011-10-11 00:02:29 +01:00
Simon Robertshaw
a87407f0df More functionality for LIGH, better english on element descriptions 2011-10-10 23:55:42 +01:00
Simon Robertshaw
bf8258ee30 Elements, LIGH, TESC, EMP and DEST thanks to MaksProg 2011-10-10 23:41:19 +01:00
Simon Robertshaw
2901eefa32 Smoke Graphics 2011-10-10 22:01:10 +01:00
Simon Robertshaw
948fd376b4 Starting on jumptable/function pointers for graphics, only FIRE is implemented 2011-10-10 20:42:55 +01:00
Simon Robertshaw
ee47b2dd68 Pretty effect when drawing powders, activate with 'n' 2011-10-09 13:55:16 +01:00
jacksonmj
4abefaf1ec tpt.drawline 2011-10-06 21:59:41 +01:00
Simon Robertshaw
f5a9f43b77 Added extra functions to FILT (determined by tmp, modes are convert, filter and add, convert is default). Added property edit tool, changes the properties of materials 2011-09-30 13:57:32 +01:00
Simon Robertshaw
3ecb2ee39b Add JSON parser file (cJSON) and move preference saving to JSON format 2011-09-27 18:44:35 +01:00
Simon Robertshaw
4514c5e619 Make changes to prefs file regarding build_num and updated 2011-09-24 17:13:28 +01:00
Simon Robertshaw
5a824850b3 Detect updates by build number, make confirm box autosize, also fix bug where config file is read before data dir is set (Therefore reading the wrong file) 2011-09-24 16:57:01 +01:00
cracker64
789049b269 Can see selected elements from Lua, tpt.selectedl or tpt.selectedr 2011-09-23 23:25:50 -04:00
Simon Robertshaw
24b4478136 Added Caustic gas, similar to acid, created with acid and water vapour 2011-09-23 12:48:24 +01:00
cracker64
a73fc9db06 Water level equalization test! In options menu, or tpt.watertest() . 2011-09-21 18:36:35 -04:00
Simon Robertshaw
592fe333ea Fix missing header changes from cracker's colour tools commit 2011-09-21 12:38:47 +01:00
cracker64
b926341d80 Merge remote-tracking branch 'origin/master' 2011-09-19 17:05:05 -04:00
cracker64
f0379c5418 Tool menu in deco editor, Lighten/Darken tools. 2011-09-19 17:02:04 -04:00
Simon Robertshaw
f535f8dce4 Game installer launches game with data directory for Windows (AppData) 2011-09-19 21:31:10 +01:00
Simon Robertshaw
8084ae388e Version Increment 2011-09-08 12:14:21 +01:00
Simon Robertshaw
63dd1cfd4b Add energy-only wall and make STOR show when it's holding a particle 2011-09-08 11:54:50 +01:00