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

1961 Commits

Author SHA1 Message Date
jacksonmj
d08621a0f6 Remove unused register_extension() 
(Client::DoInstallation is used instead)
 2015-06-17 20:36:33 +01:00
Sourec
4e8335b070 Changed falldown values for FIRE, CO2, and SMKE to zero, reverted changes to collision/placement logic 2015-06-11 16:31:21 -04:00
Sourec
bbe0c34d3e Switched an OR to an AND 
That was leftover from when I was rewriting a bit of this. Sorry!
 2015-06-11 16:25:39 -04:00
Sourec
1494f8237c Fixed FIRE, SMKE, and CO2 passing through the powder-only wall. 2015-06-11 14:29:59 -04:00
Sourec
7d7bf5eff6 Fixed CLST tmp value carrying over when converted by water 2015-06-05 21:40:28 -04:00
jacob1
c9d5841101 fix DRAY with .tmp = 0 (broken in a115e78952) 2015-05-23 12:47:39 -04:00
Aditya Vaidya
13cc593d13 Fixed most spelling errors in code. 'originaly' is read as 'original Y', so not a typo 2015-05-18 15:16:01 -05: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
jacob1
0a2b60627f change left tooltip when a local save is open 2015-05-14 22:34:28 -04:00
jacob1
8e7e8e0670 some changes to LIGH creation (mostly from lua) 2015-05-11 20:50:10 -04:00
jacob1
fef767335f remove loggedIn variable, small change to tooltips 2015-05-11 10:53:05 -04:00
jacob1
16b7f7d7bf Merge pull request #254 from boxmein/offline-saving 
Save to HDD by default when not logged in
 2015-05-11 10:51:11 -04:00
jacob1
b1fc134204 fix crash with high speed photons in loop edge mode 2015-05-10 21:48:09 -04:00
jacob1
dd102c1f11 fix possible crash when PROT removes spark on disabled elements 2015-05-10 21:16:53 -04:00
jacob1
aa854557f7 fix WOOD sometimes creating water when burning 2015-05-10 20:55:03 -04:00
boxmein
7145cacbb9 implement HDD saving by default in GameView. update tooltips to describe behaviour. 2015-05-01 15:55:22 +03:00
boxmein
424d1d4b47 when you're not logged in, displys a not-highlighted HDD save button 2015-05-01 15:54:41 +03:00
boxmein
bf001dfd77 enable Ctrl behaviour (eg sae to HDD) without highlighting 2015-05-01 14:44:51 +03:00
boxmein
56d04fcde8 add new form of enableCtrlBehaviour for un-highlighted HDD saving 2015-05-01 14:44:22 +03: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
jacksonmj
72329af09d Fix DLAY delay changing during save+load 
by rounding temperatures to nearest instead of always flooring.

Effect on DLAY delay:
Room temperature offset - loaded as whole number of degrees C, so rounding to nearest deg C gives the same number as flooring.
Full - loaded as whole number of K = original whole deg C - 0.15. Rounding to nearest deg C means the whole deg C delay from before saving is used as the number of frames to delay, instead of deg C - 1 if flooring was used.
 2015-03-27 17:39:05 +00:00
jacob1
fc5f3671f1 new function sim.clearRect, plus fix rounding errors breaking ctrl+x 2015-03-12 00:54:27 -04:00
jacksonmj
84f6ede2b8 Fix for commit d71a0d98: also adjust melting point of BRMT(TUNG) based on TUNG HighTemperature value 2015-03-05 00:14:26 +00:00
jacksonmj
8f57c9a6c7 Correct return type for TPTScriptInterface::parseInt 
so that large integers don't get changed into slightly different values by rounding caused by conversion to a float and back again.
 2015-03-01 15:52:15 +00:00
jacob1
a422e43beb visual studio error fix + warning fix 2015-02-25 18:56:50 -05:00
jacksonmj
91e871d0ea PSTN: allow zero or negative contributions towards movement amount 
Note that final movement amount < 0 means no movement, it will not reverse the movement direction. This is to keep interpretation of inputs simple - PSCN always extends, other conductors always retract.
 2015-02-24 22:48:31 +00:00
