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

2475 Commits

Author SHA1 Message Date
jacob1
aad8eba5df Version 92.0 
also update README, and make ctrl+a moderator only shortcut
 2017-07-23 10:58:52 -04:00
jacob1
ddce20da5b authors clipboard fix 
MergeStampAuthorInfo prevents some duplication now, don't need this
 2017-07-16 21:33:49 -04:00
jacob1
971e405462 don't add null stuff when loading old stamps without author info 2017-07-16 15:52:18 -04:00
jacob1
ad5a2a0972 tpt.parts: only prevent writing to dead particles, not reading 2017-07-16 11:43:50 -04:00
jacob1
b8ce522779 sim.signs.delete() api function 2017-07-16 10:42:53 -04:00
jacob1
6d141b0722 add new PhotonReflectWavelengths property, add reflection color for POLO 2017-07-16 00:07:32 -04:00
jacob1
08ba035a53 fix nesting checks 2017-07-15 16:27:11 -04:00
jacob1
6efedcdd33 undo authors changes on ctrl+z, prevent excessive nesting 2017-07-15 16:21:16 -04:00
jacob1
5ee10d14e4 reduce unnecessary #include dependency chains 
for example, elements no longer include Client.h or Graphics.h, and interface stuff won't include Window.h or Graphics.h unless requested
 2017-07-13 23:24:35 -04:00
