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

648 Commits

Author SHA1 Message Date
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
jacksonmj
5892c74595 Visual Studio fixes 2011-09-05 08:40:17 +08:00
Simon Robertshaw
3d5d10b1ed Missing changes from previous commit 2011-09-03 21:00:23 +01:00
Simon Robertshaw
78efe39642 Version incremenet 2011-09-03 14:41:38 +01:00
Simon Robertshaw
ea68100724 Added Powered Void 2011-09-03 14:06:36 +01:00
Simon Robertshaw
d84abca852 Improvements to CBNW and BIZR act as a dye 2011-08-30 13:44:18 +01:00
jacksonmj
741014770c Add tpt.setwindowsize(scale, fullscreen) 2011-08-30 19:34:28 +08:00
Simon Robertshaw
323f3c1415 Save ctype of STOR, also Version Increment 2011-08-30 01:02:41 +01:00
Simon Robertshaw
343376e8f1 Version Increment 2011-08-29 16:59:01 +01:00
Simon Robertshaw
26269ff052 Added STOR, a block that can store a single particle and release when charged 2011-08-29 16:34:53 +01:00
Simon Robertshaw
efc7565b6f More stuff for CO2 2011-08-26 11:56:46 +01:00
Simon Robertshaw
caf0ee76e3 CO2, WIP 2011-08-25 23:06:05 +01:00
Simon Robertshaw
e9331794bd Improvements to getscript 2011-08-25 12:20:00 +01:00
Bryan Hoyle
578144c48a Merge remote branch 'origin/master' 2011-08-23 20:29:26 -04:00
Bryan Hoyle
f577c319db Working tpt.getscriptid(<string: id>). Retrieves and runs a script from online 2011-08-23 20:28:55 -04:00
savask
6581c29bf7 An icon for tools. 2011-08-23 23:45:18 +07:00
savask
021168ad1b Added "Tools" menu. 2011-08-23 23:45:01 +07:00
Simon Robertshaw
42938cc2ea Lua keyevents bug, int keycode is cast to a char 2011-08-22 21:22:21 +01:00
Simon Robertshaw
ac6feec874 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-22 01:02:27 +01:00
jacksonmj
75cb924bd9 Fix electrode when in replace mode or specific delete mode 
Also fix bomb when SLALT != 0
 2011-08-22 01:02:02 +01:00
jacksonmj
5f8fba12c8 Change portal so that randomness never causes a particle to exit the same side it came in 2011-08-21 02:37:25 +08:00
Simon Robertshaw
99b67598aa Changes to unify mouse and keyboard events for Lua 2011-08-20 18:18:09 +01:00
jacksonmj
a96afc863e Stickman go through portals 2011-08-20 18:29:02 +08:00
Simon Robertshaw
2e2694e0fb Revert "Move version check out of main()" 
This reverts commit 97da8593d9.
 2011-08-19 23:44:09 +01:00
Simon Robertshaw
799c99257c Version Increment 2011-08-19 22:56:07 +01:00
jacksonmj
2bbfdc72fb Fix DEBUG_DRAWTOOL to work with line snapping 2011-08-19 20:30:32 +01:00
jacksonmj
97da8593d9 Move version check out of main() 2011-08-19 13:55:07 +01:00
Simon Robertshaw
88823cf604 Reorganise a lot of Python console stuff 2011-08-19 13:16:49 +01:00
Bryan Hoyle
161eb60cfa Added PGRV and NGRV for positive and negative gravity tools (sortof like air and vac, but with gravity) 2011-08-16 18:07:12 -04:00
Bryan Hoyle
e2df8e2c16 Version incriment 2011-08-16 16:51:50 -04:00
Bryan Hoyle
e55e52c460 added gbmb which is an element that makes large amounts of gravity when it hits a particle 2011-08-16 14:39:50 -04:00
Bryan Hoyle
ad09f3040e Revert "Revert "added lua command: tpt.setfpscap(int FPSCap)"" 
This reverts commit a5db1d53da.
 2011-08-16 12:45:44 -04:00
Bryan Hoyle
a5db1d53da Revert "added lua command: tpt.setfpscap(int FPSCap)" 
This reverts commit aa56eca5c0.
 2011-08-16 12:43:50 -04:00
Bryan Hoyle
aa56eca5c0 added lua command: tpt.setfpscap(int FPSCap) 2011-08-15 21:44:37 -04:00
Simon Robertshaw
d3153aae85 Extended info for line drawing 2011-08-14 18:31:48 +01:00
Simon Robertshaw
11843a8ee0 Fix movable WIRE 2011-08-11 20:22:08 +01:00
Simon Robertshaw
d5435c50a9 Debug info for particles allocation 2011-08-11 20:12:52 +01:00
Simon Robertshaw
9e634b95cc Fire intensity from Lua 2011-08-11 13:02:00 +01:00
Simon Robertshaw
3ed6a44a24 Add FRZZ to Powders menu 2011-08-11 00:43:35 +01:00
jacksonmj
1713604233 Skip unused particles at end of parts[] 2011-08-11 07:38:56 +08:00
Simon Robertshaw
61bbc36cfa Fix Gol with Wire placed 2011-08-08 16:19:23 +01:00
Simon Robertshaw
7b968a1f37 Version increment 2011-08-08 15:06:57 +01:00
Simon Robertshaw
9b9d628374 Improvements to Wire 2011-08-08 14:57:32 +01:00
lieuwe
50c4bfd86d Y U NO WORK. added logic for WIRE but it's not being called. 2011-08-08 20:32:04 +08:00
lieuwe
15b4ba7532 added WIRE particle type. 2011-08-08 20:31:20 +08:00
jacksonmj
788b0cd04c Calculate Newtonian gravity using fast Fourier transforms 
About 16% slower for one cell changing, same speed for 6 cells changing,
and several hundred times faster for whole screen changing.
 2011-08-06 18:13:22 +08:00
jacksonmj
d20c704d88 LIFE descriptions 2011-08-06 18:13:22 +08:00
Simon Robertshaw
4ebe56f65c Mouse and keyboard events, replace luaL_openlib() with luaL_register() and move mousex and mousey out of the global table and into the 'tpt' table 2011-08-05 14:54:24 +01:00
Simon Robertshaw
89e47bfa4d Some tags for version info to make it easier for automation tools 2011-07-31 14:20:22 +01:00
Simon Robertshaw
f51fe2c983 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-07-31 12:20:16 +01:00
Bryan Hoyle
d7a55f1f50 me4502 added tpt.throw_error and tpt.heat as lua commands 2011-07-30 20:31:34 -04:00
Simon Robertshaw
3bd5a4711c Less buggy DLAY 2011-07-27 14:28:32 +01:00
Simon Robertshaw
58d96de4ce Revert "DLAY element" 
This reverts commit 7338545ab4.
 2011-07-27 13:07:41 +01:00
jacksonmj
647e29a31a Fix LIFE graphics in blob, nothing and fancy view 
And some small fixes for switchable element colours
 2011-07-26 18:27:56 +01:00
Simon Robertshaw
899969cc8a Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-07-26 17:46:15 +01:00
tridiaq
7338545ab4 DLAY element 2011-07-26 17:05:20 +01:00
savask
dbd3272933 Generalized stick man's update functions. Got rid of some unnecessary 
variables.
 2011-07-25 12:47:38 +07: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
cracker64
d013aa3632 Added functions to header. 2011-07-22 06:55:43 -07:00