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

262 Commits

Author SHA1 Message Date
jacksonmj
38e21c8236 Fix crash when STOR is next to PIPE and has an invalid tmp value (http://tpt.io/~1768004) 2015-04-10 14:23:58 +01:00
Ryan Jacobs
55a30673c4 Remove unnecessary pointer checks. 
There are *no* more spacing issues. I used tabs exclusively.
Also, I made changes off of the develop branch.

Here's the Ruby regex that I used:
text.gsub!(/(( |\t)*)if ?\((.*)\) ?{?\n?( |\t)*(free ?\(|delete |delete\[\] )(.*)\)?;/, "\\1\\5\\6;")
 2015-02-14 22:13:26 -08:00
jacob1
57d1b4916d fix last two PVS-Studio bugs, closes #232 2015-02-13 21:45:22 -05:00
jacob1
2c0287b71d PARTICLEDEBUG define which turns on some particle debugging key shortcuts 
Also fix particle updating bug
 2015-02-06 20:33:10 -05:00
jacob1
b7fe998252 fix mouse coords at startup being 0,0, fix glitch that could make background windows fade completely to black 2015-01-31 14:09:50 -05:00
jacob1
ace9e36cc6 fix ALL the warnings 
mostly just using more size_t. Also do some formatting around if statements
 2015-01-16 22:35:32 -05:00
jacob1
efd69b208d fix a ton more errors in the interface code, including all the -Wreorder ones 2015-01-16 19:58:39 -05:00
jacob1
54d985f975 gcc warning fixes (up to lua files) 2015-01-16 17:26:13 -05:00
jacob1
577ae3400f move some stuff around (without changes) in Simulation.cpp, add sim.updateParticles function 2015-01-11 13:17:18 -05:00
jacob1
dce874484a fix all the gcc warnings in the element files (except one in PSTN) + all the unused variable warnings 2015-01-10 22:43:33 -05:00
jacob1
e92bbac700 fix some lua crashes (use more argument checking) 2015-01-10 18:59:20 -05:00
jacob1
4f6094136e fix renderer compile and make it create a "Save file invalid" sign when it can't render the save, fixes #97 2015-01-10 18:47:42 -05:00
jacob1
b2954a7f0a Publish button in browser (replaces Unpublish button when unpublished saves are selected) 
Works using the html page and isn't really the best way until @simtr implements Delete.json&Mode=Publish or something
 2015-01-10 18:18:28 -05:00
jacob1
65a31bb1d1 more "thread safe" fix to save list refreshing problem 2015-01-10 13:43:15 -05:00
jacob1
1a2e3a11fc cancel drawing when the mouse moves in / out of the zoom window, fixes #228 2015-01-10 13:35:23 -05:00
jacob1
c325543402 refresh save list after unpublishing a group of them, fixes #238 2015-01-10 12:39:19 -05:00
jacksonmj
236ff08da9 Fix some problems noted in http://www.viva64.com/en/b/0298/ 
I've left some of the less important items, like SearchView.cpp "'then' statement is equivalent to the 'else' statement", and RequestBroker::Request::~Request, because I don't feel like spending a few days entirely rewriting those files at the moment (which is what I'd end up doing if I started fixing minor problems and refactoring...)

GameSave::readOPS - not changed. At some point we may have to move to a larger type for element IDs (probably two or four bytes), but PT_NUM isn't likely to be raised to the maximum value of that type immediately, so this check will be needed then. There should be an elements[partsData[i]].Enabled check in there too, but it might be a bit difficult - I'm not sure how to access a Simulation object from GameSave::readOPS...

Notes on changes:

Graphics::textsize, Element_FRZW::Element_FRZW - typos

Button::Draw - the extra case was originally used to invert the icon (draw it in black instead of in white) when the button was clicked. However, the icon colour is now automatically set depending on the background colour. (Note similar conditions "if(Enabled) { if(isButtonDown || (isTogglable && toggle)) " near the start of the function - same logic but in a different place, setting icon colour indirectly).

Simulation::transform_save - unused redundant function, everything uses GameSave::Transform which does much the same thing.

PreviewView::NotifySaveChanged - should be height==YRES/2, it's checking whether the preview image is the correct size, and resizing it if it isn't.

Element_FWRK::update - no idea why that line was there, even though it was my commit that originally added it...
 2014-12-25 17:09:35 +00:00
jacksonmj
3ea2d8013d Correct page count in save browser 2014-12-22 01:33:55 +00:00
jacob1
3b09c4bdbc change tooltips for the save upload button to make it more clear 2014-12-18 19:54:48 -05:00
jacob1
35782fdd10 'l' always loads last save from disk (won't load cached deleted save) 2014-12-15 15:13:37 -05:00
jacob1
9fdcc28dac make close icon match the color of the button/text around it 2014-12-04 18:17:44 -05:00
jacob1
16ce3a68c0 more jacksonmj suggestions: save edgeMode in saves, BVBR absorption fix, life saving fix, DEUT graphics change, PROT fix, SOAP graphics fix 2014-11-21 15:41:22 -05:00
jacob1
a182e925fe some elementpallete fixes + fix SPAWN2 ToolButton 2014-11-20 22:44:02 -05:00
jacob1
1289465a2c update stamps.def when deleting stamps, missing stamps show up as "error loading save" and can be deleted 2014-11-11 23:48:36 -05:00
jacob1
cd9fa0c85a Textbox in the stamp browser also 2014-11-11 19:38:29 -05:00
jacob1
efaa32363f page textbox in browser (go to any page) 
also fix page count (add one for front page), and make page count invisible until the saves actually load
 2014-11-11 17:25:50 -05:00
jacksonmj
beff8e73ba Fix renderer compiling 2014-11-09 21:32:06 +00:00
jacob1
46eda12479 lua logs fade out individually 2014-11-06 20:24:42 -05:00
jacob1
a801f0a0b4 allow lua mousepress event to cancel drawing, fixes #229 2014-11-06 20:06:45 -05:00
jacob1
377a99294f this should allow you to place the zoom window while selecting an area to stamp 2014-10-31 14:09:02 -04:00
jacob1
5654425637 placing zoom window cancels shift-lines 2014-10-31 12:47:37 -04:00
jacob1
2fc1dcbe29 fix bug with placing zoom window while saving a stamp 2014-10-31 12:17:33 -04:00
jacob1
12f00db240 loop edge mode from my mod (also works with stickmen) 2014-10-24 00:18:51 -04:00
jacob1
6463d04f6c fix a few of the most spammy warnings (there are still hundreds of warnings though) 
TODO: actually fix all the warnings
 2014-10-23 00:42:13 -04:00
jacob1
c16caed5dd fix level 1 msvc compiling warnings + initialize debugFlags 2014-10-08 00:15:51 -04:00
jacob1
717408c9d0 also add back DebugParts 2014-09-27 23:27:41 -04:00
jacob1
32328ad4fe re-implement tpt.setdebug 2014-09-27 22:25:15 -04:00
jacob1
507ba35ce0 new DebugInfo thing: the old debug lines 2014-09-27 21:49:00 -04:00
jacob1
6beafc354d fix "open data folder" on windows 2014-09-23 17:06:52 -04:00
jacob1
b20db5fb8a add a no install check define 2014-08-25 14:55:18 -04:00
jacob1
a3d594c603 command key can be used instead of ctrl on OS X 2014-08-24 00:43:52 -04:00
jacob1
d29c2cb2a5 fix tags button being too long 2014-08-23 20:05:01 -04:00
jacob1
f8782338d7 make tpt.selected* and tpt.brushx/y writable (replaces simstate branch) 2014-08-19 02:01:31 -04:00
Simon Robertshaw
0d617ace7b Decorate thread entry points in headers 2014-08-15 22:50:28 +01:00
Simon Robertshaw
a629eb9bfc Force stack re-alignment for entry-points from phread_create with mingw & windows to fix SSE crashes in child threads 2014-08-15 21:42:33 +01:00
jacob1
7e9c507e64 fix memory leak 2014-08-15 12:15:13 -04:00
jacob1
2416a9b454 fix being unable to click link signs unless zoom window is out 2014-08-15 11:53:18 -04:00
jacob1
ae886048f4 Disable fullscreen on OS X 2014-08-11 22:39:03 -04:00
jacob1
986b25b508 redo spark graphics, add spark render setting 2014-08-11 21:56:40 -04:00
jacob1
7740980fcc fix crash when selecting PROP from element search, fixes #209 2014-08-11 01:00:13 -04:00
jacob1
e4b08c88cf fix link signs preventing you from using quickoption buttons, fix being unable to place zoom window on link signs. Fixes #222 2014-08-05 19:26:21 -04:00
jacob1
10a26002b4 Add an "Open Data Folder" button in simulation settings 2014-08-05 00:20:56 -04:00
jacob1
c44e734abe fix crashes when the selected element is NULL (via lua), add gfx.getHexColor (inverse of gfx.getColors) 2014-06-09 17:42:44 -04:00
jacob1
ec29044ce6 output log (console) messages to the console, or stdout.txt on windows 2014-06-09 16:23:18 -04:00
jacob1
6749c2547f New SConscript (hopefully better) 
Fixes a lot of bugs, also almost all options are no longer needed and are just auto-detected
 2014-06-08 19:33:58 -04:00
mniip
44405827b0 Make the upvote more fancy and bigger 2014-06-04 00:35:40 +04:00
jacksonmj
7b9f43b8bf Fix some missing return values 2014-05-23 00:00:54 +01:00
jacob1
7e1076ee5f use drawtext_outline for element descriptions 2014-05-22 12:39:35 -04:00
jacob1
49996a8c02 Auto-focus more textboxes 2014-04-17 12:03:24 -04:00
jacob1
35d97eb14d fix bug where you couldn't place stamps on top of special signs 2014-04-11 23:17:35 -04:00
jacob1
4e478cfe20 fix bug where InstantOpen never got reset after opening saves in the save browser 2014-03-27 12:21:16 -04:00
jacob1
2e6b4242d6 don't resize save buttons in the online save browser, fix selection bug in console 2014-03-25 14:44:58 -04:00
jacob1
258aaedb0a add sim.reloadSave, tpt.selectedreplace 2014-03-13 14:44:39 -04:00
jacksonmj
c6d6011337 An ugly fix for numpad, since it seems event.key.keysym.mod isn't entirely reliable for some unknown reason 
Partial revert of 7ce9907f82
 2014-03-12 15:05:54 +00:00
jacksonmj
1ca63b3813 Add more key definitions 2014-03-12 15:04:16 +00:00
jacob1
92891f364b fix tooltip commit 2014-03-12 00:03:32 -04:00
jacob1
7dc5139b66 toolTips on search / save simulation buttons change when ctrl is held 2014-03-11 14:04:05 -04:00
jacob1
7ce9907f82 fix textbox key repeat issue, fix numpad issue (in two ways) 2014-03-11 12:53:42 -04:00
jacksonmj
9531de49ec Vertical flip when pasting stamps (Ctrl+shift+r) 2014-03-08 13:41:45 +00:00
jacksonmj
55fbf13157 Display numeric value of ctype instead of element name translation for elements which use it as wavelengths 2014-03-08 13:34:03 +00:00
mniip
43bff37279 fix numpad behavior: movement keys are no longer triggered with numlock on 2014-02-27 20:39:16 +04:00
mniip
55284e6313 Fix most of clipboard-related memory leaks and potential crashes; Fixes jacob#23 2014-02-25 18:44:44 +04:00
mniip
a105ed9df8 Use system clock instead of used CPU time. Fixes key repeat and some 
other stuff. close #206
 2014-02-13 00:26:34 +04:00
jacob1
d38b7b9b11 pressing tab switches between textboxes in the deco editor 2014-02-06 12:15:48 -05:00
mniip
250b522221 map numpad keys to movement keys where applicable 2014-01-30 22:22:04 +04:00
mniip
09beafed3a Fix ParseExceptions falling through; 
Apparently since when the RequestBroker was added, the logic has been changed,
and the exception no longer comes through PreviewController's try{} block.
 2014-01-25 15:39:44 +04:00
jacob1
f66679e551 a little reorganization (maybe more later) 2014-01-20 13:52:53 -05:00
jacob1
0409d93789 signs can be moved onto the zoom window, fixes #89 2014-01-17 23:27:57 -05:00
jacob1
4e9a5bdaec make sure comment box height and cursor position don't go too far when it's resizing, fixes #82 2014-01-17 21:49:55 -05:00
jacob1
02aba363c3 slight PROP description change, don't save invalid PROP preferences 2014-01-16 11:09:55 -05:00
mniip
69c9be0e99 implement generic property value as a union instead of void* 2014-01-16 11:00:47 -05:00
mniip
8f2fbcd9e1 brand new prop tool. draws like any other tool 2014-01-16 11:00:47 -05:00
jacob1
0d51d6bd07 manually fix bug where sometimes the top / bottom pixel of circle brushes would disappear 2014-01-07 20:46:42 -05:00
mniip
fdfaa3a29b add defines for window resolution 
--amend
 2013-12-29 20:12:50 +04:00
mniip
bc84326ca2 Got rid of debug fps counter, just added deltatime into usual fps counter 2013-12-21 05:26:54 +04:00
mniip
c3cf0638d6 This ! shouldn't be there 2013-12-16 00:17:40 +04:00
mniip
9db1358ca3 In element search promote exact and starting position matches (finally possible to access VAC via element search) 2013-12-15 22:57:35 +04:00
mniip
5fc07b4c3c fix PHOT/BIZ* transparency 2013-12-12 19:54:52 -05:00
mniip
12d98dada1 oooo wait, rectangle snap too 2013-12-12 16:23:58 -05:00
mniip
0fb08c5e97 fix snapping 
why was trigonometry used in such a simple function
 2013-12-13 00:55:20 +04:00
jacob1
1bce4984e3 Merge pull request #192 from mniip/tags 
Fix tag order
 2013-11-12 08:18:09 -08:00
mniip
085d0e8cb8 unused variable 2013-11-12 15:20:17 +04:00
mniip
4b914d12c2 fix tags order (#141) 2013-11-12 09:16:17 +04:00
mniip
2be2b6b54b Adjust position of ContextMenu if it's too close to bottom or right edges #188 2013-11-10 12:28:29 +04:00
Simon Robertshaw
5cc69aa2a9 Skip startup install check if running on Mac OS 2013-10-30 19:48:06 +00:00
mniip
bf908bbfbf Fix various warnings, remove silly useless NO_INLINE system, remove the need for -fkeep-inline-functions 2013-10-30 04:47:07 +04:00
Simon Robertshaw
67c82ee283 Quick fix: Fix dummy key defs used by renderer and other non-input builds 2013-10-29 20:51:44 +00:00
Simon Robertshaw
2d22776a2c Iterate through signs in reverse order when seeking for click events in order to ensure when clicking on stacked signs the top-most sign is detected 2013-10-29 19:59:13 +00:00
Simon Robertshaw
f2e28ee667 Merge branch 'feature_sparksigns' into develop 2013-10-29 19:43:02 +00:00
jacob1
48ecbce554 f5: reload sim, f2: screenshot f3: toggle extra HUD 2013-10-26 00:17:06 -04:00