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

1654 Commits

Author SHA1 Message Date
Simon Robertshaw
8b45c8f9e8 Merge remote-tracking branch 'china-richway2/CutGlitch' into develop, 
closes #176
 2013-10-29 21:46:33 +00: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
3f5b91f8a7 Increment version number 2013-10-29 20:08:09 +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
Simon Robertshaw
e78dcae851 Merge branch 'master' into develop 2013-10-29 19:39:52 +00:00
jacob1
a4da2566ec fix virus graphics 2013-10-26 12:10:10 -04:00
jacob1
48ecbce554 f5: reload sim, f2: screenshot f3: toggle extra HUD 2013-10-26 00:17:06 -04:00
jacob1
692f4b18c2 fix sim.decoBox arguments, add a sim.canMove function 2013-10-26 00:00:55 -04:00
Simon Robertshaw
30d985ba77 Only cancel click events clickable signs (not all signs) 2013-10-26 01:02:20 +01:00
Simon Robertshaw
aa09c0e753 Reject {b:1|blah} signs 2013-10-25 20:40:45 +01:00
jacob1
a6b5b60c20 Merge pull request #178 from mniip/x11-clipboard 
fix copy and paste in the same tpt window on SDL/Linux/X11
 2013-10-24 14:08:52 -07:00
mniip
5d3520d18c fix copy and paste in the same tpt window on SDL/Linux/X11 2013-10-25 00:46:41 +04:00
jacob1
79a2ac3103 fix issue with FILT PHOT scattering 2013-10-23 21:01:06 -04:00
unknown
12261e263d fix bug where Ctrl+X don't delete stacked particles 2013-10-23 21:06:19 +08:00
Simon Robertshaw
d9f1762da0 Merge branch 'develop' of https://github.com/simtr/The-Powder-Toy into develop 2013-10-20 15:38:40 +01:00
jacob1
dd73a7244f reduce / prevent PROT in fusion even more 2013-10-20 10:37:28 -04:00
Simon Robertshaw
e8c53dc3e8 Remove old unfinished virtual machine and Lua bindings for it 2013-10-20 15:33:06 +01:00
Simon Robertshaw
b59c381177 Do not allow 't/c' signs to lack an ID 2013-10-19 22:10:53 +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
Simon Robertshaw
cebd28148d Minute performance improvement for Sign.getText 2013-10-19 17:22:43 +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
02a4c17d72 Ignore invalid walls in some old saves, so that they load correctly 
E.g. save 10631 from old server
 2013-10-17 16:09:38 +01:00
jacksonmj
132755525c Fix incorrect search page count 2013-10-17 16:09:28 +01:00
jacob1
c4dcb37de4 PROT with 0 life doesn't die 2013-10-10 17:13:11 -04:00
jacob1
d1e75c7a50 make PROT lasers easier to make, adjust velocities needed to make things when smashing PROT together, use FIRE_BLEND for PROT graphics 2013-09-28 20:31:35 -04:00
jacob1
8fc39d659c VIRS only burns with PLSM, and has the NO_DECO graphics flag 2013-09-28 19:45:15 -04:00
jacob1
13d89ce9e1 Fix tpt.get_numOfParts, add "C" next to temperature in HUD 2013-09-28 16:58:01 -04:00
jacob1
c480c9ea19 Merge branch 'HEAD' of https://github.com/FacialTurd/The-Powder-Toy.git 2013-09-27 17:41:46 -04:00
jacob1
48f1adb038 fix min and max in VS2013 2013-09-27 17:39:16 -04:00
jacksonmj
ceca61114a Fix crash when trying to convert StringType to PointType 2013-09-27 19:41:12 +01:00
liquidcaesium
65640ee6af Decimal number support 2013-09-27 18:52:47 +03:00
liquidcaesium
a376b72b36 LCRY + PROT = LCRY + PHOT 
Protons passing through active LCRY get turned into photons slowly, functioning as a powered converter in that manner.
 2013-09-24 17:58:35 +03:00
jacksonmj
ef6cc9c418 WIFI: always delay one frame before conducting, to prevent particle order issues 2013-09-21 13:18:27 +01:00
jacksonmj
ce277a11f1 Forgot HUD description for FILT tmp=9 2013-09-15 15:44:01 +01:00
jacob1
e578b9f799 fix BIZS melting without heat sim on (I wonder how many more elements still do this ...) 2013-09-14 19:13:29 -04:00
jacob1
cf45b24a30 update version number 2013-09-14 11:15:52 -04:00
jacob1
c6ba381424 make PROT more red, and VIRS burns less 2013-09-14 10:26:23 -04:00
jacob1
ee093ae3b7 disable PHOT+H2 reaction during fusion 2013-09-14 09:49:19 -04:00
jacob1
e1b26346a1 ensure VIBR always eats PROT 2013-09-13 22:24:50 -04:00
jacob1
ae8e5e5c34 PROT+DEUT causes DEUT implosion (same as with NEUT, just negative pressure) 
Also PHOT+H2 now also make PROT+ELEC (which will not combine to make more H2)
 2013-09-13 22:02:03 -04:00
