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

1573 Commits

Author SHA1 Message Date
jacob1
4746474127 fix occasional crash when flood fill deleting 2013-07-29 00:34:43 -04:00
jacob1
bd0b779bd0 update version number 2013-07-28 10:20:35 -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
Simon Robertshaw
ddd51aed3d Async Request methods for SaveInfo and SaveData 2013-07-28 10:30:01 +01:00
Simon Robertshaw
7a847e7a55 Fix request identifier tracking 2013-07-28 10:29:30 +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
39acce4502 fix tpt.heat return value 2013-07-26 18:36:17 -04: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
beff3db8d2 fix ctrl+x not deleting all signs 2013-07-25 18:23:02 -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
468e678cd6 unhide FOG and RIME elements. TODO: hide VINE from the menu? (seems useless, would make the menu less scrolly) 2013-07-19 21:22:26 -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
cc887995c0 fix openGL compiling (most likely), fixes #146 2013-07-17 18:20:50 -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
e0d982367b fix bug where saving and loading elements in saves relied on the name being consistent between versions. The palette should only be used for lua elements 2013-07-15 17:42:43 -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
0214fcb5ae particles can't be drawn with the brush inside of walls they don't belong, fix flood fill delete issue 2013-07-13 14:17:21 -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
c29bfd285d fix bug where PSTN would write past tempParts and into other things, like corrupting TRON colors and making it all blue 2013-07-10 21:01:34 -04:00
jacob1
081c58990e fix floodfill and prop floodfil with photons 2013-07-10 17:59:16 -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
Saveliy Skresanov
6e7a5488b5 Fixed the bug with SPWN not creating when redoing (Ctrl-Z). 2013-07-09 23:39:48 +07:00
Saveliy Skresanov
3c5a341dbc Merge branch 'master' of https://github.com/FacialTurd/The-Powder-Toy 2013-07-07 11:52:43 +07:00
Saveliy Skresanov
ac66ce3b3c Fix the bug where stickmen were shooting LIGH only in one direction. 2013-07-07 11:52:08 +07:00
jacksonmj
1b58c1eea8 Fix #127, threads should not be cancelled after being joined 2013-07-06 21:27:47 +01:00
jacob1
e8b0e31656 Merge pull request #143 from mniip/foo 
fix PSTN coloring
 2013-07-02 13:49:19 -07: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
mniip
b8c218c89b shouldn't use PIXR/G/B/PACK there, would break if using a non-standard bit scheme 2013-06-28 15:02:50 +04:00
jacob1
c1320d2007 fix sim.loadStamp return value, remove VINE_MODE 2013-06-27 12:10:55 -04:00
jacob1
776b2f6607 fix version tagging in saves 2013-06-24 00:02: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
625766028d fix NEUT not setting off DEUT directly under it (save 1236560) 2013-06-22 12:39:44 -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
66f250b29d fix PTCT melting temperature, seems to have been broken in 525f87fd6b , fixes #108 2013-06-20 23:01:41 -04:00
jacob1
f0f2c43277 CFLM is a gas ... not a liquid. Fixes #116 2013-06-20 22:42:21 -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
06fb97bc40 fix BRMT always acting like it was created from TUGN 2013-06-20 00:10:24 -04:00
Saveliy Skresanov
53ae6ee517 88.0 beta, build 271 2013-06-16 16:29:18 +07:00
jacob1
688d82b4b9 add back sim.partNeighbors + some alternate spellings 2013-06-13 10:57:54 -04:00
mniip
a3056c86e6 simulation.pmap() 2013-06-13 00:38:58 +04:00
mniip
7c25baa9a9 simulation.partNeighbours() iterator 
// no one uses it yet, so it shouldn't break anythign really
 2013-06-12 21:42:15 +04:00
mniip
17de12dc8b simulation.parts() iterator 2013-06-12 21:12:07 +04:00
Saveliy Skresanov
03f2590967 Lower rounding errors in BIZR code and make it change color both on vertical and horizontal movement. 2013-06-12 20:14:34 +07:00
jacksonmj
4e4bd9a11b Signed integers can be negative, so prop>x does not always correctly indicate whether higher bytes are used 2013-06-11 00:26:41 +01:00
jacob1
b699bb176f Add two new properties for CLNE-like elements 
the thing CLNE does, drawing upon it will set ctype; and what BCLN  does to CLNE - disables #1). Made use of the two new properties
 2013-06-10 10:51:55 -04:00
jacob1
52ec8f438b add the single saveID copytext button into the save preview too 2013-06-09 17:13:57 -04:00
jacob1
a6ee8e2af1 fix NEUT created from DEUT explosions sometimes having the deco color of previous particles. Also allow the deco editor to color energy particles instead 2013-06-09 11:15:24 -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
jacksonmj
0f5d0859b4 Possibly fix crash due to Lua running out of stack space 2013-06-09 01:18:44 +01: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
58f8451b9e make saves private by default again 2013-06-07 13:08:45 -04:00
jacob1
8f72ee829f PHOT can go through PBCN and BCLN, fixes differences in PHOT cloning found in save id:1213267 
also some renaming / reorganizing in init_can_move
 2013-06-07 12:45:36 -04:00