jacob1
781a90a970 CAUS.cpp whitespace fixes, closes #464 2017-07-13 21:07:08 -04:00
jacob1
711d15fe0c fix compile error, blame @moonheart08 2017-07-13 21:02:23 -04:00
moonheart08
a76afb0bfc Add the ability to make POLO from acceleration (#477) 
tmp value of 310+ results in POLO.
 2017-07-13 20:58:18 -04:00
QuanTech0
1ff280acb2 another typo fix... 2017-07-13 20:56:51 -04:00
jacob1
f3a7d966d2 potential fix in sim.partCreate, also 2017-07-13 20:55:03 -04:00
LBPHacker
7dd538b82c Fix tpt.parts being unsafe 
`tpt.parts` does check whether the particle ID it gets is valid, but it doesn't check whether that particle ID is used. One could potentially modify the life property of dead particles to break the linked list of free particle IDs, thus potentially gaining the ability to read from or write to arbitrary addresses in memory.
 2017-07-13 20:33:46 -04:00
jacob1
8e5b0c760e Add logging inside saves which remembers which other saves material was taken from 
The logging is saved inside the bson data in all online saves, local saves, stamps, and clipboard pieces. It is loaded back when reloading each of those.

See #474 for the format of the data. It is the same format for the bson data. Note that "links" is an array of objects. It can be recursive.

There is some effort to not duplicate information, we don't care if you loaded a stamp 10 times or if you are using the clipboard in your own save. Extra information is mostly not saved for your own stuff, only when you take material from other saves.

Press ctrl+a in debug builds to show what info it is currently saving in Client. Also enabled in snapshots for now.

There is one unrelated change in here, which fixes a crash pointed out by QuanTech. It was also save related and it was too close to the other changes to separate it into another commit. It fixes a crash when saving signs with invalid unicode. the BSON library doesn't like this, it was returning an error but we ignored it, which caused a crash. It now notices those errors. I also had to update several Serialize calls to check if it actually returned save data, or else it then would have started crashing there instead.
Also some debug prints were removed
 2017-07-13 00:19:35 -04:00
jacob1
be6ac1d91e workaround for incorrect 404 save 2017-07-01 21:38:57 -04:00
jacob1
057435baa6 Differentiate between created date / updated date in save preview 
still only shows most recent date, this just changes the text
 2017-06-30 21:21:09 -04:00
jacob1
d0f1024f95 add BCOL + NEUT -> SAWD, closes #471 and #472 2017-06-30 20:10:15 -04:00
My main account
284e653aa5 Convert another if-elseif block to switch (#465) 2017-06-30 20:01:12 -04:00
QuanTech0
d0feba6445 Temp. displayed using {aheat} not in celsius 
Since it is displayed in celsius for {t}, shouldn't it be for {aheat} too? Just a consistency thing.
 2017-06-30 19:55:38 -04:00
jacob1
fb08400552 add PROP_LIFE_DEC back to GLOW, fixes #466 2017-06-22 22:50:20 -04:00
jacob1
2e4617c956 GAS+CAUS+pressure = RFRG, move HEAC to solids 2017-06-18 23:32:25 -04:00
My main account
5de384cfbc Fix CRAY creating FILT 2017-06-18 21:49:47 -04:00
iczero
3336209527 Fix STOR modded element processing 
fixes #460, again
 2017-06-18 09:02:20 -04:00
jacob1
67b87b1dab palette now used for default elements again, with some fixes 
palette now used in VIRS, fixes #460
 2017-06-18 00:08:41 -04:00
jacob1
c1e91260eb fix deco colors being 1 R/G/B value less than they should be 
The proper way would be to divide by 255, but that is slower than >>8. This is a better approximation (or perhaps equivalent?)
 2017-06-17 21:02:52 -04:00
iczero
42b8f52611 Add type for POLO, closes #458 2017-06-17 20:34:57 -04:00
jacob1
714ee8ff65 clear redoHistory memory on exit 2017-06-14 00:16:44 -04:00
jacob1
4214f85599 HEAC now checks for heat insulators 
Also testing c++ stuff, maybe reuse this function for GOLD later
 2017-06-14 00:04:44 -04:00
jacob1
d8edb3c2e0 make sure STKM / other particle graphics aren't drawn over the menus 2017-06-13 10:00:35 -04:00
jacob1
694bc6a9cb new reaction suggested by Skylark: RFRG+NEUT=GAS/CAUS 2017-06-11 23:07:52 -04:00
jacob1
32d834c351 fix VIBR asymmetric heat releasing, fixes #424 2017-06-11 22:47:05 -04:00
jacob1
510c33a986 fix BOMB issue from previous commit that deletes particle #0 
also, code cleanup
 2017-06-11 22:22:30 -04:00
jacob1
5ac66bda75 BOMB: use kill_part instead of delete_part, fixes #432 
this was the only element to use delete_part. Only brush drawing should ever use delete_part
 2017-06-11 22:08:30 -04:00
jacob1
d4a0ff9ac8 draw_image can now draw images with x<0, fixes #433 
this isn't used at all in the source
 2017-06-11 22:01:11 -04:00
jacob1
0ea5c1d0e0 Fix #438 
I didn't actually notice any difference with this change
 2017-06-11 21:26:42 -04:00
jacob1
1718fe9287 HEAC is now meltable via LIGH, fix HEAC hardness, fixes #441 2017-06-11 21:10:19 -04:00
jacob1
fb2431d99e replace some if-else with switch statements, code formatting, closes #444 2017-06-11 20:39:23 -04:00
jacob1
81259c5d11 remove PROP_LIFE_DEC from some elements that don't need it, closes #447 2017-06-11 11:29:42 -04:00
LBPHacker
2c0468ef2e Sign justification is now called pointer alignment 2017-06-09 23:58:06 -04:00
cppxor2arr
12d2af7925 Removed unnecessary CleanString() function (#443) 
Two `CleanString()` functions with the only differing thing the first parameter (`const char*` vs `std::string`); removed the one with `const char*` since `std::string` can be constructed with `const char*`.
 2017-06-09 23:57:12 -04:00
jacob1
3d9d57e0ff don't allow loging in using email as username 
(actually, just don't allow @ in usernames)
 2017-06-09 23:54:43 -04:00
jacob1
25b3244d6c add warning messages when certain words are found in comments 2017-06-09 22:19:54 -04:00
jacob1
4242e38968 update LSNS description + default temp 2017-06-04 21:56:12 -04:00
jacob1
1cb3917fcc Fix comment 2017-06-04 21:33:45 -04:00
jacob1
d73586c566 POLO fix (I can't count) 2017-06-04 19:46:59 -04:00
jacob1
2dbdc3109b new element description updates 2017-06-04 18:29:35 -04:00
jacob1
572e432045 update snapshot save restriction code 2017-06-04 18:10:07 -04:00
jacob1
35ce9570d6 make Mrprocom's name blue 2017-06-04 17:48:31 -04:00
jacob1
48a95ac5d5 more POLO fixes 2017-06-04 17:26:56 -04:00
jacob1
53bb1f4802 file renaming / deletion, code cleanup 2017-06-04 17:26:56 -04:00
moonheart08
649133ff41 Removed unneeded comments 2017-06-04 17:26:56 -04:00
moonheart08
94eb0a8ec2 Replace E182 with a real, functional element. 
Implemented Polonium!
 2017-06-04 17:26:56 -04:00
jacob1
1fb883a450 replace E181 with SAWD (sawdust), created by hitting WOOD with high velocity particles 2017-06-04 14:50:14 -04:00
jacob1
06b2631f8d rename E180 to HEAC (rapid heat conductor), now affects photons, code formatting 2017-06-04 12:56:25 -04:00
jacob1
fb1622da41 minor bugfix, this is a test 
TESTING 123
 2017-06-03 18:11:17 -04:00
jacob1
9bc19d9933 fix elementRecount parenthesis 2017-05-10 00:11:53 -04:00
jacob1
f54189a97f fix PHOT/PLSM not following the correct heat scale, fixes #336 
Still many issues if you manually add on other effects to heat mode, but at least now the default graphics are fine
 2017-05-09 22:43:53 -04:00
jacob1
ec417095b9 add sim.TOOL_MIX, fixes #414 2017-05-09 21:59:15 -04:00
jacob1
b0f3b2a36b Fix QRTZ killing life=0 PHOT, fixes #415 2017-05-09 21:56:01 -04:00
jacob1
b9c658ae20 elements are only recounted when unpaused, apparently 2017-05-09 21:52:40 -04:00
jacob1
2d7934bca6 fix elementRecount never being reset to false, fixes #417 2017-05-09 21:49:54 -04:00
jacob1
8830120479 use part_change_type in legacy fire update, closes #418 2017-05-09 21:45:42 -04:00
jacob1
0f40db4ef9 proper ctrl+backspace support 2017-05-08 23:45:18 -04:00
jacob1
abf60508cd fix ambient heat being reset when creating saves 2017-05-06 23:57:27 -04:00
LBPHacker
e1d8e814a5 Restrict type check to type field 2017-05-06 20:45:50 -04:00
LBPHacker
e15bfac60f Moving conditional branches around 2017-05-06 20:45:50 -04:00
jacob1
ce054bfc3f fix misc. errors reported by clang static analyzer 2017-05-06 20:02:23 -04:00
jacob1
9b954c7ed5 CRAY(LIGH) defaults to LIGH with .life 30 2017-05-06 19:40:22 -04:00
jacob1
cdc8f64896 fix clang compile warnings, fixes #406 
also, sim.ambientAirTemp takes floats now
 2017-04-27 23:08:06 -04:00
jacob1
8d492ef549 meant to move those functions into GameSave class 2017-04-25 00:05:15 -04:00
jacob1
5ce60b5f5f clean up massive repeated code in GameSave.cpp 2017-04-24 23:59:47 -04:00
jacob1
c98f63bd89 save ambient heat in saves, if it is enabled 2017-04-24 22:29:45 -04:00
jacob1
184777ed12 GameSave.cpp 2D array cleanup 2017-04-23 22:44:31 -04:00
jacob1
ddd326eafd fix LSNS 2017-04-23 12:51:40 -04:00
jacob1
6d6a615a37 msvc min/max fixes 2017-04-23 12:30:39 -04:00
Tamás Bálint Misius
0fe596f741 Make RFGL and RFRG a bit more realistic (#366) 
* Make RFGL and RFRG a bit more realistic.

This means that they both more or less follow Gay-Lussac's law: T2 = T1 * P2 / P1. Simple heat transer mechanism, no playing around with .life, shared update function.

* Ditch weird pressure scale

* No /0 pls
 2017-04-23 11:25:42 -04:00
jacob1
40972f9434 pressure and air velocity are now saved in saves 2017-04-22 17:06:28 -04:00
jacob1
0dd1cbf050 Add C5 to phot HUD list, fixes #401 2017-04-21 20:32:12 -04:00
jacob1
866289c179 remove duplicate function, fix Simulation::GetParticleType, fixes #402 2017-04-21 20:24:24 -04:00
jacob1
01d17cb860 remove unused PSTN code (is this a sign of a bug?) 2017-04-20 21:16:25 -04:00
Nickolay
7078d7e528 Customizable FRAY and INVS (#390) 2017-04-20 17:37:09 -04:00
LBPHacker
3fbfb83b0e Fix cache value from Lua graphics functions being ignored 2017-04-17 23:46:03 -04:00
jacob1
e712a8dbec make last 3 arguments to sim.brush optional, for convenience 2017-04-17 23:28:12 -04:00
LBPHacker
e9d80fe52a sizeof(unsigned char) 2017-04-17 23:28:12 -04:00
LBPHacker
5cf3fa3f5b More parameters for sim.brush 2017-04-17 23:28:12 -04:00
krawthekrow
c2642f35f8 fix FRME breaking when partially blocked 2017-04-17 22:58:11 -04:00
krawthekrow
446d4412ea fix pstn oddity 2017-04-17 22:58:11 -04:00
jacob1
076ec711a9 fix photon refraction on windows 2017-04-16 21:41:50 -04:00
jacob1
cf03731dc3 Skylark: make GRAV prettier 2017-04-11 23:15:23 -04:00
jacob1
d3f0896599 Changes by Skylark: 
Double the preciseness of photon refracting
photon refracting efficiency improvement on GCC
CRMC now slightly scatters photons when reflecting
BGLA now scatters photons
PQRT scatters photons like QRTZ does
C5 frequency doubling, id:2087410
*slight styling changes by jacob1*
 2017-04-11 23:15:01 -04:00
jacob1
bcebe7560e fix typo in Air.cpp 2017-04-10 23:30:56 -04:00
jacob1
1af4fa912f fix debug portal lines to the highest ID particle not working, fixes #393 2017-04-08 09:54:45 -04:00
Me4502
bda17dd62e Fixed favorites being able to be added multiple times. 2017-04-08 09:51:50 -04:00
LBPHacker
804b33f389 Fix WIFI cooldown 
For some reason WIFI would only add sparks to the spark queue
(sim->wireless[1]) if there was no spark added to it in the previous
frame (sim->wireless[0] in the current frame). Fixed.
 2017-03-20 23:04:28 -04:00
LBPHacker
becd92bfc2 Fix downvote button not being reset when opening a local save 2017-03-19 23:16:39 -04:00
Mark Theng
1c12d1ec16 Take history snapshot before setting save (#358) 2017-03-19 23:15:08 -04:00
Capacitor Set
2d4c195c86 Fix memory leaks 2017-03-19 23:05:39 -04:00
jacob1
0832caa4f9 fix typo, gasses -> gases 2017-03-18 00:35:33 -04:00
jacob1
287d5f9534 minor text fixes 2017-03-05 10:56:11 -05:00
jacob1
83657e8773 disable experimental elements in mods, intro text fix for mods 2017-03-04 23:54:03 -05:00
jacob1
cd448a5747 fix Misc.cpp file_load (this function isn't used anywhere) 2017-02-27 22:28:03 -05:00
jacob1
d5347b0906 Fix test error 2017-02-26 14:02:38 -05:00
jacob1
b01e7a6a36 put #ifdef around denormal functions, they only exist when using SSE/SSE3 2017-02-20 19:15:41 -05:00
jacob1
ca792f12b5 misc compiler warning fixes (multiple compilers) 2017-02-20 19:14:50 -05:00
Issue tracking bot
d9115fc3fe Fix -Werror=misleading-indentation (#369) 2017-02-20 18:51:10 -05:00
jacob1
ac8c01ae57 ensure floating point denormals aren't used, they can massively lag the air sim 2017-02-19 19:29:41 -05:00
jacob1
08a7dfebea move undohistorylimit config pref, change default to 5 2017-02-18 23:58:14 -05:00
jacob1
61e19a3237 fix crash when undoing if there were no snapshots 2017-02-18 23:41:52 -05:00
jacob1
51eeaf218d fix crash when doing Textbox.new() 2017-02-13 17:43:48 -05:00
jacob1
6040ccd27e ugly fix for two empty snapshots being created on startup 2017-02-09 23:08:44 -05:00
jacob1
787939db3d add ctrl+shift+z alternate shortcut for redo 2017-02-09 22:57:31 -05:00
jacob1
8f4e3a56bd reduce ctrl+z snapshot memory usage 2017-02-09 22:55:05 -05:00
jacob1
a1431b6d2b Fix memory leak 2016-11-14 10:19:49 -05:00
jacob1
389159728c Configurable undo history 
Note: Each undo adds 16.7 MB of RAM usage, max is 200 (3.4GB), but don't set it to this
 2016-11-14 10:03:09 -05:00
jacob1
25a2d9b5b5 some modifications to ctrl+z/ctrl+y 
allows infinite undoing / redoing, improvements when history limit is greater than one
 2016-11-14 10:03:09 -05:00
krawthekrow
95d2014724 allow redo with Ctrl-Y 2016-11-14 10:03:08 -05:00
krawthekrow
63b2227802 add ctype-based filt shift modes (#351) 2016-11-07 18:06:43 -05:00
Tamás Bálint Misius
57f5d0f84f Add sim.brush (#350) 2016-11-07 18:00:34 -05:00
Mark Theng
3a3254f38b fix debug zeroth particle (#352) 2016-11-07 17:43:20 -05:00
krawthekrow
477d2be92c always calculate tool button offsets directly from mouse position 2016-11-07 17:39:13 -05:00
krawthekrow
f5ede49362 combine GameView DoMouseMove into OnMouseMove 2016-11-07 17:39:13 -05:00
jacob1
c1fad5ebf9 linux compiling fix 2016-10-14 09:30:29 -04:00
jacob1
9e33906858 VS 2015 compiling fixes 
note, wiki guide still doesn't work unless you also have vs2013 installed
 2016-10-13 22:32:52 -04:00
jacob1
5370f07bf0 Don't control STKM when placing stamps, fixes #320 2016-10-13 20:29:10 -04:00
Tamás Bálint Misius
4aa58d6c0c Fix crash on SPRK(ctype=0) being killed by PROT (#344) 2016-10-07 09:37:25 -04:00
cxi
ef9ef5bbce Fix bug with conservation of energy in RFGL (#338) 2016-10-01 00:19:48 -04:00
jacob1
85e2516a42 missed movement code fixes from my mod? b7ef4c8f2b95 2016-10-01 00:16:50 -04:00
jacob1
e8b4f99644 delete old comment 2016-10-01 00:04:26 -04:00
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