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

4414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jacob1
aa108be3df Pass in actual character sdl saw into keypress functions 
Previously you couldn't detect what shift+somekey would do on alternate keyboard layours.
 2016-01-31 21:39:39 -05:00
jacob1
435edb23ac Merge branch 'master' of https://github.com/simtr/The-Powder-Toy 2016-01-26 05:35:33 +00:00
jacob1
1d295fbb36 OS X: check for SDL framework before SDL library 2016-01-26 05:35:16 +00:00
jacob1
28598a43be another compiler fix (include <stdexcept> manually) 2016-01-26 00:31:05 -05:00
jacob1
4e484ae2a4 compiler fixes, apparently using [] as intended is ambiguous ... 2016-01-26 00:24:14 -05:00
jacob1
ac03162cc2 remove cajun library 2016-01-25 23:53:00 -05:00
jacob1
855d735b50 replace the rest of the cajun references with jsoncpp 2016-01-25 23:52:46 -05:00
jacob1
df1a2243fd use jsoncpp for ParseServerReturn and startup check 2016-01-25 22:58:09 -05:00
jacob1
5c1cc0c0fb rewrite powder.pref handling to use jsoncpp instead of cajun 
cajun is a hard to use library with many necessary features missing. It also has been causing the windows version, and probably the mac version, to randomly crash.

Other json stuff still uses cajun (TODO: remove)
 2016-01-25 22:30:43 -05:00
jacob1
de2f5fe36d More mac compiling fixes that don't actually fix anything 2016-01-24 23:12:34 +00:00
jacob1
dfbfb459d1 Fix mac sdl compile (apparently it actually did need to run sdl-config) 2016-01-24 21:44:24 +00:00
jacob1
82257e5e39 don't run sdl-config when cross compiling for mac 
I guess it should only be run when compiling for linux or cross compiling for windows
 2016-01-24 15:54:43 -05:00
jacob1
82dc5e1f71 don't save powder.pref in a .plist file on OS X 
untested, but it didn't make sense how we were doing it anyway. Also, it was spelled wrong
 2016-01-24 15:44:13 -05:00
jacob1
a6f49adae2 look for normal SDL library before SDL framework on OS X 
before it refused to even look for the library, it only checked for the framework
 2016-01-24 15:42:37 -05:00
jacob1
3cf5395697 make jacobot / boxmein have blue nicks in save comments (hack) 2016-01-16 11:39:04 -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
d3c44dbffa fix deco color being reset to 0x00000000 when loading a lua element 2016-01-10 22:48:45 -05:00
jacob1
7073c1bf9c remove unnecessary / broken if statements 2016-01-10 22:32:18 -05:00
jacob1
226a66a860 add ctrl+f shortcut to easily locate elements in red from my mod 
doesn't support walls or better life finding because tools are much harder to work with here
 2016-01-10 22:23:06 -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
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