Commit Graph

4540 Commits

Author SHA1 Message Date
jacob1
5864c3691e Merge pull request #275 from wolfy1339/patch-2
SConscript: Fix some inconsistencies
2015-12-22 01:41:50 -05:00
wolfy1339
a6f64055a3 SConscript: Fix some inconsistencies 2015-12-21 19:26:56 -05:00
jacob1
c73d81b277 fix renderer trying to use SDL 2015-12-19 16:36:17 -05:00
jacob1
2725a32b8e Fix NTCT / PTCT / INWR triggering EMP blasts ... 2015-12-19 02:44:20 -05:00
jacob1
d92f356f8d probably fix compile error 2015-12-19 02:12:15 -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
37eb674d40 fix being unable to set floating point values in element.property
broken in e92bbac700
2015-12-18 18:21:04 -05: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
76aeef24a4 ctrl+a support in Labels 2015-12-18 00:33:40 -05:00
jacob1
762093371b fix crash from previous commit 2015-12-16 14:06:44 -05:00
jacob1
8d4e333986 Overwriting a local save now updates the reload button save, add message to confirm that local save was successful, fixes #274 2015-12-16 14:02:03 -05:00
jacob1
16e3532980 fix 'large screen' description 2015-12-15 02:27:55 -05:00
jacob1
f63c3072a4 fix crash when doing simulation = nil in the console 2015-12-11 12:05:00 -05:00
jacob1
6930d830bf shouldn't return an error in whatever case this is (reverted from commit ec99fcdf5d) 2015-12-02 11:25:24 -05:00
jacob1
ec99fcdf5d shouldn't return an error in whatever case this is 2015-12-01 01:15:30 -05:00
jacob1
5afb95dcf1 change shift+wind tool to not always act like alt was pressed 2015-11-30 19:19:50 -05:00
jacob1
9cab6959b6 fix flood fill delete on normal particles also deleting photons 2015-11-30 14:20:37 -05:00
jacob1
998f5a4cad fix infinite loop error message sometimes always coming up on startup 2015-11-29 01:59:36 -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
d1dcae5574 Only show wavelengths in HUD if there is at least one valid wavelength 2015-10-29 07:15:02 +00:00
jacob1
9a9f80fefa don't add extra newlines when downloading scripts via tpt.getscript 2015-10-23 00:18:41 -04:00
jacob1
dc679d7eb0 Add more elements to .tmp2 list, use local varibles instead of constantly accessing sample.particle.type 2015-10-22 21:39:12 -04:00
jacob1
46dc5da455 fullscreen only blocked on OS X when not using SDL 1.2.15 (untested) 2015-10-22 20:14:56 -04: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
7f50529f4b Merge pull request #271 from jBot-42/master
Show Tmp2 in the HUD for elements that use it
2015-10-18 21:43:22 -04:00
jBot-42
6ee0bc4cda remove stor and pipe 2015-10-18 18:36:22 -07:00
jBot-42
cf615c323f Show Tmp2 in HUD for elements that use it 2015-10-17 18:18:19 -07:00
jacob1
c0cdb62af1 Merge pull request #270 from SopaXorzTaker/patch-1
Also gitignore screenshot files
2015-10-17 10:32:40 -04:00
SopaXorzTaker
0514240629 Also gitignore screenshot files 2015-10-17 15:39:45 +03:00
jacob1
7fcc056cb6 fix really fast particles moving through EHOLE 2015-10-15 00:26:57 -04:00
jacksonmj
bb455ea893 Add more breaks.
Fixes tmp values being set to 0 for CRAY.
2015-10-13 10:23:19 +01:00
jacob1
31b1e6aace only require version 91.0, will add note on snapshot page about possibly breaking 2015-10-12 21:52:26 -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
59377e49e5 fix 'Prev' button placement 2015-10-11 02:05:49 -04:00
jacob1
f435cf3881 fix edge mode not loading properly in saves, options menu uses edge mode from Simulation and not GameModel 2015-10-10 18:10:17 -04:00
jacob1
a8c141c144 show more specific error when catching json exceptions 2015-10-10 17:39:47 -04:00