Commit Graph

843 Commits

Author SHA1 Message Date
jacob1
337a929cc3 A few description updates from boxmein. Closes #282
I don't think we need to add the element name for elements like ACID in the description when it is already obvious
2016-06-11 11:00:06 -04:00
SopaXorzTaker
c85ac21d84 Fix gravity field appearing after ctrl+z even if gravity is off, Fixes #293 2016-06-11 10:29:09 -04:00
jacob1
d63c6012c6 force a stacking check when undoing (id:1997880) 2016-06-11 10:21:25 -04:00
jacob1
7a18f6ec09 maybe compile fix 2016-04-26 23:22:36 -04:00
jacob1
1c15b426d5 Fix ctrl+MIX not actually doing anything, and shift+MIX being too powerful 2016-04-26 23:15:33 -04:00
Simon Robertshaw
17cdf980cb Remove commented code from MIX.cpp 2016-04-17 21:56:39 +01:00
Simon Robertshaw
e7b0e3f90d Particle/powder mixing tool 2016-04-17 21:55:08 +01:00
jacob1
0b1ffbcfd6 probably fix uninitialized thing in VIBR, might spend longer later messing with d4zk1tty's fuzzer script 2016-04-02 01:04:13 -04:00
jacob1
59d69ac8d0 revert THDR being changed to an energy particle
was causing issues that I forgot already so it is easier to just undo it
2016-04-02 00:21:13 -04:00
jacob1
40c2ff27b0 Test using DownloadManager from my mod instead of RequestBroker
The crash when opening saves on mac is definitely something to do with the threading, and i'd rather just test this first to see if it fixes it

