Commit Graph

419 Commits

Author SHA1 Message Date
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
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
jacob1
6edb96ee51 fix bottom row of saves in the save browser being cut off 2013-10-18 16:57:53 -04:00
jacob1
fd6da26b73 fix not being able to select / see all elements in menus with tons of elements 2013-10-18 16:36:37 -04:00
jacob1
ba43e4d238 revert b17ef7f938 (couldn't figure out better fix for the new PSTN bug), fix annoyance with clicking on save comments changing pages 2013-10-18 16:13:40 -04:00
jacksonmj
132755525c Fix incorrect search page count 2013-10-17 16:09:28 +01:00
jacob1
13d89ce9e1 Fix tpt.get_numOfParts, add "C" next to temperature in HUD 2013-09-28 16:58:01 -04:00
jacksonmj
ce277a11f1 Forgot HUD description for FILT tmp=9 2013-09-15 15:44:01 +01:00
jacksonmj
7270461985 Enabled check for PIPE too 2013-09-08 11:52:44 +01:00
jacksonmj
79edfe9589 Include elements[].Enabled in check for invalid lava ctype 2013-09-08 09:26:31 +01:00
jacob1
a5cee8c393 alternate keys: semicolon for replace mode, ctrl+semicolon for specific delete (also couldn't figure out how to detect mac delete key) 2013-08-29 23:01:07 -04:00
jacob1
fd586d167f fix bug where when sparks were reset, ctype wasn't 2013-08-29 22:44:38 -04:00
jacksonmj
268158f1dd More FILT modes: XOR and NOT 2013-08-29 18:24:44 +01:00
jacksonmj
bebe9bd8fd Add a way for photons to set the colour of FILT (major version bump required)
Also add some new FILT modes, and make FILT modes affect BIZR and
BRAY colour in the same way as they affect photon colour. Photons
passing next to DTEC will set the colour of all FILT in a straight
line starting from any FILT adjacent to the DTEC (a bit like an
ARAY beam), and the exact colour of the photon will be used for
FILT interactions instead of the colour based on temperature.

FILT tmp=4: red shift, tmp=5: blue shift. Size of shift determined
by FILT temperature. tmp=6: FILT has no effect on photon colour
(possible before by using invalid tmp modes, but here's a supported
method of doing it. Invalid tmp modes should be automatically replaced
in existing saves).

Also, FILT mode is now described in the HUD.
2013-08-29 17:19:07 +01: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
73544bd069 probably fix issue where your name on your own saves switched between yellow and red, and save owner's comments weren't always red 2013-07-29 00:35:09 -04:00
Simon Robertshaw
387424e007 Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy 2013-07-28 10:30:45 +01:00
Simon Robertshaw
8cfead7d5a Use async requests/RequestBroker for PreviewModel 2013-07-28 10:30:32 +01:00
jacob1
a328fc519e fix your name being red on your own saves, not yellow 2013-07-27 12:47:59 -04:00
jacob1
5518a6bcd6 fix right modifier keys 2013-07-27 11:21:42 -04:00
jacob1
3d16253319 fix ctrl check in stamp and online browsers 2013-07-27 11:19:02 -04:00
Simon Robertshaw
3edee42971 Call OnResponseReady with an identifier for the request, add a WebRequest class 2013-07-27 12:38:52 +01: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
e0913d2639 can change comment pages without the scrollwheel, click and hold scrollbar area to have it scroll to that point 2013-07-21 17:05:55 -04:00
jacob1
a63f5b875b when scrolling up through comments, it starts at the bottom of the page instead of the top 2013-07-21 15:59:51 -04:00
jacob1
a9352008cf your own comments are yellow, save owner's comments are red (like on the forums) 2013-07-21 15:23:41 -04:00
jacob1
da7d107f60 remove specific delete for walls, doesn't work very well and it conflicts with specific delete for elements
Also prevent wall replace mode, could never do anything because walls already replace everything
2013-07-18 18:54:09 -04:00
jacob1
40285e107a flood delete will delete walls even if wall delete tool isn't selected 2013-07-18 18:30:24 -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
fe78593ca2 ability to use zoom tool while placing stamps 2013-07-18 16:01:32 -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
4243987acd black decoration preset, improve look of deco buttons a little 2013-07-17 16:53:14 -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
d4ff778434 small attempt to reduce spam tags 2013-07-16 16:03:26 -04:00
jacob1
19e182ae42 add back rgba images in the local/server save uploads 2013-07-16 14:48:50 -04:00
jacob1
6f29926b96 deco menu button textures (not black) 2013-07-16 13:08:57 -04:00
jacob1
5773e6afb5 fix multiple deco presets being able to be selected at once, fix "Decorations: Enable" coming up every time you open the deco editor, presets deselected when you leave editor 2013-07-16 11:24:11 -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
c2a9b5c6f6 fix quickoption tooltip (ctrl+g, not g) 2013-07-15 13:17:20 -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
01b2d55263 fix being able to draw STKM and SPWN on top of other elements 2013-07-13 14:07:19 -04:00
jacob1
896dd03d25 hitting the buttons on the bottom while pasting a stamp will cancel the paste (fixes stacking glitch) 2013-07-13 13:56:30 -04:00
jacob1
728d201e93 stamps and local saves rendered without fire, greatly improves loading times 2013-07-13 13:23:48 -04:00
jacob1
4bcaf7f385 fix being able to go one page too far in searches with the scroll wheel 2013-07-13 12:51:25 -04:00
jacob1
864f0e6f45 WIFI lines aren't drawn in persistent mode, and are based on current temp, not tmp, so they work when paused 2013-07-13 12:06:43 -04:00
jacob1
34db317e44 update rules to fix some problems and more closely match the current rules. fixes #126 2013-07-11 23:32:39 -04:00
jacob1
a06202c78f fixes to wall and particle floodfill. Wall fill ignores particles and always goes to the edges, while particle fill will only ignore walls it can't exist in, and flood particle erase won't check for walls / edges at all 2013-07-11 22:43:36 -04:00
jacob1
4f5c453643 if the previewmodel has exited, the running threads should delete this 2013-07-11 19:30:48 -04:00
jacob1
3203e597b9 fix piston bugs, fix crashes, don't use bluescreens when compiled with debug mode in visual studio 2013-07-10 16:59:10 -04:00
jacob1
e7a3fd1c29 minor changes / fixes to last commit 2013-07-10 15:08:00 -04:00
jacob1
4f6904b1ed redo threading in PreviewModel so that you don't have to wait for everything to load to quit, and the threads don't access any of PreviewModel's data 2013-07-10 14:53:35 -04:00
jacksonmj
1b58c1eea8 Fix #127, threads should not be cancelled after being joined 2013-07-06 21:27:47 +01: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
76ce2de1ce change some wall descriptions a little 2013-06-23 20:40:19 -04:00
jacob1
43540eb7e4 Add back replace mode and specific delete *
* only usable by Lua
2013-06-22 22:48:51 -04:00
jacob1
60b1bf5066 forgot to push this commit, SDL should only be included in 1 type of way 2013-06-22 09:36:50 -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
7a2114bc65 add error messages when errors happening while fav. / unfav.ing a save, deleting a save, or unpublishing one. Also don't use session key in url to add a comment since it isn't needed 2013-06-20 22:01:07 -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
fcff2ecc7f fix message when banned not fitting in the window, also partially fix issue #98 but needs to be done from the server 2013-06-20 11:19:31 -04:00
jacob1
52ec8f438b add the single saveID copytext button into the save preview too 2013-06-09 17:13:57 -04:00
jacob1
9a25fb741c remove debug printing I accidentally included again 2013-06-09 00:04:38 -04:00
jacob1
e13fb83ee0 SaveID Message after saving a save to the server (like the old tpt did). TODO: Put a similar button in the save preview instead of the two we have now. 2013-06-09 00:01:53 -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
69961956bf fix ToolTips on split buttons not working correctly (button overrode them), fix tooltips displaying on disabled buttons 2013-06-07 20:13:18 -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
e146ae50ab some minor changes to tools 2013-06-06 23:28:07 -04:00
jacob1
b594d68258 WIND tool creates WIND just by holding down the line tool again 2013-06-06 11:52:33 -04:00
jacob1
2119343b6a fix sim.NUM_PARTS, other small changes 2013-06-05 23:17:34 -04:00
jacob1
875ca75b07 fix not being able to draw tool lines or boxes, but you can still press ctrl+shift before clicking to use 10x strength 2013-06-05 10:55:46 -04:00
jacob1
8d7ab7f5e2 allow creating WIND lines from lua 2013-06-01 21:57:03 -04:00
jacob1
b16524292e fix bug where you had to start using a tool before setting it's strength 2013-05-31 19:53:32 -04:00
jacob1
d6d20defde Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-29 20:36:34 -04:00
jacob1
cbc80de652 some new sim and ren lua api functions 2013-05-29 20:35:46 -04:00
mniip
3a640fee3f some more compiling fixes 2013-05-17 18:32:41 +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
7b6ded50dc rename GRAV back to PGRV, fix formatting in generator, remove useless file 2013-05-16 20:04:39 -04:00
jacob1
027649e858 lua simulation api functions for drawing with tools / deco 2013-05-16 19:33:30 -04:00
jacob1
3d530e4f73 fix pause button. I'm not sure why I removed that ... 2013-05-15 20:36:45 -04:00
jacob1
624f038cc9 fix downvote button not being reset when you clear a save 2013-05-15 15:14:48 -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
jacob1
431f5a0083 lua simulation api functions for creating particles, walls, boxes, and walls 2013-05-14 14:40:18 -04:00
jacob1
7856f727a5 rename TUGN to TUNG (more popular spelling). Broken BRMT smelts back into TUGN 2013-05-13 21:10:45 -04:00
jacob1
e5cbcecdb9 fix circle brush shape at some sizes 2013-05-13 19:07:59 -04:00
jacob1
a5ae843553 also check .Enabled in PROP 2013-05-11 22:42:58 -04:00
jacob1
135bf44347 fix bug where you could set invalid types with PROP 2013-05-11 22:29:24 -04:00
jacob1
51f27bfad7 Merge remote-tracking branch 'origin/master' 2013-05-11 21:47:13 -04:00
jacob1
9d89d4b79b fix tooltips and dt 2013-05-11 21:43:52 -04:00
mniip
4d9b9b17d7 D: 2013-05-11 15:08:32 +04:00
Simon Robertshaw
c2cdec9e62 Togglable lua scripting 2013-05-11 11:52:35 +01:00
Simon Robertshaw
b8b5f91e20 Only free GameView if it can be closed 2013-05-06 00:24:53 +01:00
jacob1
082530d18c fix tooltip issues in render options too 2013-05-05 00:18:28 -04:00
jacob1
4f2d24bcff small fix 2013-05-05 00:10:57 -04:00
jacob1
b45a45ba4e fix element scrollbar issues, fix fading of HUD/intro text, fix compiling error with last commit 2013-05-05 00:07:07 -04:00
jacob1
07486c9885 drawtext_outline to fix unreadable infotips, tooltips fade in and out (more like old tpt) 2013-05-04 23:03:59 -04:00
jacksonmj
b2153b5af4 Typo in rules 2013-05-04 17:19:25 +01:00
jacob1
f93a70edfb ctrl+r reload shortcut, fix a few brush drawing bugs, fix stamp xor area, fix lua log text overlaps 2013-05-04 11:52:37 -04:00
Simon Robertshaw
b0f14e0c54 Fix position of scrolly bio, increase user profile window size 2013-05-04 15:18:37 +01:00
Simon Robertshaw
99c560bfd3 Prevent TUGN from breaking when resetting air 2013-05-04 15:04:19 +01:00
jacob1
ae34c43c66 update with latest rules, fix grammar, fixes #126 2013-05-03 23:54:08 -04:00
mniip
f9017bc7bb fixed dropper debug printing 2013-04-25 22:56:41 +04:00
Simon Robertshaw
b4fb55f86e Allow signing out and editing profile from the old login button, add a button to edit avatar (directs to the website at the moment) Allow viewing profiles by clicking avatars 2013-04-07 14:40:00 +01:00
Simon Robertshaw
bdc69f31c0 Fix includes for GUI stuff 2013-03-22 14:26:24 +00:00
Simon Robertshaw
9abe51526c Move all GUI source files into gui/ 2013-03-22 14:14:17 +00:00