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

419 Commits

Author SHA1 Message Date
jacob1
88097496af Allow hiding menusections 
Cherry-picked from 75437c7d4c
 2016-07-08 19:58:21 -04:00
jacob1
111468c672 Fix not being able to turn off FIND tool when a life element is selected 2016-07-08 19:41:55 -04:00
jacob1
e68dd74b68 less scary report message 2016-07-03 12:51:40 -04:00
jacob1
ecddfcbc0d don't reset edge mode when saving local saves 2016-06-30 08:16:53 -04:00
jacob1
dfdee7afeb delete UTF-8 BOMs 2016-06-25 12:16:40 -04:00
jacob1
4190946de5 fix warning+exit crash, fix menusection offset resetting when menus are rebuilt 2016-06-25 11:56:03 -04:00
Matthew Miller
083d488566 Added a favorites menu. (#298) 
Added a favorites menu.
 2016-06-25 11:55:18 -04:00
SopaXorzTaker
fbd75c6293 This effect is called "3D anaglyph" (#292) 2016-05-26 18:48:18 -04:00
jacob1
ce55c8e58b Fix --opengl-render option. Please NEVER use this option though 2016-05-14 09:44:49 -04:00
jacob1
5cab8f45f2 Fix 'n' toggle also resetting air 2016-04-23 11:39:06 -04:00
jacob1
1171c308e1 Fix warnings, fix crash when ctrl+click opening a save 2016-04-02 20:47:50 -04:00
jacob1
51ff868935 use user-set edge mode when saving powder.pref, not the one from the open save 2016-04-02 00:25:05 -04:00
jacob1
aa99258101 more cleanup so that 3D can stay a more permanent thing 2016-04-02 00:10:15 -04:00
jacob1
0fbb3bb27f fix compile error with renderer 2016-03-31 22:38:28 -04:00
jacob1
46d096206f Further improvements to overall system stability and other minor adjustments have been made to enhance the user experience 2016-03-31 22:08:04 -04:00
jacob1
535ade0ec4 InformationMessage expands like the other dialogs, "numeric" textboxes now allow negative numbers 2016-03-31 22:05:55 -04:00
jacob1
40c2ff27b0 Test using DownloadManager from my mod instead of RequestBroker 
The crash when opening saves on mac is definitely something to do with the threading, and i'd rather just test this first to see if it fixes it

Copied from my mod almost entirely as-is, with the changes to HTTP.cpp included, also added locks into Download.cpp even though it is probably overkill
 2016-03-27 11:41:36 -04:00
jacob1
13d3547211 Compiling fix for scons on windows 
something is up with the pthreads library (dynamic compiles still broken), probably windows libraries all need to be recompiled and distributed separately like I did for visual studio
 2016-03-12 00:36:11 -05:00
jacob1
1ef8b0c08b Fix progress disappearing on hover in the local save browser, fixes #287 2016-03-09 23:30:05 -05:00
jacob1
10262b87da remove PARTICLEDEBUG define and replace it with tpt.setdebug(0x8) to activate the key shortcuts 2016-02-24 22:06:43 -05:00
jacob1
5c1cc0c0fb rewrite powder.pref handling to use jsoncpp instead of cajun 
cajun is a hard to use library with many necessary features missing. It also has been causing the windows version, and probably the mac version, to randomly crash.

Other json stuff still uses cajun (TODO: remove)
 2016-01-25 22:30:43 -05:00
jacob1
f6d82b6f8a separate t and v argument in create_part, fix LIGH not defaulting to .life of 30 with clones / console 2016-01-11 22:38:42 -05:00
jacob1
d3c44dbffa fix deco color being reset to 0x00000000 when loading a lua element 2016-01-10 22:48:45 -05:00
jacob1
226a66a860 add ctrl+f shortcut to easily locate elements in red from my mod 
doesn't support walls or better life finding because tools are much harder to work with here
 2016-01-10 22:23:06 -05:00
jacob1
c73d81b277 fix renderer trying to use SDL 2015-12-19 16:36:17 -05:00
jacob1
bb9b35f01d jacksonmj: EMP lag is hereby banished. eeef50c0fcba 
EMP destruction loop now happens once per frame instead of once per EMP
particle.
 2015-12-18 23:10:28 -05:00
jacob1
139bdd7f4d fix STKM being unable to pick up most energy particles, or LOLZ/LOVE 2015-12-18 20:02:53 -05:00
jacob1
76aeef24a4 ctrl+a support in Labels 2015-12-18 00:33:40 -05:00
jacob1
762093371b fix crash from previous commit 2015-12-16 14:06:44 -05:00
jacob1
8d4e333986 Overwriting a local save now updates the reload button save, add message to confirm that local save was successful, fixes #274 2015-12-16 14:02:03 -05:00
jacob1
16e3532980 fix 'large screen' description 2015-12-15 02:27:55 -05:00
jacob1
5afb95dcf1 change shift+wind tool to not always act like alt was pressed 2015-11-30 19:19:50 -05:00
jacob1
998f5a4cad fix infinite loop error message sometimes always coming up on startup 2015-11-29 01:59:36 -05:00
jacksonmj
d1dcae5574 Only show wavelengths in HUD if there is at least one valid wavelength 2015-10-29 07:15:02 +00:00
jacob1
dc679d7eb0 Add more elements to .tmp2 list, use local varibles instead of constantly accessing sample.particle.type 2015-10-22 21:39:12 -04:00
jacob1
46dc5da455 fullscreen only blocked on OS X when not using SDL 1.2.15 (untested) 2015-10-22 20:14:56 -04:00
jBot-42
6ee0bc4cda remove stor and pipe 2015-10-18 18:36:22 -07:00
jBot-42
cf615c323f Show Tmp2 in HUD for elements that use it 2015-10-17 18:18:19 -07:00
jacksonmj
d0445258c5 CONV tmp value can now be used to restrict which elements get converted. Requires version bump to 92. 2015-10-13 01:33:19 +01:00
jacob1
59377e49e5 fix 'Prev' button placement 2015-10-11 02:05:49 -04:00
jacob1
f435cf3881 fix edge mode not loading properly in saves, options menu uses edge mode from Simulation and not GameModel 2015-10-10 18:10:17 -04:00
jacob1
3cc27a7c9b Reupload -> Re-upload (cracker64 complaint) 2015-10-10 01:22:39 -04:00
jacob1
66863b7578 update last tool and drawMode when clicking too, fixes some issues 2015-10-10 01:17:19 -04:00
jacob1
d4e3196070 fix wall brush displaying incorrectly when drawing boxes 2015-10-10 00:53:21 -04:00
jacob1
bff6dedd48 show cursor when drawing even when mouse is out of bounds 2015-10-10 00:34:27 -04:00
jacob1
286dd02dad Ignore "Unspecified Error" when searching for saves 2015-10-10 00:32:09 -04:00
jacob1
63843c2bd7 add new minimumVersion setting in saves, can restrict the smallest version of TPT that is able to open the save. Uses major/minor version for this 
Also add RESTRICTVERSION macro to help when adding restrictions later
Also show errors when opening broken stamps now too
 2015-10-02 21:25:15 -04:00
jacob1
cd3d54d3bd use a ScrollPanel in ConfirmPrompt (supports longer changelogs) 2015-10-01 23:32:17 -04:00
jacob1
91cf20e521 prevent tool buttons from being longer than 7 characters 
for i=1,250 do elements.property(i,"Name",(("ALL BASE BELONG TO US "):rep(20)..(" "):rep(120)..string.char(10)):rep(70)) end

Could prevent it from lua, but too much work for no reason. Still allows SPWN2 button to work.
 2015-10-01 22:55:32 -04:00
jacob1
55d20f1bb2 Adding a comment updates the comment total / number of pages 2015-10-01 22:26:23 -04:00
jacob1
b184c78cff "Save from a newer version" is now just a warning (OPS format never changes) 
Also, actual save errors now prevent you from clicking "Open" (which allowed you to vote and do other stuff even though the save was never loaded)
 2015-10-01 21:35:40 -04:00
jacob1
cae8c9e095 fix some compile errors with last commit, remove snapshot version info from HUD and add to intro text instead, add tpt.version.snapshot 2015-09-26 14:56:37 -04:00
jacob1
908f60d47a support alternate update servers, and optional changelogs 2015-09-26 11:47:51 -04:00
jacob1
cf5ec57ab3 prevent 'z' keypresses while doing stamp stuff, add skipDraw variable to prevent wasted drawing calls 2015-09-25 15:43:13 -04:00
jacob1
b2840de173 mouse drawing triggered on mouse move, flood fill triggered on mouse down/move/up 2015-09-25 13:17:24 -04:00
jacob1
610cd82f0d remove bad wind tool exception, make sure UpdateDrawMode() is called on zoom mouseups 
should be pretty easy to remove any remaining tptmp syncing issues now. There are still a few possible bugs in my list but they require a mouse to test ...
 2015-09-24 02:14:56 -04:00
jacob1
5acf366d70 fix terrible mouse bug from last commit, redo tool strengths to be less buggy and only ever have an effect on normal drawing (not lines / boxes) 2015-09-24 01:39:20 -04:00
jacob1
e5ef3cd4a8 More changes to ensure that switching between selectMode stuff works properly (won't get stuck or trigger on mouseup when it shouldn't) 
Hopefully no bugs but lots of the previous commits had bugs.
Also, remove wasd shortcuts for shifting stamps because they conflicted with being able to press 's' to switch selectMode at any point.
 2015-09-24 01:11:49 -04:00
jacob1
a0c77fe6e8 fix it being impossible to select wall menu, add wall identifiers from my mod 2015-09-24 00:26:37 -04:00
jacob1
dab25160cc last commit was buggy, this tiny rewrite should be perfect 2015-09-22 22:52:25 -04:00
jacob1
a81a41b67f fix being able to change between box/line/flood fill while drawing (by releasing keys), a bunch of other extremely obscure fixes 2015-09-22 21:40:19 -04:00
jacob1
13a71b611a more tptmp mouse fixes, fix buttons and menusection buttons staying highlighted sometimes 2015-09-22 19:59:31 -04:00
jacob1
f230ac8945 send fake lua key release event when going into another interface 2015-09-21 19:50:03 -04:00
jacob1
cacef125c6 tptmp mouse syncing fix 
mouse lines now end on the point where the mouse is lifted up as intended, instead of at the point where the mouse is at the end of the frame
also remove unneeded variable
 2015-09-21 19:33:27 -04:00
jacob1
6fc787502c remove debug logging from last commit 2015-09-21 02:14:45 -04:00
jacob1
6ae3593465 remove pointQueue, replace with something that works properly 
No longer draws a single point by itself at the start, and draws a final line to the point where the mouse is released
 2015-09-21 02:13:01 -04:00
jacob1
16781bcb8e two new lua mouse up events (4 & 5) for some corner cases 
Also fixes mouse held event being stuck in one of those cases
 2015-09-20 21:40:00 -04:00
jacob1
cd97d6364b add comma before Newtonian Gravity in HUD 2015-09-20 17:29:30 -04:00
jBot-42
78c700a62b Added ambient heat to the HUD 2015-09-20 17:26:38 -04:00
jacob1
722b9d93d6 a few minor improvements so that stamps are more consistent in tpt++ / my mod 2015-09-19 21:19:17 -04:00
jacob1
71d75e37e3 you can now press any key while loading / saving stamps 
This means you can do stuff like press 'l' while saving a stamp, pressing 'k' while placing a stamp, press 's' while copying an area, and it will cancel the old action and start a new one
also, 'l' doesn't reset mouse to DrawPoints state
 2015-09-19 20:51:54 -04:00
jacob1
6230bc70b1 fix some buttons remaining visible in the stamp browser while covered up 2015-09-19 20:33:30 -04:00
jacob1
8ecb2682aa modifier keys are now checked when doing stamp stuff 2015-09-19 20:20:32 -04:00
jacob1
bbdbb67079 fix tpt.brushx returning incorrect value when brush is updated with tpt.brushID 2015-09-19 20:01:53 -04:00
jacob1
81b2efaf5b fix textbox crash, fix ctrl+c / ctrl+x to not copy an empty string when the textbox is empty 2015-09-11 13:08:56 -04:00
jacob1
cd9d13503a render modes interface can be exited with ESC 2015-09-01 13:31:28 -04:00
jacob1
fbbc755283 resetting sparks resets any sparks in WIFI too 2015-09-01 01:27:03 -04:00
jacob1
df854f72a6 only print 'Loaded autorun.lua' to screen (not to console/stdout.txt) 
All the other debug output was already removed in earlier commits
 2015-08-31 23:51:50 -04:00
jacob1
9048a3c50e new lua API: platform 
you can get current OS / build information, exe name, restart tpt, open a link in the web browser, and use clipboard copy/paste functions

Also remove some older Platform.h file which wasn't really needed or used
 2015-08-31 23:33:40 -04:00
jacob1
4af4ae3656 allow an extra tool button to show on the left edge when cut off 
electronics, explosives, and solids all have just one extra element, now you can always see it without scrolling. The only other scrolling menu is GoL
 2015-08-30 01:55:48 -04:00
jacob1
ed4678c9a8 add deco flood fill, flood fills based on color being close enough 
flood fill brush is hidden when deco tools are selected like this because it gets in the way. Renderer::vid is compared here so there could definitely be issues, but it works fine when used under normal conditions
 2015-08-30 01:38:32 -04:00
jacob1
37794c01af .tmp2 for CRAY now sets creation offset (just like DRAY) 
LIFE info moved into .ctype, no reason to use a whole extra variable for it
 2015-08-29 22:02:05 -04:00
jacob1
5caf8bc8e1 allow longer signs, add 'None' justification where the pointer line isn't drawn 
signs have a longer width limit and hard 45 character limit from the textbox and when loading saves
 2015-08-29 18:56:38 -04:00
jacob1
9f9fef6cad Add new function ParseServerReturn, try to properly display all http errors 
Also fix crash with invalid ptsave link, and fix some cases where it wouldn't ever tell you it errored
 2015-08-29 13:14:17 -04:00
jacob1
052681ef2b fix crash when using LIGH (base class should be ElementTool, not Tool) 2015-08-28 16:12:45 -04:00
jacob1
15537d4eff "Enabled" setting of button is now the old unused "Locked" setting of Components, also fix graphical bug with disabled buttons 2015-07-15 00:49:06 -04:00
jacob1
e990eead10 add CleanText function from my mod, used when copying / pasting / loading signs 2015-07-10 00:05:58 -04:00
jacob1
67bcd5e863 style improvements in Window.cpp / Window.h 2015-07-09 22:59:01 -04:00
jacob1
f65c4363b1 hovered / focused components are always drawn last 2015-07-09 22:58:19 -04:00
jacob1
85ce852cbc Auto scroll profile viewer when textbox expands, add 20000 character limit 2015-07-09 22:50:01 -04:00
jacob1
906b4a973f profile viewer now shows age, website, and save stats 
Also, add Multiline type textboxes (allows pressing enter) and fix some other bugs
 2015-07-09 20:17:04 -04:00
jacob1
c786640c74 always use a ScrollPanel in the profile viewer 
also fix Textbox autosize. TODO: add a bunch more info to the profile viewer
 2015-07-09 14:25:01 -04:00
jacob1
732e5b8730 fix some very minor memory leaks 2015-06-30 19:06:18 -04:00
jacob1
6a88e42580 Add tooltip when hovering over any kind of link sign 2015-06-27 20:44:48 -04:00
jacob1
d67cb4b582 add new s: sign which does a save search 
also change some searchController stuff to properly queue searches when one is already going on
 2015-06-27 19:03:41 -04:00
jacob1
f95186d3b9 fix zoom window staying up if you are holding ctrl while placing it 
press z -> ctrl, then release z -> ctrl
 2015-06-26 11:48:56 -04:00
jacob1
80bf240ced fix coordinates when placing stamps 2015-06-26 11:48:56 -04:00
Aditya Vaidya
13cc593d13 Fixed most spelling errors in code. 'originaly' is read as 'original Y', so not a typo 2015-05-18 15:16:01 -05:00
jacksonmj
34567bc496 Merge pull request #247 from ryanmjacobs:fix_pointer_checks 2015-05-16 02:19:08 +01:00
jacob1
cee08b2024 On first run, set scale to 2 if screen size is large enough 2015-05-14 23:22:20 -04:00
jacob1
0a2b60627f change left tooltip when a local save is open 2015-05-14 22:34:28 -04:00
jacob1
8e7e8e0670 some changes to LIGH creation (mostly from lua) 2015-05-11 20:50:10 -04:00
jacob1
fef767335f remove loggedIn variable, small change to tooltips 2015-05-11 10:53:05 -04:00
boxmein
7145cacbb9 implement HDD saving by default in GameView. update tooltips to describe behaviour. 2015-05-01 15:55:22 +03:00
boxmein
424d1d4b47 when you're not logged in, displys a not-highlighted HDD save button 2015-05-01 15:54:41 +03:00
boxmein
bf001dfd77 enable Ctrl behaviour (eg sae to HDD) without highlighting 2015-05-01 14:44:51 +03:00
boxmein
56d04fcde8 add new form of enableCtrlBehaviour for un-highlighted HDD saving 2015-05-01 14:44:22 +03:00
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