Copied from my mod almost entirely as-is, with the changes to HTTP.cpp included, also added locks into Download.cpp even though it is probably overkill
2016-03-27 11:41:36 -04:00
jacob1
15068552b5 really fix the remainders in loop edge mode 2016-03-12 13:54:50 -05:00
jacob1
0b0c73647a don't remder AMTR as a gas 2016-03-12 13:39:54 -05:00
jacob1
3a76c1cadf fix PBCN(LIGH) 2016-03-12 13:32:12 -05:00
jacob1
ccec5fbff4 that .5f should have been ouside the remainder_p
also fix random compile warning (error?)
2016-03-12 13:24:59 -05:00
jacob1
d334209027 loop edge mode: allow particles to have velocities greater than the size of the screen
Also, added terminal velocity for stickmen
2016-03-12 13:14:34 -05:00
jacob1
13d3547211 Compiling fix for scons on windows
something is up with the pthreads library (dynamic compiles still broken), probably windows libraries all need to be recompiled and distributed separately like I did for visual studio
2016-03-12 00:36:11 -05:00
jacob1
f6d82b6f8a separate t and v argument in create_part, fix LIGH not defaulting to .life of 30 with clones / console 2016-01-11 22:38:42 -05:00
jacob1
85d89e9f87 simpler version of 9a2b7749c7 (gravity wall change)
All gravity sources are now prevented, now just the specific elements that create gravity.
2016-01-05 23:12:12 -05:00
jacob1
adf0fa72df Actually use .Properties instead of .Falldown for wall blocking 2015-12-30 23:45:05 -05:00
jacob1
8630b0a926 change CRMC creation reaction from BREL + LAVA(CLST) to LAVA(QRTZ) + LAVA(CLST)
BREL didn't make much sense, and this one is funner
2015-12-27 21:28:57 -05:00
jacob1
c76ec2be43 PHOT going through turned off GPMP turns into GRVT
GRVT .tmp depends on the GPMP temp
2015-12-26 01:24:22 -05:00
jacob1
9a2b7749c7 Newtonian Gravity sources inside of a no gravity grav wall zone no longer generate gravity 2015-12-26 01:23:53 -05:00
jacob1
2725a32b8e Fix NTCT / PTCT / INWR triggering EMP blasts ... 2015-12-19 02:44:20 -05:00
jacob1
5ba34021bc jacksonmj: Reduce ETRD lag e7c4b989654e
Improvement isn't as good as the EMP one in normal cases, but for intentional lag bomb saves it is much better. Tested it and confirmed it worked just like before this commit. etrd_life0_count is hopefully valid, the accuracy may not be as good as in jacksonmj's fork
2015-12-19 01:39:03 -05:00
jacob1
af48997228 fix mistake in EMP.cpp, add license header in Probability.cpp 2015-12-18 23:23:44 -05:00
jacob1
52a22bc7d6 jacksonmj: Move EMP triggering into SPRK_update 6ae719deb70d 2015-12-18 23:17:25 -05:00
jacob1
bb9b35f01d jacksonmj: EMP lag is hereby banished. eeef50c0fcba
EMP destruction loop now happens once per frame instead of once per EMP
particle.
2015-12-18 23:10:28 -05:00
jacob1
74b8ba8a07 fix for previous commit, make sure .ctype is valid 2015-12-18 20:05:52 -05:00
jacob1
139bdd7f4d fix STKM being unable to pick up most energy particles, or LOLZ/LOVE 2015-12-18 20:02:53 -05:00
jacksonmj
edf180b94e SPRK(ETRD): Check life value of destination before conducting
This prevents ETRD conducting to neighbours which are still in the
cooldown period after the previous spark. This is for consistency with
all other conduction rules, and to prevent behaviour being dependent
on particle order.
2015-12-18 23:39:03 +00:00
jacob1
07be209094 remove extra spacing in all the element files 2015-12-18 02:27:19 -05:00
jacob1
b9c3eeae92 Allow old lua scripts which use state to work 2015-12-18 02:07:16 -05:00
jacob1
95ab91e91d Remove .State property from all element files 2015-12-18 01:51:22 -05:00
jacob1
f1ea32516d jacksonmj: Stop using Element.State 618c4b5ce5cd 2015-12-18 01:14:31 -05:00
jacob1
bfc19d1fd7 revert pull request #258 (e308dd73bb)
Causes some issues with particle movement which was breaking some saves, and the previous commit still fixes these elements to move through gas wall instead of powder wall
2015-12-18 00:56:42 -05:00
jacob1
3226ce0ac2 jacksonmj: Always use Properties instead of Falldown to decide whether particles can pass through walls e52a62354473 2015-12-18 00:51:04 -05:00
jacob1
d2807cb28f Change AMTR and MORT to TYPE_GAS, and THDR to TYPE_ENERGY 2015-12-18 00:48:07 -05:00
jacob1
9cab6959b6 fix flood fill delete on normal particles also deleting photons 2015-11-30 14:20:37 -05:00
jacob1
5be9773eca fix another crash with invalid SOAP (soap was detached before SOAP update function ran) 2015-11-22 17:53:22 -05:00
jacob1
7a78b91f4f reformat ARAY.cpp because coding style was really hard to read 2015-11-22 00:12:10 -05:00
jacksonmj
d0cf82de03 PSTN: compatibility with old saves with non-PSTN particles layered on top of the starting PSTN particle
P.S. don't use layering, this commit is exactly why it's bad. Layering makes adding new functionality without changing existing behaviour much more difficult, and makes the code more complicated than necessary.
2015-10-22 22:39:08 +01:00
jacob1
7fcc056cb6 fix really fast particles moving through EHOLE 2015-10-15 00:26:57 -04:00
jacksonmj
d0445258c5 CONV tmp value can now be used to restrict which elements get converted. Requires version bump to 92. 2015-10-13 01:33:19 +01:00
jacksonmj
d88c18adaf Fix collision detection for liquids on top of streamlines 2015-10-13 00:49:42 +01:00
jacob1
bc112b54df initialize GoL variables, add sim.gspeed function 2015-10-10 00:03:04 -04:00
cracker64
9a65d60c6e Now with 100% less =( .
Hot FWRK less laggy.
Define more constant floats.
Pump will now work at x=4,y=4.
Revert a DEUT change
2015-10-08 12:48:56 -04:00
cracker64
3263c9437a Jacob's laziness made me do this again.
CELL checks +-1 aren't required.
Moo
2015-10-08 01:48:44 -04:00
jacob1
0a907c5177 fix bug if the first space after the DRAY was empty, fix bug with DRAY's ctype sometimes not working 2015-09-28 11:28:19 -04:00
jacob1
74471dcda4 DRAY only copies enery or non-energy particles, depending on the first one it sees 2015-09-25 13:52:59 -04:00
jacob1
a0c77fe6e8 fix it being impossible to select wall menu, add wall identifiers from my mod 2015-09-24 00:26:37 -04:00
jacob1
4594de57b0 allow DRAY to copy energy particles 2015-09-24 00:14:28 -04:00
jacob1
9b9555226b fix compiling in visual studio, fix maybe bug with updates? 2015-09-20 00:59:37 -04:00
jBot-42
146fc4d5fa Move GBMB to Force Menu 2015-09-18 15:46:53 -04:00
jacob1
5433766311 fix ETRD creating plasma as if it were created by the brush (-2) 2015-09-01 12:26:06 -04:00
jacob1
2e32fba4d9 fix GRAV and EXOT button colors
this also fixes GRAV with pretty powders on. TODO: maybe use old GRAV color cycling
2015-09-01 01:46:33 -04:00
jacob1
48dbc4182d Add CRMC from my mod 3dd3fb2f7801 92f0301295f6 2015-08-30 18:29:21 -04:00
jacob1
68b4f1efd6 MERC -> liquids, FUSE/FSEP -> explosives 2015-08-30 01:54:31 -04:00
jacob1
ed4678c9a8 add deco flood fill, flood fills based on color being close enough
flood fill brush is hidden when deco tools are selected like this because it gets in the way. Renderer::vid is compared here so there could definitely be issues, but it works fine when used under normal conditions
2015-08-30 01:38:32 -04:00
jacob1
2ebc522c36 add ERASEALL wall from my mod (erases walls, particles, and signs) 2015-08-30 00:18:06 -04:00
jacob1
12ef4ec79d ambient heat sign
maybe something that would replace all instances of {aheat} / {t} / {p} in a sign would be nice, but for now just do this.
2015-08-29 23:47:21 -04:00
jacob1
01afd69c17 STOR now automatically transfers to PRTI 2015-08-29 23:38:46 -04:00
jacob1
37794c01af .tmp2 for CRAY now sets creation offset (just like DRAY)
LIFE info moved into .ctype, no reason to use a whole extra variable for it
2015-08-29 22:02:05 -04:00
jacob1
5caf8bc8e1 allow longer signs, add 'None' justification where the pointer line isn't drawn
signs have a longer width limit and hard 45 character limit from the textbox and when loading saves
2015-08-29 18:56:38 -04:00
jacob1
3d8f871fc7 reset invalid SOAP links even when soap is frozen
fixes tpt save id:1834554
2015-08-11 22:45:29 -04:00
jacob1
e9d6519800 small improvement to 7d7bf5eff6 2015-07-07 20:22:03 -04:00
jacob1
f95db0278e really fix coordinates when placing stamps ... 2015-07-07 00:44:06 -04:00
jacob1
732e5b8730 fix some very minor memory leaks 2015-06-30 19:06:18 -04:00
jacob1
ab1226c58b fix FIRE not burning things inside of walls 2015-06-28 17:33:45 -04:00
jacob1
d67cb4b582 add new s: sign which does a save search
also change some searchController stuff to properly queue searches when one is already going on
2015-06-27 19:03:41 -04: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
8e7e8e0670 some changes to LIGH creation (mostly from lua) 2015-05-11 20:50:10 -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
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
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
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
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
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