Commit Graph

312 Commits

Author SHA1 Message Date
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
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
d5e57e04d0 Fix tool buttons 2012-08-14 14:00:39 +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
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
074dcd0b42 Precompile some headers. Fix sconscript to prevent recompiling everything 2012-08-13 15:43:57 +01: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
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
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
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
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
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
d352a10d80 PTsave opening 2012-08-08 21:32:10 +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
8ec66aede9 Make intro text fade out correctly 2012-08-07 19:25:05 +01:00
Simon Robertshaw
0ef9519bab Actual intro text 2012-08-07 19:16:43 +01:00
Simon Robertshaw
bc1c967a6b Intro text, addresses #59 2012-08-07 18:34:39 +01:00
Simon Robertshaw
46b2def193 Save as current name complete, resolves #5 2012-08-07 01:58:46 +01:00
Simon Robertshaw
51657b8575 Prevent save as current name from showing if there is no save loaded 2012-08-06 22:27:09 +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
d46a72aa3b Font glyphs for decorations and element search 2012-08-05 22:02:12 +01:00
Simon Robertshaw
0f4bde9394 Clear search button 2012-08-05 21:07:22 +01:00
Simon Robertshaw
8cadc10f8b Icon adjustments 2012-08-05 20:39:39 +01:00
Simon Robertshaw
4ce22e4e77 Wall Edge option, fixes #70 2012-08-05 18:35:12 +01:00
Simon Robertshaw
30f8049efc Allow 24bits of var for create_part, add tool for tesc. Fixes #72 2012-08-05 16:59:14 +01:00
Savely Skresanov
6e324c82e2 Added triangle brush, fixes #47 2012-08-05 16:19:30 +01:00
Simon Robertshaw
3030d67516 Fan wall line tool, fixes #61 2012-08-05 16:14:33 +01:00
Simon Robertshaw
ed270d8dbf Draw gravity zones when using grav wall 2012-08-05 15:26:17 +01:00
Simon Robertshaw
f2f4278932 Better exiting from windows (Escape and Enter) and 'q' for exit, fixes #35 and #60 2012-08-04 16:39:24 +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
18e1890590 Stickman keys working, fixes first half of issue #50 2012-08-04 14:34:43 +01:00
Savely Skresanov
e06d8e4d15 Rectangle snapping. 2012-08-04 13:52:22 +01:00
Simon Robertshaw
268795eec1 Add date to Preview View, fixes issue #64 2012-08-04 13:40:39 +01:00
Simon Robertshaw
ab8466e990 Search window is persistent, issue #66 2012-08-04 12:09:07 +01:00
ntoskrnl
baf07e470e Build fixes for FreeBSD 2012-08-04 11:32:48 +01:00
Simon Robertshaw
f586a5585f Add shortcuts for things like gravity, air and air reset, issues #85 and #57 2012-08-03 19:25:28 +01:00
Simon Robertshaw
0e5c3da0f5 Use plop tool to place single units of an element (Used for Stickman, Fighter), fixes issue 53 2012-08-03 18:26:06 +01:00
Simon Robertshaw
c7dd248ae3 Hide cursor when selecting/pasting stamps, fixes iseeu #56 2012-08-03 17:19:22 +01:00
Simon Robertshaw
2652309a3f Nicer defaults for Window closing, Implement these with Sign tool, issue #51. Also set centre as default 2012-08-03 17:09:34 +01:00
Simon Robertshaw
36b2aa0191 QuickOptions!! #46 2012-08-03 15:29:18 +01:00
Simon Robertshaw
80dfc96c7c PROP tool colour 2012-08-03 12:58:21 +01:00
Simon Robertshaw
347c382e99 Allow PROP to set types from element name, fixes issue #48 2012-08-03 12:52:07 +01:00
Simon Robertshaw
b165619266 Update menus on element change from lua, addresses issue #42 2012-08-03 00:47:39 +01:00
Simon Robertshaw
cbefea85d7 Local Saving, Server Saving rewrite 2012-08-01 22:29:22 +01:00
Simon Robertshaw
303b546ceb Ensure CTRL, SHIFT and ALT states are reset when Window falls into background 2012-07-30 11:51:42 +01:00
Simon Robertshaw
6d5388b221 Faster brush adjusting with [ and ], use alt to change to 1 pixel 2012-07-30 11:25:32 +01:00
Simon Robertshaw
011a65f793 Improvements to textbox, prevent selection loss on non modifying keypresses 2012-07-29 20:27:18 +01:00
Simon Robertshaw
d138b2de54 Number type for text fields, addresses some of issue #39 2012-07-29 20:17:51 +01:00
Simon Robertshaw
418373a3cd HUD toggle, addresses "h should toggle the HUD" in issue #23 2012-07-29 15:08:38 +01:00
Simon Robertshaw
f8a6d2ea1f Textboxes for decoration, addresses "No text boxes in deco editor to directly edit the values" in issue #23 2012-07-29 14:58:56 +01:00
Simon Robertshaw
90ad1fd856 Restart N. Grav when needed (somewhat effects issue #31) and fix shitty logic when setting paused state on loading save (Fixes issue #34) 2012-07-29 12:29:19 +01:00
Simon Robertshaw
fc93b71485 Resize brush X and Y axis seperately using Shift and Control, Addresses issue #27 2012-07-28 14:13:28 +01:00
Simon Robertshaw
f9eeebb910 Draw brush using renderer, fixes issue #25 2012-07-28 13:09:35 +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
f8766201a6 TPT: Optimization for GoL, Added brush size and mouse wheel to lua! e7035233fd 2012-07-25 19:32:36 +01:00
Simon Robertshaw
9b1fb64e16 WIND tool 2012-07-25 13:37:04 +01:00
Simon Robertshaw
dceefed030 Correct alignment of elements in TextPrompt 2012-07-24 17:41:41 +01:00
Simon Robertshaw
bc2e4ab23f Adjust icon positions 2012-07-24 15:21:01 +01:00
Simon Robertshaw
603cf3149d HUD improvements 2012-07-24 14:58:39 +01:00
Simon Robertshaw
e65e222f2c Integer values for prefs, Default decoration colour, clear decoration 2012-07-24 13:03:28 +01:00
Simon Robertshaw
a1b4168b30 Sign tool icon 2012-07-22 15:01:56 +01:00
Simon Robertshaw
f445b80e8a Strealine icon and Erase icon 2012-07-22 14:46:09 +01:00
Simon Robertshaw
f7d8556965 Icons for menu items 2012-07-21 18:43:46 +01:00
Simon Robertshaw
c9bffd30a6 Element search triggered by 'e' key 2012-07-19 19:01:26 +01:00
Simon Robertshaw
744df602d7 Correct text colour on element buttons 2012-07-19 18:54:40 +01:00
Simon Robertshaw
4d961117bd Special ligh placement 2012-07-19 17:49:40 +01:00
Simon Robertshaw
c2873180e2 GOL loads gol colours for use 2012-07-19 17:05:01 +01:00
Simon Robertshaw
2b4ec99894 Use two functions for renderer drawing instead of several, fix alignment with Zoom Window border 2012-07-19 16:37:56 +01:00
Simon Robertshaw
dd0e6e7f4d Add descriptions to toolbuttons, add Tooltips to Button, ToolTip event for Windows 2012-07-18 20:34:58 +01:00
Simon Robertshaw
26dbd547d3 Info tip for changing display modes 2012-07-18 18:33:44 +01:00
Simon Robertshaw
80044bb0f0 Renderer Presets and default graphics function 2012-07-18 17:22:35 +01:00
Simon Robertshaw
2329f98f0a Varying update notifications 2012-07-17 16:57:12 +01:00
Simon Robertshaw
adc9cc0816 Move graphics into seperate folder 2012-07-06 16:06:26 +01:00
Simon Robertshaw
c996d01228 Make update notification a little better - correct colour. Correct multiline label for Confirm prompt 2012-07-03 13:58:59 +01:00
Simon Robertshaw
e5f96cd3c9 Add missing RenderFill function for brushes 2012-07-03 13:44:34 +01:00
Simon Robertshaw
5edca6e243 Line snapping in gameview - hold alt 2012-07-03 13:32:08 +01:00
Simon Robertshaw
ab8f382acc Sign tool can now edit existing signs 2012-06-25 13:57:23 +01:00
Simon Robertshaw
ba802b3243 Element search 2012-06-24 19:22:58 +01:00
Simon Robertshaw
f5547f267b Option to use OpenGL JUST for the interface 2012-06-23 14:59:07 +01:00
Bryan Hoyle
4cf42e786b Scrollbar appearance and code changes 2012-06-22 21:09:13 -04:00
Bryan Hoyle
83c51307c4 Scrollbar added 2012-06-22 21:00:44 -04:00
Simon Robertshaw
009de99f02 Prevent tool buttons being drawn off the edge of the window when scrollable 2012-06-23 00:48:01 +01:00
Simon Robertshaw
6352888c68 Menu scrolling 2012-06-23 00:34:08 +01:00
Simon Robertshaw
3c91e526bb Client now provides methods for reading and saving preferences - less powerful than raw access to Cajun, (no mixed type arrays, for example) but allows other save formats to be used, such as property lists on OS X 2012-06-22 01:04:55 +01:00
Simon Robertshaw
550f6e28e0 Stage 1 of update process completed 2012-06-21 15:49:32 +01:00
Simon Robertshaw
0594aa5d07 More in the way of an autoupdater 2012-06-20 17:51:51 +01:00
Simon Robertshaw
e81e18238d Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-20 13:40:34 +01:00
Simon Robertshaw
2be9c92508 OpenGL canvas for Windows, Notifications for main Game, Update checker in Client (+ other client triggered events) 2012-06-20 13:40:18 +01:00
Simon Robertshaw
f6403958de Fix stamp and save assignment 2012-06-18 18:06:40 +01:00
Simon Robertshaw
7ffaa421d1 GameModel manages currentSave instance 2012-06-18 16:43:40 +01:00
Simon Robertshaw
5e301ba17c Controllers should free their callbacks and views 2012-06-18 16:21:13 +01:00
Simon Robertshaw
9d7a4e55f2 Menu frees any added items 2012-06-18 15:27:57 +01:00
Simon Robertshaw
1a13c3edec Use C++ allocation and deletion for Brush memory 2012-06-18 14:46:18 +01:00
Simon Robertshaw
9769239af6 Remove debug printing from brush 2012-06-13 15:09:37 +01:00
Simon Robertshaw
6f814528fc Correct save reloading, add Vac and NGrav tools 2012-06-12 15:37:46 +01:00
Simon Robertshaw
f6f83cc276 Correct overlapping rectangles with translucent stamp selection 2012-06-11 13:48:34 +01:00
Simon Robertshaw
3205df3a21 Saving and loading other flags from GameSave, remove old saveloader 2012-06-11 13:39:39 +01:00
Simon Robertshaw
fd572e9da6 Change stamp storage to a list, insert new stamps at the begining, 'l' loads the first stamp or the previously used stamp, 'k' shows the stamp browser 2012-06-10 19:52:24 +01:00
Simon Robertshaw
050ad82155 Unify stamp and clipboard placement code, GameSave translation and transoformation working (not particularly well) 2012-06-09 19:42:07 +01:00
Simon Robertshaw
c408e035fa Preview: Wait for save to load before opening, Simulation: Correct block coords when reading wall data, replace existing particles when placing stamps on top, Game: Clear the simulation when loading a save 2012-06-09 14:54:58 +01:00
Simon Robertshaw
0ee1e1875d Load save data when showing the save preview 2012-06-08 22:04:14 +01:00
Simon Robertshaw
61ed6e0276 Rename Save class to SaveInfo, introduce SaveFile for hanlding of local data (stamps and local saves). Rename Stamps browser to LocalBrowser, ready for sharing code with the local save browser 2012-06-07 14:23:26 +01:00
Simon Robertshaw
8fae7dbade Saving and loading at position, yuse exceptions for parsing saves 2012-06-06 01:46:13 +01:00
Simon Robertshaw
49dafbfd26 Use a different method for decoding saves with uncompressed object in memory for stamps and clipboard, also allows for transformation (rotation), missing failure states and code for loading it into a Simulation 2012-06-05 20:08:35 +01:00
Simon Robertshaw
f41ab864ef Fix slight issues when clicking on menu section buttons and missing isMouseInside in MouseEnter action for buttons 2012-05-23 19:49:44 +01:00
Simon Robertshaw
f1953603c0 Use mouse hover callback for menu buttons 2012-05-23 19:31:53 +01:00
Simon Robertshaw
2c5400a732 Warp display with newer shader, Render options works in OpenGL 2012-05-17 22:34:16 +01:00
Simon Robertshaw
bbf7851596 Seperate new/old CreateParts functions 2012-05-15 20:01:20 +01:00
Simon Robertshaw
136675b56a Move style into Component 2012-05-15 18:13:17 +01:00
Simon Robertshaw
45563e97e8 Make flood_prop use PropertyType from StructProperty, Property tool works 2012-05-15 00:10:10 +01:00
Simon Robertshaw
be849a9150 Style improvements to sign tool 2012-05-14 20:51:16 +01:00
Simon Robertshaw
f39d2361e7 Improve appearance of some dialogues, style defaults 2012-05-14 20:47:14 +01:00
Simon Robertshaw
4bb90d0d79 Text alignment for dropdown, make sign UI nice 2012-05-13 21:11:02 +01:00
Simon Robertshaw
41e1d28c56 Correct air include path for OptionsModel, correct Window debugmode logic, justifications for sign 2012-05-13 20:54:29 +01:00
Simon Robertshaw
4032a0469b Click function for tools that aren't continuous. Debug helper for UI components (Ctrl+Shift D when DEBUG is defined), fix add sign window logic 2012-05-13 17:43:41 +01:00
Simon Robertshaw
724c99102e Stupid git 2012-05-12 22:28:45 +01:00
Simon Robertshaw
7128188048 Primitive sign adding 2012-05-12 22:25:45 +01:00
Simon Robertshaw
c5798c7456 Tools implemented in a similar way to elements 2012-05-12 18:11:20 +01:00
Simon Robertshaw
16d3895e9c Redo Wall IDs 2012-05-12 13:21:04 +01:00
Simon Robertshaw
1c993435ef Default elements in gamemodel 2012-05-07 18:08:41 +01:00
Simon Robertshaw
51b17badf4 A bit of refactoring (elements) 2012-05-07 17:59:50 +01:00
Simon Robertshaw
bb8a3f76e3 OS X compiling working, Make it a bit more friendly with stricter compilers 2012-04-26 13:10:47 +01:00
Simon Robertshaw
e38fd405af Correct quirks with drawrect and fillrect, change UI components accordingly, shorten save name in save button 2012-04-22 17:13:43 +01:00
Simon Robertshaw
96506610b2 Clean out graphics, add openGL graphics in seperate file, change brush to use unsigned char rather than boolean for bitmap/outline 2012-04-21 22:46:37 +01:00
Simon Robertshaw
75a9460c83 OpenGL rendering 2012-04-20 19:21:10 +01:00
Simon Robertshaw
43ae47ba77 TPT: Added smudge tool afbe8cf38e 2012-04-18 16:40:43 +01:00
Simon Robertshaw
df2d698ed5 Fix drawing of lines, rects and fill within the zoom window 2012-04-17 20:20:45 +01:00