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

1773 Commits

Author SHA1 Message Date
jacob1
d87e21c9d4 fix bug where liquids don't stabalize in radial gravity 
nx and ny are declared at the start of update_particles_i, but not reinitialized before the liquid attempts to move, so it will always try to move up and left first, and probably succeed.
 2014-04-25 20:45:42 -04:00
jacob1
49996a8c02 Auto-focus more textboxes 2014-04-17 12:03:24 -04:00
jacob1
68e4c638bf fix SOAP changing the .tmp/.tmp2 of particles it thinks it's attached to 2014-04-17 12:03:24 -04:00
jacob1
75034de5a4 fix crash when SOAP gets changed into another element, fixes #186 2014-04-12 15:52:12 -04: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
181f0cfe5b Add in life values that use EXOT's grey coloring scheme, but don't copy things 
At the request of Catelite :P
 2014-04-08 23:45:05 -04:00
jacksonmj
afacecffd9 Prevent clearrect wrapping round at the edge of the screen 2014-04-05 18:20:30 +01:00
jacksonmj
11997cf3ad Prevent red BRAY from affecting FILT colour via DTEC 2014-03-27 19:36:51 +00:00
jacob1
4e478cfe20 fix bug where InstantOpen never got reset after opening saves in the save browser 2014-03-27 12:21:16 -04:00
jacob1
a71cb3b254 fix / change 2, 3, and 4 from http://tpt.io/.265916 
mostly makes BRAY act more like PHOT in some cases
 2014-03-26 22:07:04 -04:00
jacksonmj
20cbcf8ad9 Velocity limit, to prevent NaNs 2014-03-27 00:35:20 +00:00
jacob1
2e6b4242d6 don't resize save buttons in the online save browser, fix selection bug in console 2014-03-25 14:44:58 -04:00
Simon Robertshaw
50bc126e6d Update version number (89.2.281 -> 89.2.283) 2014-03-16 12:18:38 +00:00
Simon Robertshaw
8e7c30700e Return blank string instead of undefined 2014-03-16 11:44:36 +00:00
Simon Robertshaw
197a70c2e6 Fix Clipboard for renderer build, ensure MacOS and Windows clipboard funcs return std::string 2014-03-16 11:35:53 +00:00
jacob1
5b67c8ce68 elem.property and elem.element can read Identifiers 2014-03-15 14:20:40 -04:00
jacob1
258aaedb0a add sim.reloadSave, tpt.selectedreplace 2014-03-13 14:44:39 -04:00
jacksonmj
c6d6011337 An ugly fix for numpad, since it seems event.key.keysym.mod isn't entirely reliable for some unknown reason 
Partial revert of 7ce9907f82
 2014-03-12 15:05:54 +00:00
