matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,362 Commits 13 Branches 426 Tags 113 MiB
c65081d3ed
Commit Graph

3362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
chaos.powdertoy.co.uk
bf6e4b8ccf Version Increment 2012-08-02 17:21:51 +01:00
Simon Robertshaw
b449062431 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2012-08-02 17:20:45 +01:00
Simon Robertshaw
5cde976f7e Fix zoom in deco mode 2012-08-02 17:18:58 +01:00
Simon Robertshaw
94bb1ad2df Fix OpenGL check in sconscript 2012-08-02 15:31:40 +01:00
ntoskrnl
a4eee2e2b6 Fix description of --64bit 2012-08-02 15:21:55 +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
chaos.powdertoy.co.uk
18278305f1 Version Increment 2012-08-02 14:38:15 +01:00
Simon Robertshaw
f1c493450a Make console_ui cover up right menu margin 2012-08-02 14:34:35 +01:00
Simon Robertshaw
3dfce2ad3c Add console show button to quick menu 2012-08-02 14:31:36 +01:00
Simon Robertshaw
9f0f9c1acd Remove intro text when using ptsave: handler 2012-08-02 14:27:08 +01:00
jacob1
daeddd5519 move some key stuff out of sdl_poll, zoom won't be triggered even when disabled by lua now 
Conflicts:

	src/interface.c
	src/main.c
 2012-08-02 14:26:44 +01:00
chaos.powdertoy.co.uk
23f9de6f81 Version Increment 2012-08-02 00:18:46 +01:00
Simon Robertshaw
78a32775dd Disable decorations by default 2012-08-02 00:18:17 +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
f36dafd9d3 Merge branch 'master' of github.com:FacialTurd/PowderToypp 2012-07-29 20:27:59 +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
cracker64
cbf7ca22b0 FAG, please get out of there 2012-07-29 15:02:26 -03: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
ca1f81a264 Add debug option to sconscript 2012-07-28 18:37:49 +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