Commit Graph

158 Commits

Author SHA1 Message Date
jacob1
057435baa6 Differentiate between created date / updated date in save preview
still only shows most recent date, this just changes the text
2017-06-30 21:21:09 -04:00
jacob1
cdc8f64896 fix clang compile warnings, fixes #406
also, sim.ambientAirTemp takes floats now
2017-04-27 23:08:06 -04:00
jacob1
c98f63bd89 save ambient heat in saves, if it is enabled 2017-04-24 22:29:45 -04:00
Mark Theng
1c12d1ec16 Take history snapshot before setting save (#358) 2017-03-19 23:15:08 -04:00
jacob1
287d5f9534 minor text fixes 2017-03-05 10:56:11 -05:00
jacob1
61e19a3237 fix crash when undoing if there were no snapshots 2017-02-18 23:41:52 -05:00
jacob1
6040ccd27e ugly fix for two empty snapshots being created on startup 2017-02-09 23:08:44 -05:00
jacob1
a1431b6d2b Fix memory leak 2016-11-14 10:19:49 -05:00
jacob1
389159728c Configurable undo history
Note: Each undo adds 16.7 MB of RAM usage, max is 200 (3.4GB), but don't set it to this
2016-11-14 10:03:09 -05:00
jacob1
25a2d9b5b5 some modifications to ctrl+z/ctrl+y
allows infinite undoing / redoing, improvements when history limit is greater than one
2016-11-14 10:03:09 -05:00
krawthekrow
95d2014724 allow redo with Ctrl-Y 2016-11-14 10:03:08 -05:00
jacob1
5370f07bf0 Don't control STKM when placing stamps, fixes #320 2016-10-13 20:29:10 -04:00
jacob1
647ad902fa take ctrl+z snapshot before placing a stamp, not after 2016-07-26 19:08:57 -04:00
jacob1
ecb08952e5 Add SDL_keysym.h, Use official SDL constants 2016-07-19 22:42:10 -04:00
cxi1
0c972469b8 Improve consistency of error messages, use InformationMessage instead of ErrorMessage 2016-07-17 16:27:13 -04:00
jacob1
16b93083d4 Changes to support starcatcher build server with updates
Cherry-picked from 3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
2016-07-09 19:00:54 -04:00
jacob1
b75c8318e4 add tpt.num_menus and tpt.menu_enabled functions 2016-07-08 20:33:01 -04:00
jacob1
ecddfcbc0d don't reset edge mode when saving local saves 2016-06-30 08:16:53 -04:00
Matthew Miller
083d488566 Added a favorites menu. (#298)
Added a favorites menu.
2016-06-25 11:55:18 -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
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
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
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
66863b7578 update last tool and drawMode when clicking too, fixes some issues 2015-10-10 01:17:19 -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
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
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
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
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
bbdbb67079 fix tpt.brushx returning incorrect value when brush is updated with tpt.brushID 2015-09-19 20:01:53 -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
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
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
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
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
efd69b208d fix a ton more errors in the interface code, including all the -Wreorder ones 2015-01-16 19:58:39 -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
1a2e3a11fc cancel drawing when the mouse moves in / out of the zoom window, fixes #228 2015-01-10 13:35:23 -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
jacob1
35782fdd10 'l' always loads last save from disk (won't load cached deleted save) 2014-12-15 15:13:37 -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
a801f0a0b4 allow lua mousepress event to cancel drawing, fixes #229 2014-11-06 20:06:45 -05: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
b20db5fb8a add a no install check define 2014-08-25 14:55:18 -04:00
jacob1
f8782338d7 make tpt.selected* and tpt.brushx/y writable (replaces simstate branch) 2014-08-19 02:01:31 -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
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
jacksonmj
7b9f43b8bf Fix some missing return values 2014-05-23 00:00:54 +01: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
258aaedb0a add sim.reloadSave, tpt.selectedreplace 2014-03-13 14:44:39 -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
mniip
8f2fbcd9e1 brand new prop tool. draws like any other tool 2014-01-16 11:00:47 -05:00
Simon Robertshaw
5cc69aa2a9 Skip startup install check if running on Mac OS 2013-10-30 19:48:06 +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
30d985ba77 Only cancel click events clickable signs (not all signs) 2013-10-26 01:02:20 +01:00
Simon Robertshaw
8f4296ac39 Spark sign tool, {b|sometext}, when the sign is clicked, the a spark will be created at the signs position. Also MouseDown events that draw particles from being triggered when clicking on a sign 2013-10-19 18:59:49 +01:00
jacksonmj
79edfe9589 Include elements[].Enabled in check for invalid lava ctype 2013-09-08 09:26:31 +01:00
jacob1
fd586d167f fix bug where when sparks were reset, ctype wasn't 2013-08-29 22:44:38 -04:00
mniip
122dc294c9 Whoops forgot to replace some redundant code related to regex 2013-08-27 01:51:21 +04:00
mniip
e2cb5838c6 specially per @savask's request, put matcher into a function
returns 0 if no match, returns position of pipe character if there is
2013-08-22 19:50:20 +04:00
mniip
4e9fe8b8e7 regexless gameModel 2013-08-22 17:51:19 +04:00
Saveliy Skresanov
b2045b0a7f Fix sign save/topic regex. 2013-08-22 18:43:46 +07:00
jacob1
bfc1cf99ca instant save option option, hold ctrl when clicking a save in the save preview to skip the entire preview and not load the comments 2013-07-25 19:43:25 -04:00
jacob1
6a4cc7e1f7 stickmen element defaults to right selected element if possible, or else still DUST 2013-07-18 17:57:04 -04:00
jacob1
aa59c89fa2 logging in in the save preview will update the login button on the main screen 2013-07-18 16:33:59 -04:00
jacob1
f56a2f6000 add back replace mode and specific delete. Activated with insert key / delete key, use ctrl+alt click to select what to use for the checks 2013-07-18 15:40:32 -04:00
jacob1
a98fb2092d click a preset once to select it, twice to switch to deco set tool. Prevent changing middle selected element in the deco editor 2013-07-17 17:21:35 -04:00
jacob1
9628a11245 save to server button is disabled when not logged in, but tags are viewable (read only) 2013-07-16 16:55:39 -04:00
jacob1
f4432b4759 give an error when a local save isn't saved properly, instead of exiting and pretending it worked 2013-07-15 14:59:15 -04:00
jacob1
8d5fe459fe 'n' to toggle Newtonian Gravity, quickoption tooltips show which keys you need to press to toggle them 2013-07-15 13:09:19 -04:00
jacob1
519d220101 save more settings in powder.pref like ngrav_enable, aheat_enable, pretty powders, and debug hud. Also save ambient heat in saves, and add a warning in the intro text in betas that you can't save publically 2013-07-02 15:09:00 -04:00
jacob1
18e2008b01 do ctrl+z snapshots when loading saves / stamps, makes it more predictable to fix problems in issue #110 2013-06-20 22:23:08 -04:00
jacob1
3aac957e50 HUD displays the correct name of LIFE particles in the HUD, show mouse position in HUD on the edges of the screen 2013-06-20 20:29:20 -04:00
jacob1
9a25fb741c remove debug printing I accidentally included again 2013-06-09 00:04:38 -04:00
jacob1
16cb95de64 fix problems with point queue, where it would draw a Point at A, a line from A to B, and a line from B to B every frame 2013-06-08 22:23:53 -04:00
jacob1
a1f9da2d0c fix tpt.selectedl not changing sometimes when using the element search or sample tool. Assume that new saves will get the auto-vote, so set that too. 2013-06-08 00:23:06 -04:00
jacob1
1d00e712ad save publishing info in the save upload ui
also fix the other crash when exiting the game from inside of one of these windows, because first Client::Shutdown would delete all active requests and only later ~Engine would delete _state, which delets the ServerSaveActivity window, which tries to close the active render request
2013-06-07 19:32:38 -04:00
jacob1
2119343b6a fix sim.NUM_PARTS, other small changes 2013-06-05 23:17:34 -04:00
jacob1
cbc80de652 some new sim and ren lua api functions 2013-05-29 20:35:46 -04:00
jacob1
77bf649fb4 new lua sim api functions to get/set deco color, load a save, and adjust coordinates to the screen / zoom window 2013-05-16 23:12:33 -04:00
jacob1
9cd84eccde fix tpt.selectedl sometimes being incorrect 2013-05-16 21:59:40 -04:00
jacob1
dfc33aaeea finish return values for the legacy api, add sim.saveStamp and sim.loadStamp 2013-05-15 13:51:45 -04:00
jacob1
94d21a1679 when called with no arguments, some tpt. functions will act as get functions (unfinished)
Also, redo some menu stuff to use int's instead of Menu *s, and fix bug with toggleable buttons being toggled without triggering their actions
2013-05-14 23:50:26 -04:00