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

271 Commits

Author SHA1 Message Date
Simon Robertshaw
7413654b9f Fix Blob mode, Sprk, Firw, Fwrk and others 2011-10-28 22:36:37 +01:00
Simon Robertshaw
228e79eb4f Fix graphics for Phot, Fire, Stor 2011-10-28 22:10:05 +01:00
Simon Robertshaw
e2c9882692 Merge latest FIGH additions 2011-10-26 17:10:21 +01:00
Simon Robertshaw
60de1cf575 Fix graphics.c 2011-10-26 16:24:54 +01:00
savask
03902ec9a4 Made a special structure for stick mans. 2011-10-26 15:36:00 +01:00
savask
00d604820d Added fighters. 2011-10-26 15:31:55 +01:00
Simon Robertshaw
ef7e231a32 Half-working persistent mode 2011-10-25 16:10:16 +01:00
Simon Robertshaw
b9ec7d8654 Fix another blending issue and search_ui display clearing 2011-10-25 16:00:52 +01:00
Simon Robertshaw
565a3e10e4 Fix EMP flash 2011-10-25 15:45:16 +01:00
Simon Robertshaw
48ad01f2ff Fix for odd alpha blending partsTex 2011-10-25 13:42:17 +01:00
Simon Robertshaw
cb537351e7 Fixes to EMP and speed/zoom for FBO texture 2011-10-25 12:13:32 +01:00
Simon Robertshaw
07a1f21df4 Merge latest with graphicstest 2011-10-25 11:31:21 +01:00
Simon Robertshaw
f01056ee02 Spark graphics change and disable lensing for non-fancy displays 2011-10-25 09:17:11 +01:00
Simon Robertshaw
506ab6ea0e Cursors for OpenGL, Coords are a bit off, which is annoying and I cannot draw to parts FBO because It's already been rendered D:< 2011-10-25 00:16:57 +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
0a8f65b2cf Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-10-23 17:59:25 +01:00
Simon Robertshaw
b549688fdd Compatibility with MSVC - devast8a 2011-10-23 17:59:04 +01:00
Simon Robertshaw
66fd41673b Fix compilation for Non-OpenGL builds 2011-10-23 17:37:24 +01:00
Simon Robertshaw
2d25d944ad Spark, Flare and LFlare effects. Pretty bad (need to make use of instancing) but works for now 2011-10-23 17:22:14 +01: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
jacksonmj
05eb16e14c Fix LIGH overwriting fire_alpha 2011-10-23 17:54:29 +08:00
Simon Robertshaw
014c1fbad6 Embed shaders 2011-10-22 19:24:32 +01:00
Simon Robertshaw
ba59ba8b7c Fix Air vel display 2011-10-22 17:33:04 +01:00
Simon Robertshaw
abb1a12271 Finish Zoom 2011-10-22 14:41:14 +01:00
Simon Robertshaw
5b4aeaed01 Zoom WIP 2011-10-22 10:45:44 +01:00
Simon Robertshaw
7ed4ad2fd8 Gravlensing for OpenGL 2011-10-21 23:38:48 +01:00
Simon Robertshaw
57f6ac0f3a Use FBO for parts rendering 2011-10-21 18:21:22 +01:00
Simon Robertshaw
c1eb40af61 Fix gravity field drawing 2011-10-21 17:25:14 +01:00
Simon Robertshaw
e6d4073f5b Use FBO for particles 2011-10-20 22:22:18 +01:00
Simon Robertshaw
eaafcaeecc Better fire for Non-Fire display modes 2011-10-20 16:51:38 +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
Simon Robertshaw
29efbcaa3a Glow, Fire, Smoke, blob and flat particle effects in OpenGL 2011-10-20 00:34:31 +01: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
Simon Robertshaw
f9883b31e0 Reset emp-decor if out of bounds 2011-10-14 18:08:06 +01:00
jacksonmj
3f4d55fbcc Remove unused pixel buffer 2011-10-15 01:05:01 +08:00
Simon Robertshaw
37e15bf3ad Replace use of gravy and gravf with gravxf and gravyf 2011-10-14 13:18:00 +01:00
Simon Robertshaw
1af0a86e0d Prevent integer overflow with emp_decor 2011-10-14 12:12:27 +01:00
Simon Robertshaw
56764a2309 Prevent integer overflow with emp_decor 2011-10-14 12:11:09 +01:00
Simon Robertshaw
bbe5aabf4f Allow use of OpenGL enabled surface for future use 2011-10-13 22:25:06 +01:00
jacksonmj
af21bcd353 Some changes to LIGH/EMP/TESC based on changes in MaksProg's mod v0.3 
Weaker and shorter EMP flash.
TESC has correct tmp value when created with replace mode.
LIGH harms STKM.
Gravity affects LIGH in create_part if p==-2, instead of in update_LIGH,
so that TESC lightning is not affected by gravity.
 2011-10-14 00:33:22 +08:00
