Commit Graph

312 Commits

Author SHA1 Message Date
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
Simon Robertshaw
465cb12af4 Newtonian gravity working 2012-04-16 13:58:20 +01:00
Simon Robertshaw
a0506495ad Simulation options 2012-04-15 22:16:57 +01:00
Simon Robertshaw
20b3be68a7 Remove some unnecessary files. 2012-04-14 14:49:26 +01:00
Simon Robertshaw
84ceea525b Nice drawing for brush 2012-04-11 18:23:10 +01:00
Simon Robertshaw
798c78b04e Add missing GOL data 2012-04-09 11:46:42 +01:00
Simon Robertshaw
c88079d084 Element sampling HUD thingy (No very good with MVC) 2012-04-08 00:11:21 +01:00
Simon Robertshaw
8f8de875c6 Modifier keys for Lua, Air display, correct render mode saving 2012-04-05 13:48:50 +01:00
Simon Robertshaw
ea51cde1f0 Change brush size with [ and ] keys, change order of drawing for Lua, Fix print and tpt.log so they log to the console when it is open 2012-04-04 21:47:58 +01:00
Simon Robertshaw
89cdeef9ad CommandInterface, Mouse, Keyboard and Tick events, on screen log, print redirected to tpt.log 2012-04-04 18:52:34 +01:00
Simon Robertshaw
299c1da9ae Search and stamps scolling with mouse wheel, Esc to exit 2012-04-03 18:12:32 +01:00
Simon Robertshaw
838a612026 Use a single instance of a background simulation for thumbnail rendering 2012-04-03 17:08:56 +01:00
Simon Robertshaw
73c5082cbc Super, megaheavyweight thumbnail renderer 2012-04-03 14:07:39 +01:00
Simon Robertshaw
efddc12e5d Stamps browser, placement + clipboard sampling and placement - No clipboard or stamp thumbnail generation, needs thumbnail generator from SaveLoader 2012-04-02 17:01:28 +01:00
Simon Robertshaw
289556ac70 Replace Error notification with exception for Tags model 2012-03-29 16:17:30 +01:00
Simon Robertshaw
1f388e4ca0 Exception when loading invalid save 2012-03-29 00:59:10 +01:00
Simon Robertshaw
e9770d8ee7 Clipboard and Stamp from selection (no way to paste/place yet) 2012-03-28 22:01:44 +01:00
Simon Robertshaw
23873eae71 More work on Tags - display tags in Tag window and Tag button 2012-03-22 13:50:43 +00:00
Simon Robertshaw
7e3d45bbfb Tag UI - actually more of a box at the moment 2012-03-05 19:55:39 +00:00
Simon Robertshaw
81f3114cb2 Better sliders for Decoration editor 2012-03-05 17:10:18 +00:00
Simon Robertshaw
55acb6aa80 More fancy Sliders for deco colour 2012-03-05 15:24:52 +00:00
Simon Robertshaw
644e6770e4 Slider and decoration colour changer 2012-03-04 16:26:03 +00:00
Simon Robertshaw
3bbaa1a111 Decoration tools - no way to set colour yet 2012-03-03 21:38:22 +00:00
Simon Robertshaw
5546f7d01e Fixed some lua methods, set decorations enabled by default, allow toggling of decorations with ctrl+b, saving and loading of render, display and colour modes for the renderer 2012-02-12 15:09:25 +00:00
Simon Robertshaw
ec6d1012b2 Somewhat working lua console, no element function overrides, no keyboard, mouse or tick events 2012-02-12 12:53:11 +00:00
Simon Robertshaw
725f1aff85 Fix thumbnail alignment for save buttons, add code for building PSv format 2012-02-11 17:04:39 +00:00
Simon Robertshaw
7ae5eaab79 Started intrepreter for tpt script and various things for console 2012-02-05 16:37:36 +00:00
Simon Robertshaw
8024caec55 Flood fill 2012-02-02 12:09:11 +00:00
Simon Robertshaw
6641f1d541 Frame stepping 2012-02-02 11:55:43 +00:00
Simon Robertshaw
f5dd32b284 Working GOL (No graphics 2012-02-02 00:33:10 +00:00
Simon Robertshaw
f86091d421 Use useragent for version, fix URl encoding 2012-02-01 21:20:27 +00:00
Simon Robertshaw
038da72c61 Console UI, open in browser button, tab and enter shortcut for Login UI, various 2012-02-01 18:45:59 +00:00
Simon Robertshaw
857b0cc1fc Load user information from preferences, fps display for testing 2012-01-31 18:49:14 +00:00
Simon Robertshaw
1d297cb57a Line and rect drawing 2012-01-30 16:03:18 +00:00
Simon Robertshaw
259fc2bcf7 ASCII for key events, save and Textarea (no caret, yet) 2012-01-30 00:40:28 +00:00
Simon Robertshaw
80aa7219a2 Vote view in save preview, better handling of controller destruction 2012-01-29 17:12:35 +00:00
Simon Robertshaw
7c53ca7799 Voting, fix save browser 2012-01-28 19:56:13 +00:00
Simon Robertshaw
28d4aecb6c Make zoom Window switch sides to avoid getting in the way 2012-01-28 14:56:52 +00:00
Simon Robertshaw
b5728a9e3e Zoom 2012-01-28 14:51:39 +00:00
Simon Robertshaw
07525180c2 Icon management, fix element menu order, fix renderer crash 2012-01-27 20:19:42 +00:00
Simon Robertshaw
ebd80c73de Some inlines and Checkbox ui component 2012-01-27 09:38:56 +00:00
Simon Robertshaw
e84f0fc6e5 Ellipse cursor 2012-01-26 18:06:23 +00:00
Simon Robertshaw
d520a70acf Save loading and reloading 2012-01-26 16:18:43 +00:00
Simon Robertshaw
9e1be78bc2 I've got to a point where I can no longer be bothered to think of a proper commit comment 2012-01-26 01:13:33 +00:00
Simon Robertshaw
b2d3257ae9 Better way of managing Controllers 2012-01-25 19:18:24 +00:00
Simon Robertshaw
c5cc1870f3 Fix some memory leaks 2012-01-25 18:42:35 +00:00
Simon Robertshaw
8b80942b16 Login working, segfaults sometimes 2012-01-25 17:21:55 +00:00
Simon Robertshaw
35858ef607 Fix textbox 2012-01-24 23:33:32 +00:00
Simon Robertshaw
04e4a2346d Wall menus 2012-01-24 21:19:29 +00:00
Simon Robertshaw
97b35bc470 Various 2012-01-24 20:19:19 +00:00
Simon Robertshaw
df72f2580f Better element buttons, Save preview WIP 2012-01-23 22:53:57 +00:00
Simon Robertshaw
2bd571e159 GameController shut down any render options open 2012-01-23 11:48:08 +00:00
Simon Robertshaw
27755b2f27 Render options 2012-01-23 11:44:20 +00:00
Simon Robertshaw
8a65c395f4 Element menu 2012-01-23 10:50:48 +00:00
Simon Robertshaw
8c0678fa48 Begining menu, tool 2012-01-22 23:24:49 +00:00
Simon Robertshaw
19c1fa5dcb Brush class for drawing on simulation, more interface for game 2012-01-22 14:45:37 +00:00
Simon Robertshaw
91bb5a8b78 Add remaining buttons for game screen 2012-01-22 11:15:34 +00:00
FrankBro
cb92acd0b7 Started the rest of the UI 2012-01-22 00:45:03 -05:00
Simon Robertshaw
1cee908c16 Fix thumbnail crash, turns out SaveButton was storing a Thumbnail pointer, not a Thumbnail as I thought 2012-01-21 18:51:28 +00:00
Simon Robertshaw
8ec6aae617 Better cleanup for simulation - fix memory leaks 2012-01-21 13:19:10 +00:00
Simon Robertshaw
fa201a7aeb Fix some uninitialised variables 2012-01-20 23:42:17 +00:00
Simon Robertshaw
44639a6423 Some folder changes, started search and client 2012-01-19 13:44:59 +00:00
Simon Robertshaw
4a60b97c70 Some minor changes 2012-01-17 20:46:06 +00:00