Commit Graph

1492 Commits

Author SHA1 Message Date
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
Simon Robertshaw
10e82df543 Fullscreen and scale setting from sim options 2012-08-08 14:35:27 +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
622f2246ef Fix TPTScript 'set' function 2012-08-06 20:54:37 +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
06112a12a0 Ctrl+A select all 2012-08-05 20:20:55 +01:00
Simon Robertshaw
17e7ace364 Key repeat for text boxes 2012-08-05 20:10:33 +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
Simon Robertshaw
9e309135d4 Load element icons in element search, fixes #73 2012-08-05 16:34:31 +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
50103aa074 Fix some of the flood fill methods 2012-08-05 16:11:43 +01:00
Simon Robertshaw
ed270d8dbf Draw gravity zones when using grav wall 2012-08-05 15:26:17 +01:00
Simon Robertshaw
351ce1525f Update gravity walls, fixes issue #52 2012-08-05 14:03:54 +01:00
Simon Robertshaw
05024cc787 Persistent search window responds to user auth events 2012-08-05 13:08:51 +01:00
Simon Robertshaw
4b85d19217 Nicer colour for "popular tags" header 2012-08-04 21:02:04 +01:00
Simon Robertshaw
5a2da01a5b Tags, fixes #55 2012-08-04 20:55:59 +01:00
Simon Robertshaw
a418c90cd4 Get rid of useless free space in search view 2012-08-04 16:58:39 +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
f32cd872ca Set initial stickman spit element in create_part, fixes the rest of #50 2012-08-04 14:38:59 +01:00
Simon Robertshaw
18e1890590 Stickman keys working, fixes first half of issue #50 2012-08-04 14:34:43 +01:00
Simon Robertshaw
ae5d099b81 Fire OnMouseEnter events for components that are added under the mouse cursor, fixes issue #37 2012-08-04 14:14:23 +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
d6e384e1ec Implement more of the old TPT console 2012-08-04 01:41:50 +01:00
Simon Robertshaw
2527380224 Implement more of the old console 2012-08-04 01:24:21 +01:00
Simon Robertshaw
6173901875 Old TPT console commands with "!" prefix 2012-08-03 21:48:45 +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
9260b2c3e8 Move rect border drawing for previewview to draw over fav+report buttons, fix issue #64 2012-08-03 18:08:41 +01:00
Simon Robertshaw
11d2b0eb3c Correct VAC and EXOT colours, issue #49 2012-08-03 18:04:18 +01:00
Simon Robertshaw
57f949ecfb Fix text selection issue in #65 2012-08-03 17:58:13 +01:00
Simon Robertshaw
40e5ce5d37 Fix context menu position #65 2012-08-03 17:44:12 +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
a3ebfb0ffd Remove silly file 2012-08-03 01:55:00 +01:00
Simon Robertshaw
24006ee44a Grav colour, addresses rest of #41, colour will vary from original TPT 2012-08-03 01:40:13 +01:00
Simon Robertshaw
4233bc743c Use HFLM colour data, addresses some of issue #41 2012-08-03 01:18:39 +01:00
Simon Robertshaw
fbaf149a92 Untick publish box for save prompt my default if the save does not belong to the user, addresses issue #43 2012-08-03 01:11:12 +01:00
Simon Robertshaw
96132ee1c1 Stop returning luaL_error from drawing functions for no reason, addresses
issue #29
2012-08-03 00:52:46 +01:00
Simon Robertshaw
b165619266 Update menus on element change from lua, addresses issue #42 2012-08-03 00:47:39 +01:00
ntoskrnl
18bf7ce155 Build fixes for WIN64 2012-08-02 15:21:43 +01:00
ntoskrnl
4343faa10f Some modifications for WIN64. SConscript not ready for that yet. 2012-08-02 15:21:31 +01:00
ntoskrnl
f94fabd999 Rename WIN32 preprocessor definition to WIN 2012-08-02 15:21:16 +01:00
ntoskrnl
87dfc47c97 Separate operating system and architecture preprocessor definitions
Conflicts:

	SConscript