jacob1
e146ae50ab some minor changes to tools 2013-06-06 23:28:07 -04:00
jacob1
76b92952b1 adjust tool strengths a little, to make them a little faster 2013-06-06 22:19:51 -04:00
jacob1
5ae6b18677 GOLD changes photons to yellow 2013-06-06 16:02:21 -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
c7ce3fa4b2 make constants in the lua api's a lot easier to write 2013-06-05 22:56:00 -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
80380bbaa3 even more lua simulation api functions 2013-05-30 22:28:42 -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
jacob1
41e369e68e mniip: add back missing easter egg 2013-05-22 18:21:17 -04:00
jacob1
1588226120 move frameStart to right after the fps is limited (counts everything, including mouse/key functions now) 2013-05-21 23:23:57 -04:00
cracker64
4e9ee3a3a3 Fix incorrect FPS counter, need to count blit too. 
2x scale gets a massive *real* fps boost, the fps lied before.
 2013-05-21 23:05:27 -04:00
cracker64
2735a80d28 Fix STKM spawns, fix cases. 2013-05-21 18:19:05 -04:00
cracker64
e1d8585871 Jacob can't into switches 2013-05-21 17:54:37 -03:00
jacob1
6fec955f41 TPT: Stop STKM being able to jump on the bottom of the screen 509b84b4f 2013-05-20 16:50:49 -04:00
jacob1
bd262d8c92 Merge pull request #136 from mniip/scons 
mingw compiling fixes
 2013-05-20 08:30:08 -07:00
jacob1
35f84a0942 Merge remote-tracking branch 'origin/master' 2013-05-20 11:27:18 -04:00
jacob1
826b966668 reduce rand() chances to 5x the old values in elements that were changed to 3x3 loop checks instead of 5x5. Also some other fixes I found when looking at what had been changed. 2013-05-20 11:26:51 -04:00
jacob1
d29b001d82 Merge branch 'master' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-19 22:59:42 -04:00
jacksonmj
45f057957b Fix description: METL does not break under pressure 2013-05-19 21:46:55 +01:00
mniip
3979395e65 reenable sighandlers for winderp 2013-05-19 10:02:42 +04:00
jacob1
5b1389621f minor fixes to descriptions (again) 2013-05-18 23:12:37 -04:00
jacob1
981f6984c2 Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git 2013-05-17 12:44:25 -04:00
jacob1
cbd402d8cb fix CFLM making VIBR unable to explode 2013-05-17 12:44:18 -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
fd97e923f3 remove check in deco tools (that shouldn't be there) 2013-05-16 19:36:41 -04:00
jacob1
027649e858 lua simulation api functions for drawing with tools / deco 2013-05-16 19:33:30 -04:00
jacob1
6f8e2c0345 remove unneeded / duplicate constants, fix SPC_AIR/other tools so it won't conflict with lua elements (the 11th one won't work right now) 2013-05-16 17:01:33 -04:00
jacob1
751da54183 make making VIBR from molten TTAN+EXOT a little easier (molten VIBR slowly kills EXOT) 2013-05-16 15:09:17 -04:00
jacob1
242f4bcdf6 more minor fixes 2013-05-16 01:04:49 -04:00
jacob1
ebe145b39f soap lines show in nothing mode, some small changes to arguments for sim api drawing functions 2013-05-16 00:55:44 -04:00
jacob1
81876a93a3 redo some brush drawing stuff to remove useless checks, and to allow for replace mode in the future 2013-05-16 00:20:07 -04:00
jacob1
5ad819efbd remove checks on location / element in the simulation drawing functions. fix drawing circles with an rx of 0. Probably fix compiling error 2013-05-15 21:10:22 -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
ab3675d6ee minor lua api fixes 2013-05-14 18:11:04 -04:00
jacob1
2e409f966c gfx.draw/fillcircle 2013-05-14 16:39:20 -04:00
jacob1
431f5a0083 lua simulation api functions for creating particles, walls, boxes, and walls 2013-05-14 14:40:18 -04:00
jacob1
18ddb7a155 some more description changes 2013-05-13 22:12:03 -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
jacob1
67e1213905 fix tpt.message_box, fix compiling error 2013-05-09 18:52:13 -04:00
Simon Robertshaw
e53f2bf0b5 Forward resample argument correctly from VideoBuffer resize method 2013-05-09 23:33:43 +01:00
cracker64
d1c8978a34 just one to_boolean works... any number is true. 2013-05-09 16:03:14 -04:00
cracker64
4c5667fbc6 Fix tpt.message_box correctly to only accept true/false third arg. 2013-05-09 15:51:01 -04:00
Saveliy Skresanov
f35f221554 Rocket boots for fighters. 2013-05-08 23:36:04 +07:00
Saveliy Skresanov
c6930ddc5f Merge remote-tracking branch 'upstream/master' 2013-05-08 23:10:01 +07:00
Saveliy Skresanov
9893f59657 Fix "blow power" for stick man, disable rocket boots on E-hole. 2013-05-08 23:08:29 +07:00