jacob1
830bb3ba5e fix !load -1 crash 2013-09-13 12:53:40 -04:00
jacob1
aa2ec3d162 fix SOAP crashes by making sure particle id's are between 0 and NPART. Also cut off .life to between 0 and 65535 when saving 2013-09-12 14:35:10 -04:00
jacob1
074a2226e1 remove useless and laggy lightning_recreate check 2013-09-11 21:41:54 -04:00
jacob1
332aa25bf6 save pavg[] in saves, for VIRS, PIPE, and STOR 2013-09-11 20:41:43 -04:00
jacob1
09c54b596b Merge pull request #158 from mniip/x11-clipboard 
X11 clipboard pull
 2013-09-11 13:51:32 -07:00
jacksonmj
9eccad80b1 Missing breaks in readOPS 
Causing some elements to be loaded incorrectly
 2013-09-08 18:14:12 +01:00
jacksonmj
2e52e209a6 CRAY: only set decoration colour after passing through FILT 2013-09-08 17:33:12 +01:00
jacksonmj
45dc8ac757 Revert "Don't reset decorations when sparking with INWR+CRAY(most things)" 
This reverts commit 5ad67f7778.
 2013-09-08 17:28:51 +01:00
jacksonmj
7270461985 Enabled check for PIPE too 2013-09-08 11:52:44 +01:00
jacksonmj
5ad67f7778 Don't reset decorations when sparking with INWR+CRAY(most things) 
INWR+CRAY(SOAP) will reset decorations
 2013-09-08 11:30:21 +01:00
jacksonmj
79edfe9589 Include elements[].Enabled in check for invalid lava ctype 2013-09-08 09:26:31 +01:00
mniip
8d96f3f6b6 fix segfault on wordwrapping a string with a character >=128 2013-09-06 13:09:24 +01:00
jacob1
d9089d13c4 fix BCOL melting and not burning when heat sim is off 2013-09-05 14:45:47 -04:00
jacksonmj
96221ff23e Make effect of PROT on wifi and portals independent of channel temperature ranges 
Cold PROT decreases channel by 1, v cold by 10. Hot PROT increases channel by 1, v hot by 10.
Since the effect is specified in terms of effect on channel number not on temperature, this will
cause less problems if the temperature gap is ever decreased to add more channels.
 2013-09-05 18:06:13 +01:00
jacob1
7d9fa1bfc7 new element: VIRS (also solid and gas virus states). Cured by SOAP (CURE element was not added) 2013-09-04 00:20:21 -04:00
jacob1
6c4f63be3b proton collision reaction (might need to be modified). Also some ways to go to/from protons 2013-09-02 21:58:52 -04:00
mniip
fea920d608 fix fixedRatio when VideoBuffer::Resize'ing, fixes #121 2013-09-02 18:03:43 +04:00
jacob1
f1145f31f5 new element: PROT (protons) TODO: proton colliders to produce heavier elements 2013-09-01 21:52:38 -04:00
jacob1
b2957dc1c9 ability to use Celcius and Farenheit in console 2013-08-29 23:37:57 -04: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
jacob1
2cbee180a1 fix bug where PROP wouldn't set properties of particle id 0 2013-08-29 22:34:50 -04:00
jacob1
d38af2764c move QRTZ .tmp into .tmp2 and .ctype into .tmp, fixes bug where sparking QRTZ resets .ctype and stops it from growing 2013-08-29 22:18:35 -04:00
jacob1
b17ef7f938 fix PSTN bug found in save 1299509 (hopefully won't break anything) 2013-08-29 21:00:31 -04:00
jacksonmj
c3d3f9fc2a FILT mode for old QRTZ scattering, for Catelite. 
FILT graphics could maybe do with changing in this mode.
 2013-08-29 18:28:49 +01: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
8a27363c76 implement X11 clipboard pull 2013-08-29 00:57:08 +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
4a308cbf66 oh, and remove dependency 2013-08-22 17:52:32 +04:00
mniip
4e9fe8b8e7 regexless gameModel 2013-08-22 17:51:19 +04:00
mniip
95c01bcf0a regexless getText 2013-08-22 17:09:55 +04:00
mniip
5e1385324a remove regex in renderer 2013-08-22 17:08:53 +04:00
Saveliy Skresanov
b2045b0a7f Fix sign save/topic regex. 2013-08-22 18:43:46 +07:00
Saveliy Skresanov
12c471f257 Soap freezing temp is -25C now 2013-08-15 22:02:24 +07:00
jacob1
ab6a0c2072 Fix tpt.element(<something not a string or number>) returning 1 2013-08-08 22:45:08 -04: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
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