2012-08-02 15:20:14 +01:00
Simon Robertshaw
cbefea85d7 Local Saving, Server Saving rewrite 2012-08-01 22:29:22 +01:00
Simon Robertshaw
29ac6380ba Prevent newlines being inserted into the begining of a multiline label/textbox 2012-08-01 19:13:31 +01:00
Simon Robertshaw
1d258eab6b ThumbnailBroker for background retrieval and rendering 2012-07-31 19:49:08 +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
9c67d41ad6 Neaten a little bit of code 2012-07-29 20:34:20 +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
716ac44c29 Fix crash on Component::IsFocused if the component has been detached from the Window 2012-07-29 13:17:09 +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
824bde4ceb clear_sim now clears air and gravity maps better, fixes issue #31 2012-07-29 12:18:07 +01:00
Simon Robertshaw
1f914561b2 Better syncing for elementCount, fixes issue #21 2012-07-29 02:07:04 +01:00
Simon Robertshaw
0b3724215e Remove blockair update in Air.cpp function to fix TTAN - solves issue #30 2012-07-29 01:40:42 +01:00
Simon Robertshaw
6cc4648929 Filebrowser search, cleaner filenames 2012-07-29 01:33:28 +01:00
Simon Robertshaw
df3b1e2a62 Implement search for DirectoryList 2012-07-28 22:14:38 +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
dddc04e412 Move cursor to the end of the insertion after pasing in a Textbox 2012-07-28 14:24:15 +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
30b11a7724 Air heat is not rendered if ambient heat is disabled 2012-07-28 12:48:34 +01:00
Simon Robertshaw
4b1c388995 Update ambient heat when enabled, fixes issue #28 2012-07-28 12:30:41 +01:00
Simon Robertshaw
aa774771a0 Collapse gamesave to save space in memory 2012-07-28 02:23:21 +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
f8ca8af387 Scroll Panel 2012-07-26 21:51:30 +01:00
Simon Robertshaw
121e7c772c Rename .inc files to inl 2012-07-26 15:06:06 +01:00
Simon Robertshaw
d8903206a1 Update version number 2012-07-25 20:06:50 +01:00
Simon Robertshaw
8c7755d5d2 TPT: Now stickmen can shoot plasma. dc01f09f0e 2012-07-25 20:04:47 +01:00
Simon Robertshaw
79727c9193 Fix for previous commits 2012-07-25 19:47:27 +01:00
Simon Robertshaw
a033fe7e49 TPT: Add ptypes.enabled checks to a few more places 61f39f5464 2012-07-25 19:42:53 +01:00
Simon Robertshaw
a5d6c56f8c TPT: Salt should only melt ice that is above saltwater freezing temperature 3e1d3cd5a6 2012-07-25 19:33:40 +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
76070f99e0 TPT: This should fix PLNT lag just a little bit... (mostly after shooting though NEUT) 5f3c10a684 2012-07-25 18:46:15 +01:00
Simon Robertshaw
fad2311c36 TPT: C5 should not explode when touching cold INSL a925eea52c 2012-07-25 18:44:30 +01:00
Simon Robertshaw
67d449df3d Fix typo in EMBR gravity 2012-07-25 18:43:19 +01:00
Simon Robertshaw
b9e16d4bc6 TPT: Prevent STKM falling through activated PVOD with a ctype that isn't STKM 637ee194e0 2012-07-25 18:32:10 +01:00
Simon Robertshaw
1e5eba3583 TPT: Make VOID and BHOL eat stickmen again 1f4f50682c 2012-07-25 18:27:08 +01:00
Simon Robertshaw
41cbd69ac8 TPT: Use atan2 for LIGH angle calculations 966f1dcc23 2012-07-25 18:25:37 +01:00
Simon Robertshaw
de4fe1a38e TPT: Reduce rate of lightning creation by clone 167740e839 2012-07-25 18:23:07 +01:00
Simon Robertshaw
5337f91736 TPT: Lightning direction affected by Newtonian gravity 3a946efdfd 2012-07-25 18:21:25 +01:00
Simon Robertshaw
55c870c518 TPT: Allow INST to be sparked directly with the brush 8de602d467 2012-07-25 18:15:13 +01:00
Simon Robertshaw
aa156fb933 TPT: Fix infinite loop when flood_INST finds some INST with a non zero lif... 9ee316c3e9 2012-07-25 18:13:09 +01:00
Simon Robertshaw
9edf65fb3f TPT: FIRW: less advection, and don't go faster when multiple fire particle... 9988dc17aa 2012-07-25 18:03:43 +01:00
Simon Robertshaw
38e2eec808 TPT: Completely remove SING formation from fusion 81771d8672 2012-07-25 18:02:38 +01:00
Simon Robertshaw
0b77f1b2ed TPT: Only create one NBLE particle for each fusing H2 particle 29aab750e5 2012-07-25 18:01:58 +01:00
Simon Robertshaw
971fbc71f9 TPT: fix compression during fusion 287822229f 2012-07-25 18:01:15 +01:00
Simon Robertshaw
2135d88644 TPT: Reset particle flags in create_part 135e91b84d 2012-07-25 17:52:26 +01:00
Simon Robertshaw
799954f383 TPT: Allow stickman head to go through everything 95ca29cc64 2012-07-25 17:51:37 +01:00
Simon Robertshaw
7859cc839c TPT: Prevent STKM floating in gases 31a61d0888 2012-07-25 17:45:30 +01:00
Simon Robertshaw
e36bc8e4ae TPT: Gravity modes and Newtonian gravity for fireworks 31ce22f122 2012-07-25 17:44:29 +01:00
Simon Robertshaw
811c2cb26b TPT: Use eval_move(PT_FIGH, ...) when fighters are checking for obstacles 79614a9719 2012-07-25 17:21:13 +01:00
Simon Robertshaw
5031291bf6 TPT: Save an extra tmp2 byte, for EXOT fed8b7b2cc 2012-07-25 17:16:56 +01:00
Simon Robertshaw
6585a4640b TPT: Replace all explosion sparks with new element (EMBR) 1d5b081942 2012-07-25 17:12:15 +01:00
Simon Robertshaw
0afecb5b77 TPT: Replace all explosion sparks with new element (EMBR) 1d5b081942 2012-07-25 17:11:36 +01:00
Simon Robertshaw
57c356e495 TPT: Make ELEC+water form H2 and O2 in the correct proportions 9b2c2a78a6 2012-07-25 15:56:42 +01:00
Simon Robertshaw
6dc7eaf43e TPT: Prevent stacking from ELEC+NEUT, ELEC+water, and CO2 from BUBW ae5470ca78 2012-07-25 15:55:42 +01:00
Simon Robertshaw
08d1dd06ed TPT: Fix STKM causing stacking and falling through some powders c14704ae49 2012-07-25 15:47:18 +01:00
Simon Robertshaw
2214ab4eb0 TPT: Correct freezing temperature for SLTW (-21.1 C) 06d2d5267e 2012-07-25 15:36:40 +01:00
Simon Robertshaw
2189d298a7 TPT: Move INST flood fill into a separate function 36de2f19f5 2012-07-25 15:32:05 +01:00
Simon Robertshaw
fad383f392 TPT: Update to EXOT that makes it permeable to neutrons as well as electro... a104696620 2012-07-25 15:05:55 +01:00
Simon Robertshaw
a03e92830a Make only one airmode selectable at a time 2012-07-25 14:43:56 +01:00
Simon Robertshaw
86659f2238 Disable fav and report buttons if not logged in 2012-07-25 14:32:08 +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
9b1fb64e16 WIND tool 2012-07-25 13:37:04 +01:00
Simon Robertshaw
45fecfe72c Correct progress bar position 2012-07-25 12:53:39 +01:00
Simon Robertshaw
8062319160 Correct initial zoom size 2012-07-25 12:46:48 +01:00
Simon Robertshaw
bc2acb9c08 Better appearance for dropdown and context menus 2012-07-25 12:02:14 +01:00
Simon Robertshaw
2abb2b2c9f Placeholder text for username and password in login, Focus username at start 2012-07-25 11:59:20 +01:00
Simon Robertshaw
e291144ea7 Correct cursor position in Textbox 2012-07-25 11:51:16 +01:00
Simon Robertshaw
998f11451f \x0E resets text colour to one previously set by \b 2012-07-25 11:47:53 +01:00
Simon Robertshaw
6b08d1e2f9 Copy, cut and paste for Textboxes 2012-07-24 22:55:39 +01:00
Simon Robertshaw
7ef3f8cbe9 Remove bounds check for text selection, makes text selection a little easier for users 2012-07-24 17:45:31 +01:00
Simon Robertshaw
dceefed030 Correct alignment of elements in TextPrompt 2012-07-24 17:41:41 +01:00
Simon Robertshaw
d50d45ecff Fix deco smudge tool 2012-07-24 15:56:01 +01:00
Simon Robertshaw
da77cb809b Inverted icon state 2012-07-24 15:38:18 +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
45c31030a6 Changes to sconscript to allow building with specific version number 2012-07-22 19:33:56 +01:00
Simon Robertshaw
97bf9a517e Snapshot checking 2012-07-22 18:51:05 +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
5bf0a084ac Prevent race condition when reloading local stamps, fix task so "after()" gets called and correct stamp name so they actually get deleted" 2012-07-21 13:09:59 +01:00
Simon Robertshaw
d6de5fc997 Remove AMD detection from CPU check 2012-07-20 21:19:17 +01:00
Simon Robertshaw
33de0482a2 Use exceptions instead of goto to corrup state. Fix Fan wall loading with PSV and New wall IDs with OPS 2012-07-20 19:39:38 +01:00
Simon Robertshaw
22990b680c Prevent the multiline update for labels from going out of bounds 2012-07-20 17:43:38 +01:00
Simon Robertshaw
332fbfe590 Ensure GameSave internal pointers are NULL at the start 2012-07-20 17:43:08 +01:00
Simon Robertshaw
4e9e0ff7bf Fix icon drawing in text boxes 2012-07-19 19:14:38 +01:00
Simon Robertshaw
9a94939585 Correct comment page sizing 2012-07-19 19:05:44 +01:00
Simon Robertshaw
c9bffd30a6 Element search triggered by 'e' key 2012-07-19 19:01:26 +01:00
Simon Robertshaw
de1cedd61b Correct divider position in save Preview 2012-07-19 18:57:49 +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
a8e4221f38 Working comment submission 2012-07-18 13:07:33 +01:00
Simon Robertshaw
78c4aba468 Fancy animation for textbox autosize 2012-07-17 22:40:47 +01:00
Simon Robertshaw
d91d4223b8 Improve spacing of multiline labels, multiline cursor for Textbox, autoresizing textbox for PreviewView comments 2012-07-17 22:21:20 +01:00
Simon Robertshaw
2479b8664d Add comment box to save preview - doesn't work yet 2012-07-17 19:14:05 +01:00
Simon Robertshaw
2329f98f0a Varying update notifications 2012-07-17 16:57:12 +01:00
Simon Robertshaw
f5c9da236f Use sdl-config 2012-07-08 14:03:51 +01:00
Simon Robertshaw
72d98036a5 Parsing commandline arguments 2012-07-06 16:53:59 +01:00
Simon Robertshaw
1b1963932e Move array terminator for sign saving into if statement 2012-07-06 16:08:52 +01:00
Simon Robertshaw
adc9cc0816 Move graphics into seperate folder 2012-07-06 16:06:26 +01:00
Simon Robertshaw
94c9603d0c Fix incorrect assignment for video buffer in renderer 2012-07-04 16:22:22 +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
8b200ab326 Remove unused old console class 2012-07-03 13:31:51 +01:00
Simon Robertshaw
f3484fbd4b Fix errors due to typos in Renderer (VIDXRES = VIDXRES) and RasterGraphics (MOETHODS) 2012-07-03 13:31:17 +01:00
Simon Robertshaw
5a71068ba0 Textbox now inherits from Label - gets all the fancy text selection features 2012-06-26 22:55:52 +01:00
Simon Robertshaw
7c259c0123 Release selection when the label component loses focus 2012-06-26 21:05:57 +01:00
Simon Robertshaw
ab6fed71d7 Replace textblock with new multiline label - with text selection!!!!111!!!one!! 2012-06-26 20:57:10 +01:00
Simon Robertshaw
e26cb8ce2f Fix potential crash where strings fed into any of the text functions have a trailing '\b'/'\x08' 2012-06-26 14:31:10 +01:00
Simon Robertshaw
694a6ed4f2 Ammend to previous commit - the issue was not with smaller saves, but the accumulation of rendered particles on the framebuffer - fixed by clearing the fbo and pbo before rendering 2012-06-25 22:34:04 +01:00
Simon Robertshaw
2ffb45581f SaveRenderer working on OpenGL - doesn't seem to work with small saves though 2012-06-25 22:26:53 +01:00
Simon Robertshaw
7f33db1f0c Restore previously bound FBO in renderer functions 2012-06-25 21:53:31 +01:00
Simon Robertshaw
1f9cce0007 Increase comments per page to 10,000 2012-06-25 21:45:07 +01:00
Simon Robertshaw
028a779848 Increase comments per page to 20 2012-06-25 21:37:25 +01:00
Simon Robertshaw
44e41a3b28 Fix Line scaling for OpenGL inetrgsdfkjdslkfjs 2012-06-25 17:52:04 +01:00
Simon Robertshaw
dacb774ae0 Resizable window when using OpenGL interface 2012-06-25 16:10:40 +01:00
Simon Robertshaw
ab8f382acc Sign tool can now edit existing signs 2012-06-25 13:57:23 +01:00
Simon Robertshaw
04b007b36f Create FFT plan on demand instead of at startup on the main thread 2012-06-25 12:19:26 +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
333509842d Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-22 19:04:55 +01:00
Simon Robertshaw
eb52f759de Success/Failure return from Asyn Task, Prompt to visit website upon update failure 2012-06-22 19:04:38 +01:00
Bryan Hoyle
6fa05d1930 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-22 12:00:17 -04:00
Bryan Hoyle
58f3494f6f Fixed invalid pointer cast 2012-06-22 12:00:00 -04:00
Simon Robertshaw
55d90a44a8 Remove debug code from onDraw 2012-06-22 16:36:02 +01:00
Simon Robertshaw
beee75d9d1 Multiple pages of comments 2012-06-22 16:35:32 +01:00
Simon Robertshaw
e6e23669ee Scrollable comments 2012-06-22 15:13:24 +01:00
Simon Robertshaw
2e48bd149c Stage 2 of autoupdate working 2012-06-22 01:44:30 +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
8fc3325b1c Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-21 13:23:04 +01:00
Simon Robertshaw
12ba6834eb Make status updates on tasks safe - add intermediate progress bar for TaskWindow 2012-06-21 13:22:52 +01:00
Bryan Hoyle
3b29a74767 fixes to code and a option for opengl building for release 2012-06-20 15:05:25 -04:00
Bryan Hoyle
c775126272 Merging 2012-06-20 14:45:06 -04:00
Simon Robertshaw
09758b9152 SaveRenderer returns a placeholder thumbnail in case of OpenGL 2012-06-20 19:43:03 +01:00
Bryan Hoyle
e5e638448c remove some debugging 2012-06-20 14:42:42 -04:00
Bryan Hoyle
9953f4518e Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-06-20 14:41:17 -04:00
Simon Robertshaw
ad76b293d8 Make Confirm dialogue less ugly 2012-06-20 19:39:33 +01:00
Bryan Hoyle
b35255b722 Renders an X in place of save icons, atm. 2012-06-20 14:25:41 -04:00
Bryan Hoyle
c9f837f21d Opengl can open saves now, just need to get it to render accurately later 2012-06-20 14:23:22 -04:00
Simon Robertshaw
0594aa5d07 More in the way of an autoupdater 2012-06-20 17:51:51 +01:00
Simon Robertshaw
088b2f678d localBrowserModel should be browserModel 2012-06-20 16:26:14 +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
8c608ee8b9 Use C++ allocation/freeing for text masking and multiline processing 2012-06-18 17:07:27 +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
83ccd65b14 Don't rely on Window class freeing for components that may not be added 2012-06-18 16:00:34 +01:00
Simon Robertshaw
1fceab6e4a Ensure partsSimIndex is freed upon success state of OPS parsing 2012-06-18 15:57:41 +01:00
Simon Robertshaw
fc86c24027 Better freeing for memory in GameSave 2012-06-18 15:54:55 +01:00
Simon Robertshaw
81423ba568 RenderOptions controller should delete its callback 2012-06-18 15:45:31 +01:00
Simon Robertshaw
edac8b5481 Free tools 2012-06-18 15:32:15 +01:00
Simon Robertshaw
9d7a4e55f2 Menu frees any added items 2012-06-18 15:27:57 +01:00
Simon Robertshaw
741392f2c1 Free platent and elements 2012-06-18 15:25:24 +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
2b51441573 Linux fix with SDL_syswm 2012-06-13 14:54:15 +01:00
Simon Robertshaw
d7e12b7b43 Missing includes and declarations for Linux 2012-06-13 14:36:56 +01:00
Simon Robertshaw
c447dd2f4a TPT: Update version 2012-06-13 01:40:44 +01:00
Simon Robertshaw
4bda62b68c TPT: Make ambient heat convection work a bit better 2012-06-13 01:40:13 +01:00
Simon Robertshaw
57548b60d9 TPT: STOR should not conduct heat 2012-06-13 01:38:09 +01:00
Simon Robertshaw
0cb47ab93c TPT: Remember ctype when cloning lava 2012-06-13 01:37:32 +01:00
Simon Robertshaw
f0778c2033 TPT: Prevent THDR from counting towards stacked particle limit 2012-06-13 01:28:33 +01:00
Simon Robertshaw
5f81b70787 TPT: Avoid stacking in INVS and FILT, and fix pressurised INVS graphics 2012-06-13 01:28:00 +01:00
Simon Robertshaw
2aebc294e8 TPT: Run stacking check less often 2012-06-13 01:21:33 +01:00
Simon Robertshaw
7e0a315880 TPT: Create BHOL when particles are stacked excessively 2012-06-13 01:14:21 +01:00
Simon Robertshaw
a4d156fc6b TPT: Prevent solid particles stacking in E-Hole 2012-06-13 01:06:44 +01:00
Simon Robertshaw
59920c1a62 TPT: TTAN updates 2012-06-13 01:03:21 +01:00
Simon Robertshaw
c63de0ff6d TPT: Return 0 after particle type change 2012-06-13 00:58:33 +01:00
Simon Robertshaw
427670682f TPT: EXOT 2012-06-13 00:57:02 +01:00
Simon Robertshaw
19d071f10b TPT: Tron wasn't keeping its NODIE flag 2012-06-12 21:30:08 +01:00
Simon Robertshaw
c7ec0b76f6 TPT: Fix the bug with not-spawning fighter. 2012-06-12 21:29:24 +01:00
Simon Robertshaw
ef777b92dc TPT: Put ifs into switch in create_part 2012-06-12 21:28:37 +01:00
Simon Robertshaw
5ec6223065 TPT: Check fire colour values are with the correct range 2012-06-12 20:18:45 +01:00
Simon Robertshaw
db86294e6a TPT: Prevent allocation of particles with type==0, bleep bloop 2012-06-12 20:16:33 +01:00
Simon Robertshaw
9033786e49 TPT: Fix PROP_NEUTPENETRATE, particles weren't being moved into empty space 2012-06-12 20:15:33 +01:00
Simon Robertshaw
c0008efb74 Fix SOAP.cpp from previous commit 2012-06-12 20:14:02 +01:00
Simon Robertshaw
f8badc05d4 TPT: Fixed the bug with snow, where it melted without taking it's ctype into account. 2012-06-12 20:13:04 +01:00
Simon Robertshaw
9b8fba4a19 TPT: Fix SLTW boiling temperature typo 2012-06-12 20:07:51 +01:00
Simon Robertshaw
a3a8ef7f7a TPT: Soap bubbles are easily formed now. 2012-06-12 20:05:59 +01:00
Simon Robertshaw
2e1780ce4e TPT: VOID & PVOD can be set to only eat/not eat certain things 2012-06-12 19:59:19 +01:00
Simon Robertshaw
a95ceb4c92 TPT: energy type particles automatically go into photons, not pmap 2012-06-12 19:55:00 +01:00
Simon Robertshaw
3b020b3151 TPT: fix crash, spark reset set type without checking if it was a valid number 2012-06-12 19:45:19 +01:00
Simon Robertshaw
b8f2a2dcd5 TPT: fix lua console freeze/bugs 2012-06-12 19:40:07 +01:00
Simon Robertshaw
d68110c351 TPT: small o2 fusion change 2012-06-12 19:32:44 +01:00
Simon Robertshaw
dd041d1699 TPT: GPMP activated at draw 2012-06-12 19:29:10 +01:00
Simon Robertshaw
780682c22d TPT: oxygen fusion, fix two small bugs 2012-06-12 19:26:47 +01:00
Simon Robertshaw
a93caaa3c7 TPT: fusion changes 2012-06-12 19:11:57 +01:00
Simon Robertshaw
7f921924f5 Use a heap allocation when hiding password text 2012-06-12 19:10:43 +01:00
Simon Robertshaw
5144451b30 TPT: Check for version before enabling movable flag for sponge. 393d247312 2012-06-12 18:55:44 +01:00
Simon Robertshaw
0e8d055d8b TPT: Fix the bug with stickman standing on the screen edge. d0a1b14409 2012-06-12 18:54:03 +01:00
Simon Robertshaw
583bf2a091 TPT: Fix the bug where gel didn't transfer water from sponge. 0cf636ad24 2012-06-12 18:51:38 +01:00
Simon Robertshaw
1ccdc1dc12 TPT: Make tron follow TRON_NOGROW , thought that was in there.... (github edit because cate is annoying me) c5b9b8d28a 2012-06-12 18:50:43 +01:00
Simon Robertshaw
af5c399c24 TPT: Update gravity mask when loading saves 0fb6b85706 2012-06-12 18:48:00 +01:00
Simon Robertshaw
efa0e5d0d6 TPT Fix infinite loop when trying to detach soap with extra ctype bits set eb0b2f9ca3 2012-06-12 18:46:24 +01:00
Simon Robertshaw
48459fc40d TPT: Change order of bomb loops - delete particles before creating sparks 089ea8b7a0 2012-06-12 18:45:03 +01:00
Simon Robertshaw
391165409d TPT: New flood_parts function, should fix crashing due to too much recursion a11202313d 2012-06-12 18:41:36 +01:00
Simon Robertshaw
10f51cb586 TPT: Make TTAN block pressure when framestepping 58ea2b2acf 2012-06-12 18:22:25 +01:00
Simon Robertshaw
95a9b96dc9 TPT: Don't hide stickman when energy particles pass through his head 9f0c4857e 2012-06-12 18:21:21 +01:00
Simon Robertshaw
e0ab8c5810 Correct TTAN high temperature transition 2012-06-12 18:18:26 +01:00
Simon Robertshaw
5f68a41742 TPT: Allow TTAN to conduct more than once 81f84c4678 2012-06-12 18:17:51 +01:00
Simon Robertshaw
7c5e74410b TPT: New element: Titanium, absorbs some neutrons, acts as a solid wall to air d7fa0b139e 2012-06-12 18:16:40 +01:00
Simon Robertshaw
6ae650d04c TPT: Fix TNT not exploding if multiple TNT particles are in the same place de6203e049 2012-06-12 18:00:03 +01:00
Simon Robertshaw
e3634e3b5f TPT: Remove silly copypasta from GPMP, causing gravity to depend on air pressure befd4f5ef5 2012-06-12 17:59:09 +01:00
Simon Robertshaw
a1a0fb5c02 TPT: Fix for PUMP 835d6bbfb9 2012-06-12 17:35:21 +01:00
Simon Robertshaw
cc8ae0dc44 TPT: Limit gel tmp value 1c5381662d 2012-06-12 17:32:43 +01:00
Simon Robertshaw
6af88ee7da TPT: Change pipe and portal to check element type using properties instead of falldown and state 11bd67eb61 2012-06-12 17:31:32 +01:00
Simon Robertshaw
20e85066dc TPT: Fix crash when pasting text on platforms which don't support it d0b57d7d99 2012-06-12 17:27:21 +01:00
Simon Robertshaw
50a587813e TPT: Add PROP_NOAMBHEAT to prevent certain elements from being heated by Ambient heat 8397b6e51a 2012-06-12 17:25:06 +01:00
Simon Robertshaw
318499350d TPT: strncpy for loading sign text in OPS 433c1881bc 2012-06-12 17:13:30 +01:00
Simon Robertshaw
80bb49ca12 TPT: One gel particle can't absorb more than 100 water particles now. 74979102b3 2012-06-12 17:08:15 +01:00
Simon Robertshaw
f2e1d38b58 TPT: Save soap bubbles 6717f4ff32 2012-06-12 17:06:38 +01:00
Simon Robertshaw
2633af01d7 TPT: Fix bounds checking for SING and make explosion pressure area smaller d7f798da60 2012-06-12 16:34:39 +01:00
Simon Robertshaw
a270acfc54 OPS loading: don't replace existing particles twice, and clear soap c 2012-06-12 16:30:27 +01:00
Simon Robertshaw
ad677189cb TPT: Use an array instead of ctype to cache tron colour 6101c04ff9 2012-06-12 16:20:35 +01:00
Simon Robertshaw
74d7fb59c3 TPT: Save tmp2 for tron c8a1524d6b 2012-06-12 16:11:34 +01:00
Simon Robertshaw
ca42a081ec TPT: Add tmp2 support to old console 418bdf0892 2012-06-12 16:07:02 +01:00
Simon Robertshaw
117b1fb5c4 TPT: Fix includes for OSX and BSD a75da2c4c3 2012-06-12 16:05:02 +01:00
Simon Robertshaw
573035ac10 TPT: It's hard to be a fool (fix for the fix) ffee9df8e6 2012-06-12 16:03:26 +01:00
Simon Robertshaw
14cb5cf765 TPT: Gel won't move solids any more 68ab2e3148 2012-06-12 16:02:09 +01:00
Simon Robertshaw
96ec616442 TPT: BSD Platform, -DBSD 9e18556ae6 2012-06-12 16:00:18 +01:00
Simon Robertshaw
311190c148 Use stdint for 32bit Linux in BSON.h 2012-06-12 15:42:09 +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
5eb9370fc1 Uncomment bounds checking for stamp loading 2012-06-10 19:53:46 +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
cdc4b4df86 Fix save rotation 2012-06-09 20:16:47 +01:00
Simon Robertshaw
26dbb9d309 Missing 'delete' on old blockMap data in save Tranformation 2012-06-09 19:43:35 +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
46614017c8 Close the preview dialogue when the model throws an exception 2012-06-08 22:55:11 +01:00
Simon Robertshaw
0ee1e1875d Load save data when showing the save preview 2012-06-08 22:04:14 +01:00
Simon Robertshaw
1dadb11fc2 Remove unneeded files 2012-06-07 16:16:54 +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
2e48fc6115 'No Image' icon when save rendering fails 2012-06-06 01:54:27 +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
7063587706 Fix bmap reading error caused by signed/unsigned comparison 2012-06-05 22:55:39 +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
bc35d622ad OpenGL JNI Canvas compiled only when needed 2012-06-04 12:21:07 +01:00
Simon Robertshaw
a247951115 Add missing header includer for C libraries. 2012-06-02 16:51:01 +01:00
Simon Robertshaw
e0c9dab8cb Move more SDL dependancies out of program, OpenGLCanvas for JNI and JNI methods. 2012-05-31 10:24:44 +01:00
Simon Robertshaw
ab82847cd6 Fix minor syntax error, move all OpenGL includes into a new file that can detect the OS X version. 2012-05-30 13:17:40 +01:00
Simon Robertshaw
86746f38b0 Separate SDL from graphics code
Also remove OS X specific project files and update Makefile to ensure
the Element class generator only runs when necessary
2012-05-30 12:32:58 +01:00
Simon Robertshaw
f8fcd73b20 Moar button appearance 2012-05-23 20:25: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
c112715ea7 Better element positioning in ErrorMessage 2012-05-23 19:31:40 +01:00
Simon Robertshaw
26eeb40541 Extra callback for just mouse hover 2012-05-23 19:31:01 +01:00
Simon Robertshaw
2b2531a62a Correct position of title in LoginView 2012-05-23 19:30:33 +01:00
Simon Robertshaw
adf7a3c720 Better icon alignment, improve appearance of preview 2012-05-22 20:30:23 +01:00
Simon Robertshaw
f86f2a9997 Restore missing IconFavourite drawing code
Was accidently remove in commit ba5efb101e
2012-05-22 17:48:36 +01:00
Simon Robertshaw
cc0efb13f0 OPS save format from TPT 2012-05-22 16:01:39 +01:00
Simon Robertshaw
7e49d63d28 BSON Library from TPT/MongoDB 2012-05-22 16:01:23 +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
8efd07a849 Air tool 2012-05-17 22:10:17 +01:00
Simon Robertshaw
bbf7851596 Seperate new/old CreateParts functions 2012-05-15 20:01:20 +01:00
Simon Robertshaw
ba5efb101e Username, password icons for Login window 2012-05-15 18:55:36 +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
0b4ad4f25c Add ability to introspect the Particle struct 2012-05-14 23:04:08 +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
7758fe52cb DropDown UI component 2012-05-13 20:00:22 +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
22d7865e6d Inline restrict_flt 2012-04-22 22:37:00 +01:00
Simon Robertshaw
892584c5fe Fix Off-by-one error with zoom Window using OpenGL 2012-04-22 20:26:40 +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
0bab640fe4 Fix warning in Client.cppcpppcppc 2012-04-20 01:45:43 +01:00
Simon Robertshaw
7538881591 Fix more element source file includes 2012-04-20 00:46:08 +01:00
Simon Robertshaw
891ce89ed0 Correct path name for Elements.h include in gel.cpp 2012-04-20 00:40:55 +01:00
Simon Robertshaw
456fca22c6 TPT: Change STOR, PIPE, DUST to make correct use of .flags field. 2012-04-19 17:01:17 +01:00
Simon Robertshaw
ceb25440cb TPT: Fix sponge bug. f93a829671 2012-04-19 16:52:35 +01:00
Simon Robertshaw
c4bace95bf Allow deleting of stamps 2012-04-19 15:22:18 +01:00
Simon Robertshaw
e9fc64eed6 No interaction with non-visible components" 2012-04-19 14:38:15 +01:00
Simon Robertshaw
c13b05d272 Version number update 2012-04-18 21:39:33 +01:00
Simon Robertshaw
699a8f699c Missing tron graphics function 2012-04-18 21:39:07 +01:00
Simon Robertshaw
0cc8f84e63 TPT: Fix the bug where you could set bad temp to insulators. 64629df1af 2012-04-18 21:35:14 +01:00
Simon Robertshaw
f8b1e1a232 TPT: Better description for tron d4a9f86503 2012-04-18 21:33:50 +01:00
Simon Robertshaw
652cd591ff Fix previous include 2012-04-18 21:33:07 +01:00
Simon Robertshaw
44d70ec6b8 TPT: Alterations to TRON and fancy effects ffa5ccb666 2012-04-18 21:31:22 +01:00
Simon Robertshaw
e4d1c7141f TPT: TRON element, needs to glow and fancy explosion on crash eccf5658d2 2012-04-18 21:27:28 +01:00
Simon Robertshaw
472cb8916e TPT: A small fix for convection. ff8ce0ef3a 2012-04-18 21:21:32 +01:00
Simon Robertshaw
1fdaabca6d TPT: Viscosity change for gel. Water diffusion among sponge and gel (but with flying cake effect) c9bcc11d35 2012-04-18 21:20:31 +01:00
Simon Robertshaw
b40f13b66a TPT: Added gel - a liquid with variable heat conductivity and viscosity. 8523da398f 2012-04-18 21:18:37 +01:00
Simon Robertshaw
ff7428fc70 TPT: Fix crash when flood fill deleting life 7a844f51ff 2012-04-18 21:07:26 +01:00
Simon Robertshaw
ea37facf83 TPT: No unmeltable ice anymore. e4448dc1d6 2012-04-18 21:05:14 +01:00
Simon Robertshaw
bfb37563ca TPT: Use graphics function for BCOL a1bd20db91 2012-04-18 21:04:37 +01:00
Simon Robertshaw
2ce377ef43 TPT: Stop walls next to pipe triggering automatic pattern generation 76f49dd024 2012-04-18 21:03:56 +01:00
Simon Robertshaw
d85049fb93 TPT: A fix for ice with ctype = 0. e52f730969 2012-04-18 21:01:54 +01:00
Simon Robertshaw
1681429d7f TPT: Glowing BRAY 2976936cfd 2012-04-18 21:00:43 +01:00
Simon Robertshaw
94e7123791 TPT: Allow DEST to be cloned with CLNE, PCLN, BCLN and PBCN 57d8335ca5 2012-04-18 20:46:34 +01:00
Simon Robertshaw
10e3f176d2 TPT: REALISTIC - Latent heat. It may be buggy, and enthalpy table isn't filled, but it works 4b4830b5a4 2012-04-18 20:44:01 +01:00
Simon Robertshaw
d9cca3ec1e TPT: Fixed burning temp. for fire. 00839a3b14 2012-04-18 19:28:18 +01:00
Simon Robertshaw
6be1b869e5 TPT: Fix ELEC being put into pmap instead of photons 5a3faa0584 2012-04-18 19:20:04 +01:00
Simon Robertshaw
f55fc54f6e TPT: Fix firework glow 001c4502e8 2012-04-18 19:13:50 +01:00
Simon Robertshaw
95c702535c TPT: Fix glow for deut at ligh 4d45bbedb3 2012-04-18 19:12:24 +01:00
Simon Robertshaw
c5a8615e89 TPT: Fix portals being ugly and PRTO effects not being random at first 94b8ed193f 2012-04-18 19:06:56 +01:00
Simon Robertshaw
779ac383dc TPT: Fix major update_particles_i bug, do_move was being called on nonexistant particles, causing kill_part to kill another particle 96ec3486e8 2012-04-18 19:02:27 +01:00
Simon Robertshaw
a8483798cc TPT: fusion step 3 8db6230414 2012-04-18 18:52:37 +01:00
Simon Robertshaw
bf935ac7d8 TPT: fusion step 2 + modify temp/pressure of step 1 803ded3b33 2012-04-18 18:40:14 +01:00
Simon Robertshaw
4ddf723167 TPT: prevent ionizing NBLE and burning H2 during fusion 83d4658589 2012-04-18 18:33:34 +01:00
Simon Robertshaw
bc4a3355de TPT: Fusion, step 1 446f773542 2012-04-18 16:51:47 +01:00
Simon Robertshaw
43ae47ba77 TPT: Added smudge tool afbe8cf38e 2012-04-18 16:40:43 +01:00
Simon Robertshaw
a761fa5cbc TPT: Remove 2 pixels per frame speed limit in detector wall b4a06df0b2 2012-04-18 16:14:10 +01:00
Simon Robertshaw
2ca07515c1 TPT: Fix fighters not going through portals correctly f41af45620 2012-04-18 16:12:16 +01:00
Simon Robertshaw
fa193eb7b4 TPT: Display decor in heat gradient view e83a1a21ae 2012-04-18 15:16:52 +01:00
Simon Robertshaw
6f3954b926 TPT: (REALISTIC) Better air<->body heat conduction. Air density now influences on it (things don't heat vacuum). 71acd578b6 2012-04-18 15:14:40 +01:00
Simon Robertshaw
add4ccb034 TPT: Volume from heat change (for REALISTIC) 290cac8b7e 2012-04-18 15:11:51 +01:00
Simon Robertshaw
d03a9c8fe5 TPT: Rotate/reflect particle, air, and fan velocities in transform_save 830629be3f 2012-04-18 15:10:09 +01:00
Simon Robertshaw
ce7d749dda TPT: Prevent ARAY passing through some non-conductive materials, and let normal ARAY pass through sparked INWR d21c61aa52 2012-04-18 14:59:24 +01:00
Simon Robertshaw
eeff570f89 TPT: Fixed the bug with fighters running away from stick mans, but now boundary check is worser so fighters won't usually notice holes on their way 2b4d0442b5 2012-04-18 14:57:29 +01:00
Simon Robertshaw
f84dc03c23 TPT: A new unstable REALISTIC option. No guarantees - but more realistic behaviour. f41f96f598 2012-04-18 14:50:29 +01:00
Simon Robertshaw
82a1933400 TPT: Old nothing display mode in the form of Basic colour mode fe82685257 2012-04-18 14:43:09 +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
80a77f4750 TPT: Added FRAY - Force-ray and RPEL - Repeller f6696282e1 2012-04-17 18:42:36 +01:00
Simon Robertshaw
fdb4dff4d7 TPT: Lua methods for reading/writing the bmap and emap (no mapped walltypes yet) 1c4bce1f22 2012-04-17 18:13:17 +01:00
Simon Robertshaw
2417ad3b41 TPT: Prevent gaps in beams of photons from powered clone 3702438482 2012-04-17 18:07:22 +01:00
Simon Robertshaw
89788d43c3 TPT: Make DEUT compress when Newtonian gravity is applied to it c960c29f72 2012-04-17 17:48:12 +01:00
Simon Robertshaw
df303dc491 TPT: Allow BRAY from PSCN to pass through sparked INWR e769f3feb8 2012-04-17 17:46:44 +01:00
Simon Robertshaw
22381b2462 TPT: Draw pixels for the entire fire_alpha array 9001508623 2012-04-17 17:45:03 +01:00
Simon Robertshaw
7682094f13 TPT: Fix stationary photons being created by PCLN/PBCN 91163c44ab 2012-04-17 17:42:29 +01:00
Simon Robertshaw
fd09db2345 TPT: Prevent ambient heat going through walls ccb88b6b3b 2012-04-17 17:32:06 +01:00
Simon Robertshaw
e68d14a5bf TPT: INSL blocks DLAY conduction, and raise DLAY temperature limit 06cb98f705 2012-04-17 17:28:37 +01:00
Simon Robertshaw
fe5ae5e792 TPT: Make ARAY fire once per spark 72a4358eee 2012-04-17 17:26:12 +01:00
Simon Robertshaw
b88a2f680e TPT: More SPRK life checks for electronic elements 68ab3ca3ca 2012-04-17 17:24:51 +01:00
Simon Robertshaw
8ea1e41d87 TPT: Fix switch not activating completely while being sparked 1a5cd45eb8 2012-04-17 17:20:48 +01:00
Simon Robertshaw
a3e97d51d1 TPT: Change wifi so that it always takes one frame to transmit a722d7a396 2012-04-17 17:18:35 +01:00
Simon Robertshaw
ca1690efe1 TPT: Separate loop for updating life, and add SPRK life checks to most electronics 6bdc05cc40 2012-04-17 17:14:23 +01:00
Simon Robertshaw
75f6212751 TPT: Another change to the eval_move check in create_part eaf2af6d40 2012-04-17 16:55:43 +01:00
Simon Robertshaw
db1ffd3208 TPT: Fix WARP destroying DMND a9c198dd46 2012-04-17 16:45:05 +01:00
Simon Robertshaw
69e7dadcdf TPT: Make RBDM/WATR explosion work again, by not killing fire created by WATR 32c9ff3099 2012-04-17 16:36:27 +01:00
Simon Robertshaw
065ca8b9f5 TPT: Only check the bits actually used for wavelength in photon ctype Fixes black photons not being killed after passing through pipe 748a528fe0 2012-04-17 16:33:04 +01:00
Simon Robertshaw
475fd1a0b8 TPT: Solids wall description, and check build_save was successful when saving a stamp 44545d4c96 2012-04-17 16:30:04 +01:00
Simon Robertshaw
609db36f2e TPT: Check coordinates of signs before using them to read pmap or pressure 8a11b6b31d 2012-04-17 16:14:42 +01:00
Simon Robertshaw
f4e2d188c2 transform_save should check wall coordinates against size in blocks, not the actual size ff6aa0227d 2012-04-17 16:11:07 +01:00
Simon Robertshaw
027833fe20 TPT Whoops, eval_move returning 1 should not allow particle creation edcf6d7b2f 2012-04-17 16:06:39 +01:00
Simon Robertshaw
25ce83d5bf TPT: Implement PROP_NEUTABSORB bdf277e687 2012-04-17 16:04:48 +01:00
Simon Robertshaw
c261030cef Started on dropdown control 2012-04-17 15:56:57 +01:00
Simon Robertshaw
c3c31b20b0 Fix portals 2012-04-16 21:19:12 +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
900e23128a Add ability to get favourites 2012-04-14 21:11:54 +01:00
Simon Robertshaw
4c6be4ff2c Graphics:: Extra icons for Report and Favourite. Client:: Get favourite status in GetSave, FavouriteSave, ReportSave, Preview:: Failure state when loading save 2012-04-14 19:00:24 +01:00
Simon Robertshaw
64063fbc0f Add missing for OpenURI on 64bit Linux 2012-04-14 15:32:19 +01:00
Simon Robertshaw
91064f4935 Remove other references to Global.h 2012-04-14 15:19:18 +01:00
Simon Robertshaw
1c5910fbab Remove deleted 'Global.h' from includes 2012-04-14 15:14:02 +01:00
Simon Robertshaw
20b3be68a7 Remove some unnecessary files. 2012-04-14 14:49:26 +01:00
Simon Robertshaw
66a451129c Fix Integer <-> Pointer casts on 64bit 2012-04-13 20:55:14 +01:00
Simon Robertshaw
e060f75819 Okay instead of Continue for text input dialogue 2012-04-13 19:00:40 +01:00
Simon Robertshaw
db1dbb1afa Text input dialogue 2012-04-13 18:56:05 +01:00
Simon Robertshaw
84ceea525b Nice drawing for brush 2012-04-11 18:23:10 +01:00
Simon Robertshaw
b2907798f2 Fix issue where unborn children were slaughtered when removing a component from an event 2012-04-09 12:40:30 +01:00
Simon Robertshaw
da9cec2c3b Remove unused code 2012-04-09 12:39:45 +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
bbfbb81086 Confirmation Dialogue, Save selection and multi-delete 2012-04-07 00:45:24 +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
63af6abd29 Add and remove tags.\nBrings to light an interesting issue with adding or removing UI components within component Event handlers 2012-03-22 22:12:16 +00: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
732b9d6a0d Disable key repeat 2012-03-03 17:58:33 +00:00
Simon Robertshaw
afe9e061e1 Better names for sort, allow showing own saves 2012-02-12 16:47:01 +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
d604fac18f Slight appearence changes to save buttons 2012-02-11 17:11:07 +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
9f7b06ff47 Comments on save preview and some minor changes for vote bars 2012-02-11 16:08:59 +00:00
Simon Robertshaw
54741c79ef Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-02-05 16:37:48 +00:00
Simon Robertshaw
7ae5eaab79 Started intrepreter for tpt script and various things for console 2012-02-05 16:37:36 +00:00
savask
54c8dbb250 Fix pointer errors for linux. 2012-02-05 20:29:52 +08: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
fe329e9127 Stop printing crap from BRMT update method 2012-01-29 18:01:39 +00:00
Simon Robertshaw
5efec88797 Nice Icon settings for Windows 2012-01-29 17:54:53 +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
680a36549a Background retrieval of save info and save list. 2012-01-29 14:44:36 +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
58ba7f8800 Stop freeing memory twice, also clear signs correctly 2012-01-27 22:01:22 +00:00
Simon Robertshaw
07525180c2 Icon management, fix element menu order, fix renderer crash 2012-01-27 20:19:42 +00:00
Simon Robertshaw
2a7628dfd0 Render options 2012-01-27 13:27:40 +00:00
Simon Robertshaw
1c971e4b42 Functional checkbox on render options screen 2012-01-27 11:05:26 +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
824d3c069b Clear air properly 2012-01-26 16:23:18 +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
3505bcc275 Login window close on success 2012-01-25 00:59:19 +00:00
Simon Robertshaw
9cdf2b5902 Login complete (minus brokenness) 2012-01-25 00:57:39 +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
04488081d3 Save name label position and alignment 2012-01-23 22:59:35 +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
57ab7bca76 Merge remote-tracking branch 'origin/master' 2012-01-22 00:45:10 -05:00
FrankBro
cb92acd0b7 Started the rest of the UI 2012-01-22 00:45:03 -05:00
Simon Robertshaw
3a283d4f3c Nice graphics for Showing windows 2012-01-21 23:29:40 +00:00
Simon Robertshaw
dea70befcf Basic skeleton for save preview 2012-01-21 22:48:37 +00:00
Simon Robertshaw
984d39f8cc Reset page on sort change 2012-01-21 19:43:36 +00: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
d364a27ed6 Fix search crash 2012-01-21 00:21:51 +00:00
Simon Robertshaw
36a952ca4d Better handling of save vector from client 2012-01-21 00:17:42 +00:00
Simon Robertshaw
0e5a46aa64 Ensure action class is freed 2012-01-20 23:52:19 +00:00
Simon Robertshaw
fa201a7aeb Fix some uninitialised variables 2012-01-20 23:42:17 +00:00
Simon Robertshaw
6a331fdaf8 Makefile for Linux and finished fixing case issues with includes 2012-01-20 22:19:45 +00:00
Simon Robertshaw
4949a5eac0 Fix case for header files 2012-01-20 22:10:42 +00:00
Simon Robertshaw
c8073657fc More stuff, need to fix memory leak 2012-01-20 22:07:49 +00:00
Simon Robertshaw
c5e8b34521 Add "cajun" for JSON reading and writing, Save searching in client and some more stuff for searcg 2012-01-19 20:10:05 +00:00
Simon Robertshaw
6d3b447f8e Changes to thumbnail retreival 2012-01-19 17:59:00 +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
Simon Robertshaw
2511afec8b More stuff, better events and starting on interface 2012-01-15 19:35:40 +00:00
Simon Robertshaw
2c9295007a Various things, also IEF UI 2012-01-14 18:51:24 +00:00
Simon Robertshaw
fc2f52099c More stuff, started console 2012-01-11 22:59:45 +00:00
Simon Robertshaw
2eb09c1daa Project changed, ControlFactory (Creates large UI structures such as
menus, dialoges...) GameSession (Session information, such as filename,
reference to simulation
2012-01-10 23:18:37 +00:00
Simon Robertshaw
b0ea52690b Initial 2012-01-08 17:39:03 +00:00