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

2245 Commits

Author SHA1 Message Date
Mark Theng
8e0708daad fix particle debug when unpaused (#343) 2016-09-30 23:54:03 -04:00
jacob1
69d28bd7b0 Fix crash with really high speed photons, a check is needed here too 2016-09-24 10:07:53 -04:00
jacob1
2708c379a1 Update RFRG / RFGL element IDs 2016-09-10 13:12:39 -04:00
jacob1
f94b0489f5 fix formatting in RFRG and RFGL 2016-09-10 12:56:12 -04:00
cxi
6e6eb36bf5 RFRG and RFGL (#315) 2016-09-10 12:54:10 -04:00
cxi
ad4ef65cb3 Make CRAY copy its own life to particles it creates (#335) 2016-09-10 12:51:07 -04:00
jacob1
797f9357ff fix float detection in console, fixes stuff like !set type all 0.8C 2016-09-10 12:46:15 -04:00
jacob1
86fef64309 Fix potential build error, fixes #333 2016-09-04 21:53:41 -04:00
jacob1
fc451e5385 don't allow publishing E182 saves 2016-09-04 21:49:24 -04:00
jacob1
9277839f11 enable E182 in snapshots 2016-09-04 21:47:45 -04:00
jacob1
8a130aaab4 add log message when particle debugging is advanced due to unpause 2016-09-04 21:42:48 -04:00
Mark Theng
8de12d616e fix resume simulation/reload in the middle of subframe debugging (#330) 2016-09-04 21:33:33 -04:00
jacob1
2df333c99f TPT is now shown in desktop menus when installing on linux 
uses powder-48.png as icon + 3rd .desktop entry
 2016-09-04 21:27:55 -04:00
jacob1
b405674d3d minor updates to .desktop files 2016-09-04 20:17:35 -04:00
SopaXorzTaker
968116bcad Typo in BRMT's description (#319) 2016-09-04 19:47:10 -04:00
jacob1
a7d108593c convert spaces in BSON lib to tabs 2016-08-14 18:23:45 -04:00
jacob1
89e7238f3b fix invalid read in BSON.cpp when loading some kinds of invalid saves 2016-08-14 18:18:59 -04:00
jacob1
6dc1c222bc catch potential ParseExceptions when loading saves, use bson error handler to prevent exit(-5) 2016-08-14 18:18:59 -04:00
Simon Robertshaw
97a9f41ab9 Another experimental elemement, E182, some kind of nuclear fuel. 2016-08-07 21:36:32 +01:00
jacob1
cd41aac1f7 allow snapshots to still publish saves, as long as they don't use new features 2016-08-07 15:31:28 -04:00
Simon Robertshaw
b8e2113b05 Another experimental element, floats on water, supports other structures 2016-08-07 16:15:30 +01:00
Simon Robertshaw
4a3f3e763c Rename experimental element 2016-08-07 16:15:01 +01:00
Simon Robertshaw
86b83798f7 More graceful exit when X11 is not available on Linux 2016-08-07 13:17:17 +01:00
Simon Robertshaw
30c7c9107d Experimental element - extra high thermal conductivity 2016-08-06 17:35:06 +01:00
jacob1
9a855cc8cb fix some commas in HTTP.cpp that should be semicolons 2016-08-02 08:31:33 -04:00
jacob1
07e06efbe0 New version: 91.5 (330) 2016-07-26 22:21:28 -04:00
jacob1
8cfe2af6ca I think the word "for" made more sense before 2016-07-26 21:12:18 -04:00
cxi
e313e4bf3d Add reporting because of tags to report dialog (#316) 2016-07-26 21:10:40 -04:00
jacob1
59ac872d5f restrict saves using newer features of elements 2016-07-26 19:33:04 -04:00
jacob1
647ad902fa take ctrl+z snapshot before placing a stamp, not after 2016-07-26 19:08:57 -04:00
jacksonmj
4f8f97d04b Add control of gravity strength using tmp to WHOL 2016-07-26 23:26:37 +01:00
jacob1
6eb832207c PIPE: don't try to render stickmen graphics if stickmen are inside the pipe 2016-07-25 23:59:26 -04:00
jacksonmj
fdb539064d Prevent diffusion of stored water between GEL and SPNG if no water is stored 
Reported by camtech56 in http://tpt.io/.293650
 2016-07-26 00:59:41 +01:00
jacob1
adb200d3f7 remove commented out code, heart icon shows even when element is selected 2016-07-24 22:43:54 -04:00
jacob1
8efe8853de allow favoriting / ctrl+alt selecting elements in element search ui 2016-07-24 22:31:31 -04:00
jacob1
ae247a2d2b Fix uglyness with how Favorites menu was done 2016-07-24 22:30:56 -04:00
jacob1
fe4653c30e Fix crash when BuildMenus() is run with elements in the favorites menu 2016-07-24 17:30:00 -04:00
jacob1
9cae1f0fe7 HTTP.cpp: parsing headers shouldn't be case sensitive 2016-07-24 16:28:20 -04:00
jacksonmj
f6615deed2 Fix uninitialised variable (sim->player(2).rocketBoots) 2016-07-24 20:09:28 +01:00
jacob1
70b7fee8b7 New version: 91.4 (build 329) 2016-07-24 12:41:50 -04:00
jacob1
f0f104097d finish / fix ecb08952e5 
must have accidentally reverted Keys.h halfway through making it?
 2016-07-23 19:15:07 -04:00
jacob1
21e0c4079c Fix LIFE tool sampling 2016-07-23 15:07:49 -04:00
jacob1
0c95c33da0 reorder deco tool IDs (to match my mod for tptmp) 2016-07-23 12:34:11 -04:00
jacob1
2b15024818 allow using C/F for temperature in PROP tool 2016-07-23 12:15:49 -04:00
jacob1
8fe78eacd8 add help text to favorite's menu tooltip when the list is empty 2016-07-23 11:58:20 -04:00
jacob1
ecb08952e5 Add SDL_keysym.h, Use official SDL constants 2016-07-19 22:42:10 -04:00
jacob1
95fde9d699 MIX won't mix together elements with different states now 2016-07-18 22:01:44 -04:00
wolfy1339
b65e94900e Use C++ includes (#308) 
Replaces stdio.h, stdlib.h, string.h, math.h, time.h, limits.h and othters with their C++ equivalents.
 2016-07-17 23:37:24 -04:00
jacob1
eafd8115b0 add onlyEnabled option to tpt.num_menus (probably useless) 2016-07-17 23:36:36 -04:00
jacob1
8a0496e60a another fix for lua key events 2016-07-17 18:19:00 -04:00
jacob1
b8cdf4ae2f 3 dots doesn't need to be a separate icon (running low on icon space) 2016-07-17 17:13:52 -04:00
SopaXorzTaker
17398dd201 RPEL's ctype sets the element it repels 2016-07-17 16:47:43 -04:00
Simon Robertshaw
85bdeae694 Merge branch 'master' of https://github.com/simtr/The-Powder-Toy 2016-07-17 21:34:29 +01:00
Simon Robertshaw
3b106b7c22 Crash fix for wall drawing when OpenGL is enabled. 2016-07-17 21:33:54 +01:00
cxi1
0c972469b8 Improve consistency of error messages, use InformationMessage instead of ErrorMessage 2016-07-17 16:27:13 -04:00
jacob1
4ec4b32021 Add font editor from my mod, add two new icons for favorites menu 2016-07-16 21:10:03 -04:00
jacob1
443c81e67a extra sanity check (was needed in my mod) 2016-07-16 00:50:09 -04:00
jacksonmj
57a3121a51 Limit MERC tmp to valid range 
This preents "anti-mercury" (negative tmp from console) and also
slightly reduces how overpowered it can be in walls (enormous positive
tmp from console).
 2016-07-16 01:16:04 +01:00
jacob1
bc1dd6748c Fix double screen mode fail 2016-07-13 00:15:57 -04:00
cxi
7251f645e4 Increase speed of MIX tool and make it work with liquids (#306) 
* Make MIX tool work with liquids and gases
 2016-07-12 23:34:08 -04:00
Simon Robertshaw
5b525852b4 More OS X compatibility fixes with OpenGL 2016-07-12 22:34:31 +01:00
Simon Robertshaw
6cfaeb9c5c OpenGL UI fixes for on OS X/all platforms 
- Reinitialise textures after SDL_SetVideoMode
 - Fix header includes and remove GLEW setup on OSX
 2016-07-12 21:31:29 +01:00
Simon Robertshaw
b66ca770da Performance optimisation for blitting loops and depth3d 2016-07-12 19:48:58 +01:00
jacob1
8146598967 fix blank screen when hitting "Cancel" on double screen dialog 2016-07-10 17:38:19 -04:00
jacob1
a3865c8f49 remove debugging stuff 2016-07-09 19:07:03 -04:00
jacob1
16b93083d4 Changes to support starcatcher build server with updates 
Cherry-picked from 3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
3ddaec7b2a
 2016-07-09 19:00:54 -04:00
jacob1
b75c8318e4 add tpt.num_menus and tpt.menu_enabled functions 2016-07-08 20:33:01 -04:00
jacob1
88097496af Allow hiding menusections 
Cherry-picked from 75437c7d4c
 2016-07-08 19:58:21 -04:00
jacob1
111468c672 Fix not being able to turn off FIND tool when a life element is selected 2016-07-08 19:41:55 -04:00
jacob1
e68dd74b68 less scary report message 2016-07-03 12:51:40 -04:00
jacob1
ecddfcbc0d don't reset edge mode when saving local saves 2016-06-30 08:16:53 -04:00
jacob1
dfdee7afeb delete UTF-8 BOMs 2016-06-25 12:16:40 -04:00
jacob1
4190946de5 fix warning+exit crash, fix menusection offset resetting when menus are rebuilt 2016-06-25 11:56:03 -04:00
Matthew Miller
083d488566 Added a favorites menu. (#298) 
Added a favorites menu.
 2016-06-25 11:55:18 -04:00
jacob1
9a18338476 remove debugging thing 2016-06-11 23:50:46 -04:00
jacob1
2a541bd2f5 fix for lua keydown events, send 'j' when ctrl+somekey is pressed, not ^J 2016-06-11 15:54:19 -04:00
jacob1
7e4924e7ab windows pthread_t is uncooperative, just check this instead 2016-06-11 13:08:27 -04:00
jacob1
5b5390f822 attempted error fix 2016-06-11 12:57:13 -04:00
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
0af4b54bc3 extra NULL check 
It is undefined behavior what happens when you try to call pthread_join on a NULL thread (which will happen if you close the game before opening the save browser). Seems to be harmless, but make sure we don't do that just in case --jacob1
 2016-06-11 10:46:59 -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
SopaXorzTaker
fbd75c6293 This effect is called "3D anaglyph" (#292) 2016-05-26 18:48:18 -04:00
jacob1
ce55c8e58b Fix --opengl-render option. Please NEVER use this option though 2016-05-14 09:44:49 -04:00
jacob1
63ac47a270 update .life properly when using particle debug shortcuts 2016-04-30 10:50:48 -04:00
jacob1
64f81000cd Fix typo 2016-04-27 00:00:28 -04:00
jacob1
a8427ef33a only use -Wno-unused-result on Linux, also actually fix the unused results that we could possibly care about 
Fixes cross compilers, TODO: I don't think scons can check if a flag exists but might support adding a test for that, even if through hacky means, like CheckFramework
 2016-04-26 23:55:14 -04:00
jacob1
6624550dc1 fix a ton of build server warnings (they were all the same) 2016-04-26 23:28:52 -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
jacob1
57be4ef498 'character' is always 0 in sdl keyup event, so just send 'key' instead to lua keyup events 2016-04-26 22:42:57 -04:00
jacob1
6b6bd67a9f extra debugging thing for visual studio 
I think this prevents random "exited with code 3" errors, but I can't remember ...
 2016-04-23 11:39:06 -04:00
jacob1
5cab8f45f2 Fix 'n' toggle also resetting air 2016-04-23 11:39:06 -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
1171c308e1 Fix warnings, fix crash when ctrl+click opening a save 2016-04-02 20:47:50 -04: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
21e3a50096 91.3.328 2016-04-02 00:44:38 -04:00
jacob1
623d9ca4b9 save double scale mode setting on exit 2016-04-02 00:39:51 -04:00
jacob1
51ff868935 use user-set edge mode when saving powder.pref, not the one from the open save 2016-04-02 00:25:05 -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
aa99258101 more cleanup so that 3D can stay a more permanent thing 2016-04-02 00:10:15 -04:00
jacob1
30e82851bc Fixes to 3D mode (mostly fixes it on OS X) 2016-04-01 22:06:21 -04:00
jacob1
4c066cd7a7 another blind compile fix 2016-03-31 22:50:03 -04:00
jacob1
0ebe2ed2b8 add newline to the end of tpt-thread.h because windows cross compiler really hates the lack of one 2016-03-31 22:38:47 -04:00
jacob1
0fbb3bb27f fix compile error with renderer 2016-03-31 22:38:28 -04:00
jacob1
33aad70294 Version 91.2.327 (hopefully updating works) 2016-03-31 22:10:18 -04:00
jacob1
46d096206f Further improvements to overall system stability and other minor adjustments have been made to enhance the user experience 2016-03-31 22:08:04 -04:00
jacob1
535ade0ec4 InformationMessage expands like the other dialogs, "numeric" textboxes now allow negative numbers 2016-03-31 22:05:55 -04:00
jacob1
ad49bfbb82 ALL CAPS R COOL 2016-03-27 11:46:30 -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
49fac83995 New version: 91.1.325 2016-03-23 20:28:55 -04:00
jacob1
81c68c46b0 Check for beta updates even if not a beta 
The site has been updated to not send beta update information unless user is enrolled in beta updates
 2016-03-13 23:35:29 -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
1ef8b0c08b Fix progress disappearing on hover in the local save browser, fixes #287 2016-03-09 23:30:05 -05:00
jacob1
66aeb84354 disable HIGH_QUALITY_RESAMPLE when compiling debug builds for OS X 
crashes my compiler ...
 2016-03-07 21:01:33 -05:00
jacob1
16ee8711bb update version number to 91.0.324 2016-03-05 21:51:52 -05:00
jacob1
10262b87da remove PARTICLEDEBUG define and replace it with tpt.setdebug(0x8) to activate the key shortcuts 2016-02-24 22:06:43 -05:00
jacob1
983ed4eb53 use json page when publishing saves from save browser 2016-02-24 22:06:43 -05:00
jacob1
be170fe73d prevent errors being printed to stderr when opening saves 
adding a hack onto a hack
 2016-02-13 16:23:57 -05:00
jacob1
926f556bcc fix compile error 2016-01-31 22:59:29 -05:00
jacob1
36e8f6d900 show confirm dialog for double screen mode in case of false detections 2016-01-31 22:30:39 -05:00
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
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
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
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
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