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

57 Commits

Author SHA1 Message Date
Simon Robertshaw
98445721fd xor_bitmap drawing for renderer 2012-08-15 16:25:13 +01:00
Simon Robertshaw
2f0e67433c Ensure zoom is drawn after particles for OpenGL Rendering, draw walls onto the correct framebuffer 2012-08-15 15:02:48 +01:00
Simon Robertshaw
0bb4c0e57a Fix cursor and zoom with OpenGL 2012-08-15 13:34:37 +01:00
Simon Robertshaw
1e406eeaf4 Revert some changes by Triclops200 in 42d707f8a4, Broke prototypes for drawrect with pixel functions, seems to have modified drawrect to make filled rects (forgot about fillrect?). Also use correct macros for getting colour components out of pixel data 2012-08-15 13:02:15 +01:00
Simon Robertshaw
54a81031bc Revert "Missing "invert" declaration in OpenGLDrawMethods" 
This reverts commit 708379a3f8.
 2012-08-15 12:55:41 +01:00
Simon Robertshaw
2378363055 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-08-15 12:50:06 +01:00
Simon Robertshaw
708379a3f8 Missing "invert" declaration in OpenGLDrawMethods 2012-08-15 12:49:10 +01:00
Bryan Hoyle
42d707f8a4 Very very basic wall rendering for opengl 2012-08-14 23:18:39 -04:00
Simon Robertshaw
bd7dd20742 Better text selection colour invert, fixes #107 2012-08-14 18:05:07 +01:00
Simon Robertshaw
7ccb7e53fe Show some info when selecting stamps, #104 2012-08-14 16:01:57 +01:00
Simon Robertshaw
d8c299c30a Clear render, display and colour mode in renderer contructor 2012-08-13 18:16:25 +01:00
Savely Skresanov
e6feb6f101 Now stickmen and fighters show HP. Closes #93 2012-08-13 12:47:53 +01:00
Simon Robertshaw
8ca27520a4 Use forward declarations more to avoid excessive includes 2012-08-12 22:32:57 +01:00
Bryan Hoyle
ca7c0e7370 More efficiency, fix of point size being too big 2012-08-12 16:45:37 -04:00
Bryan Hoyle
0a01eacd09 A litte more efficient 2012-08-12 16:34:49 -04:00
Bryan Hoyle
98d31ab5a5 Fixed brush for now, used inefficient algorithm until I can get pure opengl working 2012-08-12 16:32:28 -04:00
Bryan Hoyle
f9a59d22db Revert "minor renderer changes, brush still not working" 
This reverts commit 1b2e0e68bd.
 2012-08-12 15:15:17 -04:00
Bryan Hoyle
44645c93ee Revert "Revert "fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files"" 
This reverts commit 90f505c2da.
 2012-08-12 15:14:46 -04:00
Bryan Hoyle
90f505c2da Revert "fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files" 
This reverts commit 90f71f3b11.
 2012-08-12 15:13:32 -04:00
Bryan Hoyle
1b2e0e68bd minor renderer changes, brush still not working 2012-08-12 15:11:17 -04:00
Bryan Hoyle
90f71f3b11 fixed --opengl-renderer from segfaulting. Added a gitignore for vim swap files 2012-08-12 14:47:13 -04:00
Bryan Hoyle
530e093d8b now opengl and opengl renderer run and compile, but renderer has a segfault, will fix 2012-08-12 14:29:27 -04:00
Bryan Hoyle
e7b653a0c7 more fixes 2012-08-12 11:55:59 -04:00
Bryan Hoyle
07821d9c85 Minor opengl fixes, still not compiling, look at line 14 in src/graphics/OpenGLGraphics.cpp, build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected primary-expression before '{' token 
build/src/graphics/OpenGLGraphics.cpp:14:15: error: expected ')' before '{' token
'
 2012-08-12 11:38:26 -04:00
Simon Robertshaw
08b4e5553a Implement some missing lua functions, PNG format creation (requires zlib) 2012-08-11 20:24:48 +01:00
Simon Robertshaw
2f76c2374d TPT: Give menu color to elements without one (stickmen, TRON, and WARP) 2012-08-11 11:57:21 +01:00
Simon Robertshaw
e34ed89dc3 Some fixes for memory leaks 2012-08-10 23:08:55 +01:00
Simon Robertshaw
810ea42f99 Only render gravity lensing if it's enabled, Ctrl and Shift to alter tool strength (Shift = x10, Ctrl = x0.1) 2012-08-10 14:03:23 +01:00
Simon Robertshaw
3bdfd510b2 Gravity lensing 2012-08-09 01:17:01 +01:00
Simon Robertshaw
bb99efdedf Persistent mode 2012-08-09 00:57:35 +01:00
Simon Robertshaw
a8dcc7a070 Started work on save as current name 2012-08-06 22:24:10 +01:00
Simon Robertshaw
f75a3c2642 More icon adjustments 2012-08-06 17:28:08 +01:00
Simon Robertshaw
662640c96c Fix previous merge with SOAP.cpp that created a bug in SOAP. add debug lines for PRTI, PRTO, WIFI and lines for SOAP. 2012-08-06 16:14:08 +01:00
Simon Robertshaw
8cadc10f8b Icon adjustments 2012-08-05 20:39:39 +01:00
Simon Robertshaw
ed270d8dbf Draw gravity zones when using grav wall 2012-08-05 15:26:17 +01:00
Simon Robertshaw
0558322709 Add icons for erase, improve icons for certain walls, fix issue #45 2012-08-04 15:26:55 +01:00
Simon Robertshaw
36b2aa0191 QuickOptions!! #46 2012-08-03 15:29:18 +01:00
ntoskrnl
f94fabd999 Rename WIN32 preprocessor definition to WIN 2012-08-02 15:21:16 +01:00
Simon Robertshaw
c14a008d46 Corrections to GameSave to prevent conflicts in the Expanded state, improve Save preview comments display 2012-07-28 18:38:34 +01:00
Simon Robertshaw
f9eeebb910 Draw brush using renderer, fixes issue #25 2012-07-28 13:09:35 +01:00
Simon Robertshaw
30b11a7724 Air heat is not rendered if ambient heat is disabled 2012-07-28 12:48:34 +01:00
Simon Robertshaw
385552ceab Correct blending of SetPixel without alpha channel 2012-07-27 21:04:00 +01:00
Simon Robertshaw
b612c076eb Prevent crash when drawing an image out of mounts on a pixel grid 2012-07-27 20:53:09 +01:00
Simon Robertshaw
5befe5c25f Local file browser + some more interesting things like Progress bar UI component 2012-07-27 20:06:17 +01:00
Simon Robertshaw
121e7c772c Rename .inc files to inl 2012-07-26 15:06:06 +01:00
Simon Robertshaw
a03e92830a Make only one airmode selectable at a time 2012-07-25 14:43:56 +01:00
Simon Robertshaw
32d9b87f66 Correct Stickman appearance 2012-07-25 14:24:03 +01:00
Simon Robertshaw
860fc0d4c9 Streamlines 2012-07-25 14:08:14 +01:00
Simon Robertshaw
8062319160 Correct initial zoom size 2012-07-25 12:46:48 +01:00
Simon Robertshaw
998f11451f \x0E resets text colour to one previously set by \b 2012-07-25 11:47:53 +01:00