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

686 Commits

Author SHA1 Message Date
Simon Robertshaw
6500923aa5 Sample tool, fixes #122 2012-08-17 13:40:10 +01:00
Simon Robertshaw
be42cec498 Fix sign tool message box placeholder text 2012-08-17 12:24:46 +01:00
Simon Robertshaw
edad8f46af Undo/Snapshots, fixes #118 2012-08-16 22:03:40 +01:00
Simon Robertshaw
f19c7f62c7 Air invert and grid mode switching 2012-08-16 12:15:29 +01:00
Simon Robertshaw
08f9721619 Missing part of fix for save comments page number 2012-08-15 18:42:19 +01:00
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
c8080cb025 Photon wavlength info for HUD, fixes #111 2012-08-14 19:18:59 +01:00
Simon Robertshaw
03f455bc1a Fix typo, HUD variable should be Tmp, not Temp, #111 2012-08-14 19:00:13 +01:00
Simon Robertshaw
079b51a26c Stricter formatting for Property tool, attempts to address #109 2012-08-14 18:52:14 +01:00
Simon Robertshaw
fcc17ee652 Easier okaying/cancelling for Property tool Window 2012-08-14 18:38:46 +01:00
Simon Robertshaw
34e2ec2459 Tooltips for menu buttons, fixes #113 2012-08-14 18:23:56 +01:00
Simon Robertshaw
fc1274f381 Fix crash caused by malformed preference files, fixes #110 2012-08-14 18:14:06 +01:00
Simon Robertshaw
a7711668b7 Strings.h for strcasecmp in Simulation 2012-08-14 18:06:18 +01:00
Simon Robertshaw
bd7dd20742 Better text selection colour invert, fixes #107 2012-08-14 18:05:07 +01:00
Simon Robertshaw
3fcfede08f Add missing strings.h header for strcasecmd 2012-08-14 17:29:59 +01:00
Simon Robertshaw
a76e4d71a9 Name colour formatting in comments 2012-08-14 17:20:47 +01:00
Simon Robertshaw
03188e5853 Ensure comments page count is loaded correctly, fixes #117 2012-08-14 17:00:12 +01:00
Simon Robertshaw
66fffe649d Prevent page count for being all over the place in search 2012-08-14 16:41:06 +01:00
Simon Robertshaw
b06f7f5b6d Air and heat tool limits, fixes #112 2012-08-14 16:29:07 +01:00
Simon Robertshaw
e13476a406 Cut region, fixes #105 2012-08-14 16:28:44 +01:00
Simon Robertshaw
70758cc70e Allow key releases when in stamp selecting/placement #104, #105 2012-08-14 16:07:50 +01:00
Simon Robertshaw
45b275be0d Reset drawing state when placing stamps 2012-08-14 16:04:38 +01:00
Simon Robertshaw
7ccb7e53fe Show some info when selecting stamps, #104 2012-08-14 16:01:57 +01:00
Simon Robertshaw
8604b30548 Stamp selection and placements works through the zoom window, #104 2012-08-14 15:35:03 +01:00
Simon Robertshaw
02696b1cbe Snap stamp selection to CELL res, #104 2012-08-14 15:27:30 +01:00
Simon Robertshaw
ef6c4e91ae Correct tooltip for save button 2012-08-14 15:02:49 +01:00
Simon Robertshaw
cee8458953 Whoops, close DropDown windows before disposing 2012-08-14 14:47:58 +01:00
Simon Robertshaw
db519a7036 Varying borders for button, exit dropdown menu with Esc or outside click, fixes #100 2012-08-14 14:22:41 +01:00
Simon Robertshaw
d5e57e04d0 Fix tool buttons 2012-08-14 14:00:39 +01:00
Simon Robertshaw
e420ee51b1 Lua autorun, fixes #99 2012-08-14 13:14:49 +01:00
Simon Robertshaw
fed38185fd Placeholder text for sign tool window, #98 2012-08-14 13:09:13 +01:00
Simon Robertshaw
49ae651dd3 Focus text field for Sign Tool Window, fixes #98 2012-08-14 13:08:42 +01:00
Simon Robertshaw
4f3e03e317 Update gitignore, show votes correctly, fixes #97 2012-08-14 13:06:10 +01:00
Simon Robertshaw
c877e445b9 Remove temp files created by scheme handling 2012-08-14 12:36:50 +01:00
Simon Robertshaw
53b8e8ca78 ptsave scheme handling for Linux, addresses #97 2012-08-14 12:36:04 +01:00
Simon Robertshaw
fe59ec9659 Only call button actions if the mouse is released inside the button. Fixes #96 2012-08-14 12:15:28 +01:00
Simon Robertshaw
b05a847e96 Fix crash when using search (std::remove doesn't seem to work as I expected), Add clickable author names for search. Fixes #95 2012-08-14 12:03:33 +01:00
Simon Robertshaw
651546b5bf Fix bug where thumbnails would not always show in the search 2012-08-13 21:08:55 +01:00
Simon Robertshaw
d8c299c30a Clear render, display and colour mode in renderer contructor 2012-08-13 18:16:25 +01:00
Simon Robertshaw
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01:00
Savely Skresanov
e6feb6f101 Now stickmen and fighters show HP. Closes #93 2012-08-13 12:47:53 +01:00
Bryan Hoyle
ae469e8e02 oops, fixed a bad piece of code I added 2012-08-12 19:10:01 -04:00
Bryan Hoyle
1dc6c7cfef Opengl fixes 2012-08-12 17:40:44 -04: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
Simon Robertshaw
7084c8be28 Fix spinner drawing 2012-08-12 18:36:30 +01: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
f1fc3811aa Remove more unused files 2012-08-12 16:29:40 +01:00
Simon Robertshaw
760a721e0d Remove old unused textarea 2012-08-12 16:20:43 +01:00
Simon Robertshaw
5d3d1d4916 Message of the day and user session check on startup 2012-08-12 15:15:47 +01:00
Simon Robertshaw
08b4e5553a Implement some missing lua functions, PNG format creation (requires zlib) 2012-08-11 20:24:48 +01:00
Simon Robertshaw
ecbb1e9103 Lua element and graphics functions working (element_func no longer uses "replace" parameter and replaces all functions) 2012-08-11 12:45:49 +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
ca7b02dbfd Don't set tool strength when there's no tool 2012-08-10 23:11:37 +01:00
Simon Robertshaw
e34ed89dc3 Some fixes for memory leaks 2012-08-10 23:08:55 +01:00
Simon Robertshaw
a8fbd905c2 Fix issue where buttons will cause heap corruption if they are removed from inside DoAction 2012-08-10 22:59:46 +01:00
Simon Robertshaw
5a8d26554a Fix crash when using mouse click with unassigned tools 2012-08-10 22:31:58 +01:00
Simon Robertshaw
a6b3674f22 Fix PIPE, fixes #92 2012-08-10 22:30:19 +01:00
Simon Robertshaw
92311a38c0 Change zoom size with [ and ], fixes #90 2012-08-10 22:09:04 +01:00
Simon Robertshaw
c1d7de24f2 Sign moving, fixes #10 2012-08-10 22:01:57 +01:00
Simon Robertshaw
98209da0a5 Save Open signs working 2012-08-10 20:50:36 +01:00
Simon Robertshaw
150114c11f Alt Z to stick zoom to cursor, disable cursor rendering when zoom is being placed. Fixes #32 2012-08-10 19:11:59 +01:00
Simon Robertshaw
3499cb3035 Wall brush, fixes #63 2012-08-10 18:59:05 +01:00
Simon Robertshaw
cd051924d9 Installation with Ctrl+I, fixes #77 2012-08-10 15:41:39 +01:00
Simon Robertshaw
643128ac5f Invert button hover state for alternative load and save. addresses some of #80 2012-08-10 14:42:01 +01:00
Simon Robertshaw
c62f65585a Create local saves dir if it does not exists (fixes #80) 2012-08-10 14:34:55 +01:00
Simon Robertshaw
3f20b4256b Correct position of cancel button in server save dialogue 2012-08-10 14:22:32 +01:00
Simon Robertshaw
c333e9bb99 Correct position of cancel button in local save dialogue as per #80 2012-08-10 14:21:38 +01:00
Simon Robertshaw
a45ca0363e Tool - Correct box drawing. Finishing touches to tool strength (Fixes #87) 2012-08-10 14:12:56 +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
fd40ed234a Impose limit on cursor radius (Limit is radius 128, somewhat smaller than TPT, but I don't think a larger size is necessary), fixes #88 2012-08-10 13:17:19 +01:00
Simon Robertshaw
0e67fe028b Use Left modifier keys 2012-08-10 12:43:21 +01:00
Simon Robertshaw
b01b0e422a HUD verbose sample info with 'd', fixes #71 2012-08-09 21:28:43 +01:00
Simon Robertshaw
9971ea63b7 Slow LIGH creation speed, fixes #86 2012-08-09 21:05:20 +01:00
Simon Robertshaw
ac45502de9 Ensure keyrepeat is disabled at component creation 2012-08-09 20:38:06 +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
d352a10d80 PTsave opening 2012-08-08 21:32:10 +01:00
Simon Robertshaw
435c680f01 Command line "open" 2012-08-08 20:24:23 +01:00
Simon Robertshaw
bd29667355 Do not delete given savefile in GameModel::SetSaveFile, behaviour should be similar to GameModel::SetSave in terms of managing memory in given pointer 2012-08-08 20:21:59 +01:00
Simon Robertshaw
9f1301df5a Perhaps FileExists shouldn't erase file contents... 2012-08-08 20:05:47 +01:00
Simon Robertshaw
346e9d2168 Proxy from command line arg 2012-08-08 18:34:37 +01:00
Simon Robertshaw
73a18998f6 Scale and fullscreen loaded/saved to config and commandline 2012-08-08 17:42:04 +01:00
Simon Robertshaw
0004ca1845 Make options screen a little nicer 2012-08-08 14:41:16 +01:00