jacksonmj
cd71a6dff7 Float rounding strikes again - set destination coords using integers when moving particles with PSTN 
instead of adding a delta value to the current position, which might not give the correct result. Particles (except solids) were on rare occasions ending up at a point 1 pixel away from where they should be after being pushed by PSTN. This led to stacking, and in the case of save 1732622 after changing BIZS to a liquid, to disintegration of the save.

(TPT++ version of commit 2ad996dfe621887355f8532f1262c306421bc2de in jacksonmj fork)
 2015-02-23 13:35:17 +00:00
jacksonmj
d71a0d98eb Allow TUNG melting point to be changed from Lua 
Also set lava LowTemperature threshold to MAX_TEMP, to simplify changing melting points from Lua.
 2015-02-23 13:24:27 +00: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
b06af530a5 fix lua5.2 compiling (that isn't defined until we include the headers ...) 2015-02-14 00:01:31 -05:00
jacob1
57d1b4916d fix last two PVS-Studio bugs, closes #232 2015-02-13 21:45:22 -05:00
jacob1
316d0f1ace --luajit and --lua52 compile options 
no longer looks for lua 5.2 unless you tell it to
 2015-02-13 18:20:52 -05:00
jacob1
03e07945e3 fix lua element update bugs, fixes #244 
also add new mode for functions run before the normal update function
 2015-02-13 14:18:55 -05:00
jacob1
84f13cfe63 fix compiling error on windows 2015-02-10 23:39:15 -05:00
jacob1
6cb78186be sim.framerender function to simulate a certain number of frames 
also remove particle debugging lua function now that there are key shortcuts
 2015-02-06 20:34:07 -05: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
1840f4e39c fix crash when uploading save 2015-02-04 00:37:25 -05:00
mniip
4fa02965bf Clean up the EngineProcess loop 2015-02-04 04:13:51 +03:00
jacob1
b7fe998252 fix mouse coords at startup being 0,0, fix glitch that could make background windows fade completely to black 2015-01-31 14:09:50 -05:00
jacob1
94e635b65d fix negative tmp sing possibly generating max particles 2015-01-17 14:45:20 -05:00
jacob1
8c1db513f6 make sure ELEC dies in ELEC+NEUT reaction 2015-01-17 14:06:38 -05:00
jacob1
b1a3c404b6 fix platform / sconscript flag specific warnings, --no-warnings no longer defaults to true 2015-01-16 23:39:42 -05:00
jacob1
ace9e36cc6 fix ALL the warnings 
mostly just using more size_t. Also do some formatting around if statements
 2015-01-16 22:35:32 -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
54d985f975 gcc warning fixes (up to lua files) 2015-01-16 17:26:13 -05:00
jacob1
3a52453561 move more stuff around, remove loop through particles to decrease life and put it in the pmap one instead (like in my mod) 2015-01-11 14:36:40 -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
dce874484a fix all the gcc warnings in the element files (except one in PSTN) + all the unused variable warnings 2015-01-10 22:43:33 -05:00
jacob1
a5797f6262 reset length when running step functions in case a step was unregistered, fixes first half of #210 
also cleanup / make it easier to read
 2015-01-10 20:10:42 -05:00
jacob1
e92bbac700 fix some lua crashes (use more argument checking) 2015-01-10 18:59:20 -05:00
jacob1
4f6094136e fix renderer compile and make it create a "Save file invalid" sign when it can't render the save, fixes #97 2015-01-10 18:47:42 -05:00
jacob1
b2954a7f0a Publish button in browser (replaces Unpublish button when unpublished saves are selected) 
Works using the html page and isn't really the best way until @simtr implements Delete.json&Mode=Publish or something
 2015-01-10 18:18:28 -05:00
jacob1
1a50217acd better fix for thumbnails getting mixed up (static int instead of rand), fixes #96 2015-01-10 15:45:35 -05:00
jacob1
65a31bb1d1 more "thread safe" fix to save list refreshing problem 2015-01-10 13:43:15 -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
jacob1
c325543402 refresh save list after unpublishing a group of them, fixes #238 2015-01-10 12:39:19 -05:00
jacob1
4a3a6dee30 improve .desktop file installed on linux 
escape Exec properly so paths with spaces or quotes work, and add Path key so that it starts in the right working directory
 2015-01-10 00:14:38 -05:00
jacob1
6eedc7a7a6 new linux icon: 48x48 (really displayed at 44x36) instead of 16x16 
really it's the same icon, it's also not the best, but the best I could make it look
 2015-01-09 22:40:48 -05:00
jacob1
0ad225d1fc update VIBR randoms, fix any VINE in old saves also 2015-01-07 19:32:49 -05:00
jacob1
be6551ceea fixes to rndstore in VIBR/VIRS, remove goto in PROT 2015-01-07 19:04:11 -05:00
Martin Ettl
34c85c262c Fix potential memory leaks. 
(Merging pull request #234, amended by jacksonmj: some leaks already fixed in develop branch.)
 2014-12-29 16:37:04 +00:00
Martin Ettl
93eb934322 Fix potential memory leak in src/Format.cpp 
(Merging pull request #233)
 2014-12-29 16:36:58 +00: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
jacksonmj
3ea2d8013d Correct page count in save browser 2014-12-22 01:33:55 +00:00
jacob1
3b09c4bdbc change tooltips for the save upload button to make it more clear 2014-12-18 19:54:48 -05:00
jacob1
0f583f3bd8 fix PLSM spawning in fusion (allow some stacking), GRVT in O2 fusion 2014-12-15 15:52:08 -05:00
jacob1
35782fdd10 'l' always loads last save from disk (won't load cached deleted save) 2014-12-15 15:13:37 -05:00
cracker64
6410171bd5 Fix IRON rust 
Fix some randoms
 2014-12-06 16:23:45 -05:00
cracker64
a115e78952 More element optimizations! 
ACEL, changed a range check
DRAY, Fixed repetitive checking
GOLD, less rand()
PLNT, removed range checks, less rand()
PROT, used a switch()
VIBR, less rand()
VINE, less rand(), fixed growing along WOOD
VIRS, less rand()
 2014-12-06 15:43:11 -05:00
cracker64
783b2c1736 Stop PIPE graphics from creating a particle every frame. 
Remove temperature setting, this feature is beyond useless now, PROP+Lua are better ways to manually set pipe.
 2014-12-06 01:16:04 -05:00
jacob1
9fdcc28dac make close icon match the color of the button/text around it 2014-12-04 18:17:44 -05:00
jacksonmj
e25fac5037 Less layering of particles in fusion 
Fixes http://tpt.io/~1683916 - PLSM was created on top of DMND, which other particles then displaced, leading to lots of stacking and particles escaping through the DMND.
 2014-11-30 17:22:56 +00:00
jacob1
70a815a8c7 fix crash when PIPE finds PRTI with an invalid channel 2014-11-29 00:30:05 -05:00
jacob1
6da5b08fd2 fix for fast particles moving through VOID 2014-11-22 13:04:04 -05:00
jacob1
aa8fe86735 fix DEUT graphics (accidentally changed something) 2014-11-21 16:40:46 -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
e20f6b101b jacksonmj: "Allow ELEC to pass through GLOW, fixes ELEC->PHOT reaction in GLOW." f162984e22e5 + some parts of "Misc small fixes" 95cf5bd67c2b 2014-11-21 15:41:22 -05:00
jacob1
a182e925fe some elementpallete fixes + fix SPAWN2 ToolButton 2014-11-20 22:44:02 -05:00
jacob1
6ce2d5fe92 #define MAX_FIGHTERS + some fixes 2014-11-20 22:11:20 -05:00
jacob1
c9cc2a1a6b more accurate elementCount (part_change_type, pasting stamps, lua), prevent having multiple STKM / SPWN even more 2014-11-20 21:51:45 -05:00
jacob1
6066ae8341 prevent having multiple stickmen on the screen, also add playerst.spawnID 2014-11-20 18:51:33 -05:00
jacob1
8233b28820 Change GRVT flammability to 0 2014-11-19 22:49:20 -05:00
jacob1
c673f30e14 fixes suggested by jacksonmj in -dev 
fixes bugs in DMG, LIGH, PHOT, and QRTZ, also makes deut explosions less laggy when they hit the particle limit
 2014-11-14 12:48:06 -05:00
jacob1
1289465a2c update stamps.def when deleting stamps, missing stamps show up as "error loading save" and can be deleted 2014-11-11 23:48:36 -05:00
jacob1
cd9fa0c85a Textbox in the stamp browser also 2014-11-11 19:38:29 -05:00
jacob1
efaa32363f page textbox in browser (go to any page) 
also fix page count (add one for front page), and make page count invisible until the saves actually load
 2014-11-11 17:25:50 -05:00
jacksonmj
b3b852249b Deco off (except black deco) for LCRY in save thumbnails 2014-11-09 21:33:08 +00:00
jacksonmj
beff8e73ba Fix renderer compiling 2014-11-09 21:32:06 +00:00
jacob1
a31f4df0a1 fix being unable to draw METL/PSCN/INST ctype on CRAY 2014-11-07 12:28:49 -05:00
jacob1
46eda12479 lua logs fade out individually 2014-11-06 20:24:42 -05:00
jacob1
a801f0a0b4 allow lua mousepress event to cancel drawing, fixes #229 2014-11-06 20:06:45 -05:00
jacob1
5bb1d484d0 fix crash when taking screenshot, fixes #193 2014-11-05 20:40:09 -05:00
jacksonmj
1eeed277a0 Fix initialisation of transitionOccurred 2014-11-06 00:46:15 +00:00
jacksonmj
829e2cca7d Flatter surface when liquids solidify 2014-11-06 00:32:25 +00:00
jacob1
43bab359db fixes to ELEC (missed from 6dc7eaf43e), FUSE (changed in 27e3e12518), and IRON (changed in 0d70547cf0) 2014-11-05 19:15:57 -05:00
jacksonmj
66a530f5a3 FRZZ and FRZW changes/fixes 
Fix FRZW low temperature transition (accidentally turned into a high temperature transition in b661418d).
FRZZ now melts into FRZW, so that single pixels "form ice that always cools" as in FRZZ description.
ICE update function: was meant to be checking not setting parts[i].ctype. However, turning FRZZ into self-cooling ice seems a logical thing to do, so set ctype of parts[r>>8].ctype, and make all types of ice cause this reaction (not just ICE(FRZW) as was apparently the original intention of the ctype check).
 2014-11-05 23:38:22 +00:00
jacksonmj
9e7ead9bcc Change melting point for snow with wrong ctype back to 273.15 2014-11-05 23:32:49 +00:00
jacksonmj
fb796c873b PSTN: allow movement amount to be set by temperature. Requires major version increment. 2014-11-04 15:38:41 +00:00
jacksonmj
57409b0b41 Change order in which particles are created by the rectangle and brush tools 
to make liquid movement look less weird in normal gravity
 2014-11-01 15:38:39 +00:00
jacob1
377a99294f this should allow you to place the zoom window while selecting an area to stamp 2014-10-31 14:09:02 -04:00
jacob1
5654425637 placing zoom window cancels shift-lines 2014-10-31 12:47:37 -04:00
jacksonmj
02e1969ef2 Fix SNOW(WATR) melting temperature 
Broken by fixing SNOW(SLTW) melting temperature in a78bd78bfc
 2014-10-31 16:39:30 +00:00
jacob1
2fc1dcbe29 fix bug with placing zoom window while saving a stamp 2014-10-31 12:17:33 -04:00
jacksonmj
f7b53d0231 Prevent fast particles from skipping over DESTROYALL wall 2014-10-27 17:50:58 +00:00
jacob1
ca0eecee80 pavg0 / pavg1 properties can be set through the console and prop 2014-10-26 18:11:46 -04:00
jacob1
7582acfb5c add sim.photons (like sim.pmap but for photons), sim.(part)neighbors also checks photons, fix sim.gravMap 2014-10-26 16:52:42 -04:00
jacob1
12f00db240 loop edge mode from my mod (also works with stickmen) 2014-10-24 00:18:51 -04:00
jacob1
6463d04f6c fix a few of the most spammy warnings (there are still hundreds of warnings though) 
TODO: actually fix all the warnings
 2014-10-23 00:42:13 -04:00
jacob1
16522056fb fix bug where !set arguments would be cast to float then back to int 2014-10-08 00:35:50 -04:00
jacob1
c16caed5dd fix level 1 msvc compiling warnings + initialize debugFlags 2014-10-08 00:15:51 -04:00
jacksonmj
a78bd78bfc Fix SNOW(SLTW) melting temperature, and change ACID hardness value to make more sense on the wiki 2014-10-06 12:57:32 +01:00
jacksonmj
74dcd4074e Merge branch 'develop' of github.com:simtr/The-Powder-Toy into develop 2014-09-28 14:34:44 +01: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
6beafc354d fix "open data folder" on windows 2014-09-23 17:06:52 -04:00
jacob1
a78129adb9 Fix spelling mistake 2014-09-08 16:06:12 -04:00
jacksonmj
ba31457701 No black BIZR except by deco 2014-09-02 19:20:57 +01:00
jacob1
84f3f3cdba Update version number (90.1.320 -> 90.2.322) 2014-08-30 21:33:31 -04:00
jacob1
e91a7f1ec4 prevent setting invalid element numbers in the old console 2014-08-29 18:11:00 -04:00
jacob1
2140beb9cc make sure soap doesn't crash when messed with in the console 2014-08-25 19:05:32 -04:00
jacob1
b20db5fb8a add a no install check define 2014-08-25 14:55:18 -04:00
jacob1
a3d594c603 command key can be used instead of ctrl on OS X 2014-08-24 00:43:52 -04:00
jacob1
d29c2cb2a5 fix tags button being too long 2014-08-23 20:05:01 -04:00
jacob1
925ff1da3c add lua5.2 support for no particular reason 2014-08-22 01:25:34 -04:00
jacob1
f8782338d7 make tpt.selected* and tpt.brushx/y writable (replaces simstate branch) 2014-08-19 02:01:31 -04:00
jacob1
5ab1aa6989 fix RPEL internal name 2014-08-15 21:52:17 -04:00
jacob1
1314567c13 fix DRAY 2014-08-15 20:19:30 -04:00
Simon Robertshaw
08dcc19cc7 Update version number -> v90.1.320 2014-08-15 23:21:08 +01:00
Simon Robertshaw
0d617ace7b Decorate thread entry points in headers 2014-08-15 22:50:28 +01:00
Simon Robertshaw
fc787cee9a Include Config.h in Task.cpp for windows threading fix 2014-08-15 21:50:31 +01:00
Simon Robertshaw
8eedaf9e26 Fix Config.h syntax error from previous commit 2014-08-15 21:43:29 +01:00
Simon Robertshaw
a629eb9bfc Force stack re-alignment for entry-points from phread_create with mingw & windows to fix SSE crashes in child threads 2014-08-15 21:42:33 +01:00
jacob1
7e9c507e64 fix memory leak 2014-08-15 12:15:13 -04:00
jacob1
2416a9b454 fix being unable to click link signs unless zoom window is out 2014-08-15 11:53:18 -04:00
jacob1
ae886048f4 Disable fullscreen on OS X 2014-08-11 22:39:03 -04:00
jacob1
d4359184f2 improve grid drawing 2014-08-11 22:06:48 -04:00
jacob1
986b25b508 redo spark graphics, add spark render setting 2014-08-11 21:56:40 -04:00
jacob1
774fb88002 fix REPL crash (ignoring BOUNDS_CHECK for now) 2014-08-11 01:11:58 -04:00
jacob1
7740980fcc fix crash when selecting PROP from element search, fixes #209 2014-08-11 01:00:13 -04:00
Simon Robertshaw
fb49a492a1 Update version number -> v90.0.318 2014-08-10 13:44:16 +01:00
jacob1
fd550be6ae fix invalid hex number detection also 2014-08-09 00:01:24 -04:00
jacob1
e388a4bbad better float detection in old console 2014-08-08 22:18:01 -04:00
jacob1
298e0b63c3 fix bugs with previous commit using FloatType 2014-08-06 23:22:37 -04:00
jacob1
ccb3de7365 support floats in the console 
There are some strange bugs with parsing like !set type all 3.5 or !set temp all moo but they aren't too important ...
 2014-08-06 12:18:57 -04:00
jacob1
859fdece6a prevent PROT from rapidly changing portal temps 2014-08-06 11:49:57 -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
jacksonmj
c83945e281 Allow PHOT deco, in old saves only 2014-08-05 22:11:07 +01:00
jacob1
10a26002b4 Add an "Open Data Folder" button in simulation settings 2014-08-05 00:20:56 -04:00