Simon Robertshaw
0e61956b24 Improved 'GLOW' rendering 2011-10-11 18:54:38 +01:00
Simon Robertshaw
8dad37bf00 New part rendering completed 2011-10-11 18:35:26 +01:00
Simon Robertshaw
bf8258ee30 Elements, LIGH, TESC, EMP and DEST thanks to MaksProg 2011-10-10 23:41:19 +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
1759d0bd46 Make photons less green, green was given 2 extra bits by Skylark, not sure if this was intentional or not. 2011-09-30 10:50:46 +01:00
jacksonmj
820871e92b Fix lighten/darken tools so they work with different display pixel formats 2011-09-26 23:53:37 +08:00
cracker64
f0379c5418 Tool menu in deco editor, Lighten/Darken tools. 2011-09-19 17:02:04 -04:00
Simon Robertshaw
49a164b7ba Fix various memory leaks, as noted by Merkil/cppcheck 2011-09-10 13:33:24 +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
Simon Robertshaw
ea68100724 Added Powered Void 2011-09-03 14:06:36 +01:00
jacksonmj
a7ede2659a Allow decoration layer to affect firework explosion colour 2011-08-30 19:34:28 +08:00
jacksonmj
42cfb74c2b Remove blocking walls from pmap 
2.5% speed increase on a screen full of water
 2011-08-27 18:37:03 +08:00
Simon Robertshaw
efc7565b6f More stuff for CO2 2011-08-26 11:56:46 +01:00
jacksonmj
20aba663cd Fix STKM_init_legs and leg/head colours in prerender_save 2011-08-21 02:37:25 +08:00
Simon Robertshaw
03ee03ed1e Fix Coal invisibility when drawn on pause 2011-08-20 12:03:43 +01:00
Simon Robertshaw
aa01aacebe Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2011-08-19 20:30:53 +01:00
jacksonmj
2bbfdc72fb Fix DEBUG_DRAWTOOL to work with line snapping 2011-08-19 20:30:32 +01:00
jacksonmj
075bf06c71 Fix crash in prerender_save when STKM is near bottom of save 2011-08-20 03:29:34 +08:00
Simon Robertshaw
ac4ffb8d5d Fancy Coal effects 2011-08-19 17:53:56 +01:00
jacksonmj
961a393c7a Modify GBMB to only use life 
tmp not needed, since it doesn't create powder during an explosion like BOMB does.
 2011-08-19 12:23:38 +01:00
jacksonmj
de820e36f8 Only do grav lensing when N-grav is on, and round coordinates correctly 2011-08-19 12:22:12 +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
0cbf66a495 GBMB now has cool flicker graphics. 2011-08-16 15:22:11 -04:00
Bryan Hoyle
53d2c2d42f GBMB changes 2011-08-16 15:18:15 -04:00
Bryan Hoyle
d0291e73bc I'm an idiot, had to replace the blendpixel because I forgot about fire mode. 2011-08-16 14:51:59 -04:00
Bryan Hoyle
60c6aab523 Accedentally put in a blendpixel, it is now removed 2011-08-16 14:44:48 -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
2749285134 LCRY can be coloured by decoration tool 2011-08-12 16:54:44 +01:00
Simon Robertshaw
62bd61edae Better graphics for H2 and O2 2011-08-12 16:34:20 +01:00
Simon Robertshaw
2d7c75c026 More fancy debug 2011-08-12 16:15:42 +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
jacksonmj
1713604233 Skip unused particles at end of parts[] 2011-08-11 07:38:56 +08:00
lieuwe
8f92829aab IT WOOOOOORKS :D (fixed WIRE logic.) 2011-08-08 20:32:53 +08: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
Simon Robertshaw
3bd5a4711c Less buggy DLAY 2011-07-27 14:28:32 +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
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
fbb72e4f32 Slight speed improvements for lensing 2011-07-24 14:26:32 +01:00
jacksonmj
f8d60b14d2 Avoid division by zero for circle brush 2011-07-24 20:07:15 +08: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
Cate
4efa60009e Some letters changed and formatting fixed. n_n 2011-07-12 18:47:56 +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
Cate
45fe00bef9 Added Cracker changes for adding a triangle brush! :DDD Seems to work without any issues. 2011-07-12 23:29:22 +08:00
Simon Robertshaw
aaaed342ef Fix cursor rendering and some potential crashes for LIFE, courtesy of jacksonmj 2011-07-12 06:51:47 -07:00
Cate
0ce4104c7a Added CLST element, which is Clay dust, for making concrete with water. :D Neat due to element cohesion with itself, which causes it to sludge downwards in a way very uncharacteristic of any current powder. Cohesion is very easy to modify. Thanks to Savask for help with cohesion code. :D 2011-07-12 21:00:21 +08:00
Cate
7036af066b Fixed quartz colors due to missing Else before an If in graphics.c Thanks Savask. :D (I would have moved ifs around in a much less pleasant way @_@;) 2011-07-12 21:00:20 +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