jacksonmj
1ca63b3813 Add more key definitions 2014-03-12 15:04:16 +00:00
jacob1
92891f364b fix tooltip commit 2014-03-12 00:03:32 -04:00
jacksonmj
a1515b3d5e Shift key for numpad 2014-03-12 00:54:52 +00:00
jacob1
7dc5139b66 toolTips on search / save simulation buttons change when ctrl is held 2014-03-11 14:04:05 -04:00
jacob1
7ce9907f82 fix textbox key repeat issue, fix numpad issue (in two ways) 2014-03-11 12:53:42 -04:00
jacob1
3f65b47a5e small change to sim.partProperty 2014-03-10 17:20:50 -04:00
jacob1
7603da0242 fix tpt.set_property again 2014-03-09 15:31:32 -04:00
jacksonmj
e5941950ba Make FILT tmp=6 ("no effect" mode) work with CRAY 
(Other FILT modes still don't work with CRAY, only tmp=0 or 6)
 2014-03-09 09:41:43 +00:00
jacksonmj
9531de49ec Vertical flip when pasting stamps (Ctrl+shift+r) 2014-03-08 13:41:45 +00:00
jacksonmj
55fbf13157 Display numeric value of ctype instead of element name translation for elements which use it as wavelengths 2014-03-08 13:34:03 +00:00
jacob1
21854df9f3 lots of random fixes to the legacy lua api 2014-03-04 20:44:25 -05:00
jacksonmj
a5ea6555f1 Fix more bugs in the Lua API 
Crash with sim.partKill(large number).
sim.neighbours() looking for particles in completely the wrong place.
Impossible to tell from sim.partID whether a particle exists, since it returns 0 both if there is no particle there and if particle 0 is there.
 2014-03-04 23:34:51 +00:00
mniip
4152bb560e Do not use loadstring to load autorun (who even wrote this?). Also print a message in case of successful autorun load 2014-03-04 15:26:35 +04:00
jacksonmj
64e16025d8 Fix bug in Lua API sim.neighbours() causing some particles to be missed out 
Was excluding all particles with the same x or y as the centre instead of just the centre particle.
 2014-03-03 22:42:21 +00:00
jacksonmj
224b25fae5 Fix Lua API sim.partNeighbours with 4 arguments 2014-03-03 20:09:35 +00:00
jacob1
4158581b21 fix error logging in lua key events 2014-03-03 13:46:46 -05:00
mniip
43bff37279 fix numpad behavior: movement keys are no longer triggered with numlock on 2014-02-27 20:39:16 +04:00
jacob1
d59253cfc7 fix sim.deleteStamp and sim.loadStamp (couldn't load/delete stamps with names like 530e908700) 2014-02-26 20:29:15 -05:00
mniip
55284e6313 Fix most of clipboard-related memory leaks and potential crashes; Fixes jacob#23 2014-02-25 18:44:44 +04:00
Simon Robertshaw
8bc03dbe1c Update version number (89.1.278 -> 89.2.281) 2014-02-24 22:11:11 +00:00
mniip
96c889bcab fix gettime compilation on OS X 2014-02-25 01:12:26 +04:00
nucular
8561976121 Fix (hopefully) most of the R/W errors inside the new Lua API 2014-02-22 10:13:09 -05:00
jacob1
71f90b5d59 new function: sim.deleteStamp 
mostly for use in tpt multiplayer
 2014-02-20 16:02:32 -05:00
jacob1
13766bf6db fix weird STKM bug at high life 2014-02-15 10:24:25 -05:00
mniip
a105ed9df8 Use system clock instead of used CPU time. Fixes key repeat and some 
other stuff. close #206
 2014-02-13 00:26:34 +04:00
jacob1
d38b7b9b11 pressing tab switches between textboxes in the deco editor 2014-02-06 12:15:48 -05:00
mniip
1266307070 stop neut from dragging particles inside energy walls, fixes jacob#18 2014-01-30 22:55:55 +04:00
mniip
250b522221 map numpad keys to movement keys where applicable 2014-01-30 22:22:04 +04:00
jacob1
5b886fc51e boxmein: Added clipboard support to Lua 2014-01-29 17:57:18 -05:00
jacksonmj
cf503a29f4 Bounds check before interpolation to find walls 2014-01-26 10:18:01 +00:00
jacksonmj
09e7418aae Prevent air going through walls in cases of extreme velocity 2014-01-26 01:27:46 +00:00
mniip
09beafed3a Fix ParseExceptions falling through; 
Apparently since when the RequestBroker was added, the logic has been changed,
and the exception no longer comes through PreviewController's try{} block.
 2014-01-25 15:39:44 +04:00
jacob1
f66679e551 a little reorganization (maybe more later) 2014-01-20 13:52:53 -05:00
jacob1
c5989605a5 fix compiling in visual studio 2014-01-20 11:43:12 -05:00
jacob1
add45b4e60 fix crash with gfx.drawText() 2014-01-20 11:33:33 -05:00
jacob1
0409d93789 signs can be moved onto the zoom window, fixes #89 2014-01-17 23:27:57 -05:00
jacob1
4e9a5bdaec make sure comment box height and cursor position don't go too far when it's resizing, fixes #82 2014-01-17 21:49:55 -05:00
jacob1
1f1062408c element palette converts elements stored in .ctype and .tmp when needed, fixes #105 2014-01-17 14:33:22 -05:00
jacob1
c15ab822a9 some config.h cleanup, fixes #151 2014-01-17 13:05:53 -05:00
jacob1
02aba363c3 slight PROP description change, don't save invalid PROP preferences 2014-01-16 11:09:55 -05:00
mniip
69c9be0e99 implement generic property value as a union instead of void* 2014-01-16 11:00:47 -05:00
mniip
8f2fbcd9e1 brand new prop tool. draws like any other tool 2014-01-16 11:00:47 -05:00
jacob1
a32a66c9ab only include strings.h on mac (fix visual studio compiling) 2014-01-13 21:27:59 -05:00
jacob1
d901b2f8ef Fix crash with smudge tool around the edges 2014-01-09 12:55:39 -05:00
jacob1
aea8402383 fix holes in wall lines with a small radius (again) 2014-01-08 14:32:59 -05:00
jacob1
0d51d6bd07 manually fix bug where sometimes the top / bottom pixel of circle brushes would disappear 2014-01-07 20:46:42 -05:00
jacob1
3329a6bd79 fix element buttons not changing color when using tpt.el.color, remove 4 char restriction on element names with tpt.el.name 2014-01-07 16:32:15 -05:00
jacob1
eaf0daec43 insulators block ambient heat (when there are a lot nearby) 2014-01-07 16:32:15 -05:00
jacob1
dcef255f47 fix flood fill. This was a mistype, and the original check I had doesn't work all the time anyway (so just remove it) 2014-01-07 16:32:15 -05:00
jacob1
f7cd7691e8 fix bug where STKM can be killed from HSWC when turned off 2014-01-07 16:32:15 -05:00
jacob1
355cd37ffe Redo sandcolor to use alpha, so that when powders transition they don't stay the same color 
Also make color change less sharply over time
 2014-01-07 16:32:15 -05:00
jacob1
41cc0a398a better way to prevent PROT in fusion 2014-01-07 16:32:15 -05:00
jacksonmj
4b28cdb6ba Prevent FILT being rendered as black if the only wavelengths present are invalid 2014-01-03 12:21:15 +00:00
jacksonmj
7b0fdaa204 Use >= for high temperature transition comparisons and < for low temperature transitions 
Fixes http://tpt.io/~1419883
 2014-01-03 11:42:59 +00:00
mniip
fdfaa3a29b add defines for window resolution 
--amend
 2013-12-29 20:12:50 +04:00
jacob1
c4562ec73e check to make sure flood fill doesn't crash when pmap is errored (?) 2013-12-29 11:04:28 -05:00
mniip
3e3fe1af73 fix VIRS's part_change_type abuse, fix http://tpt.io/.260472 2013-12-25 16:07:18 +04:00
jacksonmj
7fdc4dc83b Mismatched new[]/delete in WebRequest::Process() 2013-12-23 19:16:04 +00:00
jacksonmj
4459bf5363 Also, mismatched new[]/delete in APIRequest::Process() 2013-12-23 17:21:14 +00:00
jacksonmj
aa74deb6d5 Mismatched new[]/delete for serialised GameSave data 2013-12-23 17:17:40 +00:00
mniip
ee542bcafc bluescreen on lua panics 2013-12-23 17:59:23 +04:00
mniip
4eab5c4ce3 invalidate gravity map if walls changed, fixes http://tpt.io/~1223463 2013-12-22 11:41:42 +04:00
mniip
bc84326ca2 Got rid of debug fps counter, just added deltatime into usual fps counter 2013-12-21 05:26:54 +04:00
jacob1
2c7a527030 Revert ef6cc9c, due to some advanced electronics breaking 
TODO: add a flag to some electronics so that we can fix all the bugs at once / add new things without breaking things
 2013-12-18 23:23:07 +04:00
jacob1
78c89dc62b fix crash with LIFE, fix compiling with lua (again) 2013-12-18 23:23:04 +04:00
mniip
c3cf0638d6 This ! shouldn't be there 2013-12-16 00:17:40 +04:00
mniip
9db1358ca3 In element search promote exact and starting position matches (finally possible to access VAC via element search) 2013-12-15 22:57:35 +04:00
jacksonmj
035dfa2e04 Fix some compiler warnings 2013-12-14 18:47:28 +00:00
mniip
30c80220b2 fix PIXR() macro: if MSB of the color is nonzero, it used to return a >255 value, which, say, in Renderer.cpp would get clamped to 255, no matter what the actual red byte is 2013-12-14 22:25:11 +04:00
mniip
5fc07b4c3c fix PHOT/BIZ* transparency 2013-12-12 19:54:52 -05:00
mniip
12d98dada1 oooo wait, rectangle snap too 2013-12-12 16:23:58 -05:00
mniip
0fb08c5e97 fix snapping 
why was trigonometry used in such a simple function
 2013-12-13 00:55:20 +04:00
mniip
c012f667c7 fix BMP 2013-12-09 03:38:40 +04:00
jacob1
3fb6cd2fbb Merge pull request #196 from gamax92/develop 
Extension to tpt.screenshot
 2013-12-08 14:28:03 -08:00
Robert Gadzerfraud
0819885700 Add in BMP support 2013-12-08 15:12:07 -07:00
Robert Gadzerfraud
ced44c8be2 Extend tpt.screenshot to return created filename and optionally, PPM format 2013-12-08 12:16:12 -07:00
jacob1
12aef78bb0 Update version number (89.0.275 -> 89.1.278) 2013-12-08 14:10:06 -05:00
Simon Robertshaw
e1616fdd82 Hotfix: Don't open saves larger than 200MB 2013-12-08 16:58:17 +00:00
jacob1
138cb4d757 exception bluescreens print what the exception was, some (probably unnecessary) fixes to fusion that were never merged in, and probably a compiling fix 2013-12-03 22:05:35 -05:00
jacob1
ce587a3ae3 update build number 2013-12-03 22:05:35 -05:00
Simon Robertshaw
2010a71d85 Include strings.h for TPTScriptInterface 2013-12-01 21:19:30 +00:00
Simon Robertshaw
c75a5a1f80 Remove debug logging for user pref reading/writing 2013-11-19 21:25:03 +00:00
Simon Robertshaw
a32af1679a Fix Mac OSX readUserPreferences missing off last char of pref data, add clipboard implementations for Mac OS X 2013-11-19 21:23:04 +00:00
Simon Robertshaw
fc25d5a466 Use NSUserDefaults for powder.pref storage on OS X, fix initial file open handling on OS X 2013-11-18 21:54:41 +00:00
jacob1
1bce4984e3 Merge pull request #192 from mniip/tags 
Fix tag order
 2013-11-12 08:18:09 -08:00
mniip
085d0e8cb8 unused variable 2013-11-12 15:20:17 +04:00
mniip
4b914d12c2 fix tags order (#141) 2013-11-12 09:16:17 +04:00
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
jacksonmj
186f8a1742 No more red DEUT 
Prevent some integer overflows in DEUT graphics and interactions.
 2013-11-07 21:36:36 +00:00
jacksonmj
75b7b85703 Fix sign duplication when loading a save 2013-11-03 14:26:51 +00:00
Simon Robertshaw
e7ebbc0435 Hotfix: Authenticate all Web&ApiRequests to fix save loading/voting issues 2013-10-30 20:31:20 +00:00
Simon Robertshaw
5cc69aa2a9 Skip startup install check if running on Mac OS 2013-10-30 19:48:06 +00:00
Simon Robertshaw
0894aaa7fa Fix strcasecmp defined on Windows, add warnings as errors compile argument, always supress offsetof warnings 2013-10-30 19:46:34 +00:00
mniip
41e058e3b2 Fix a few cpu time leaks in request broker and HTTP, also add a global sleep function 
(and why did HTTP.c have it's own copy of mystrdup anyway)
 2013-10-30 21:39:30 +04:00
jacob1
0180c9b15a fix remaining warnings, fix compiling errors when using --release 2013-10-29 23:55:10 -04:00
jacob1
45bf0dfcdb Merge pull request #180 from mniip/warnings 
Warnings
 2013-10-29 19:24:20 -07:00
mniip
3625bd407e moar const 2013-10-30 05:07:27 +04: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
mniip
f7f24a9804 D:^H^Hfix newlines at end of files 2013-10-30 04:41:04 +04:00
mniip
71d107aac2 _proper_ typing system using a union instead of multicast void* 2013-10-30 04:38:39 +04:00
mniip
9183fa1755 apparently Ximon hates const; a lot; 
added a bunch of const everywhere, had to modify a few functions to be const-compliant
 2013-10-30 04:38:13 +04:00
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