Commit Graph

15065 Commits (73fed1e833b6ce5d76459721d77bd08c1c3660c6)
 

Author SHA1 Message Date
Myk 0270766a6d
Merge branch 'develop' into myk_dynamic_tile 2023-02-26 09:24:04 -08:00
Myk e81a45a742
Merge pull request #2952 from myk002/myk_keep_focus
[Gui] don't prefix focus strings that are already properly marked
2023-02-26 09:23:42 -08:00
Myk bf64f1d985
Merge pull request #2948 from myk002/myk_interior_frame
Add standard interior frame to gui.lua
2023-02-26 09:23:09 -08:00
Myk ff464c4746
Merge pull request #2947 from myk002/myk_join_strings
[MiscUtils] add templated version of join_strings
2023-02-26 09:22:56 -08:00
Myk 098c538754
Merge pull request #2946 from myk002/myk_safety_first
[isSuitableMaterial] detect lack of fire and magma safety for vulnerable materials with high melting points
2023-02-26 09:22:38 -08:00
Myk da35bd07d6
Merge pull request #2953 from ab9rf/c++20-readiness
clean up code for C++20 readiness
2023-02-25 11:01:01 -08:00
Myk c7f6ee57d7
Update library/Core.cpp 2023-02-25 11:00:51 -08:00
Kelly Kinkade 0a65c423ce a squirrel distracted me 2023-02-25 04:07:24 -06:00
Kelly Kinkade 87e06cf960 deoops 2023-02-25 02:42:28 -06:00
Kelly Kinkade cfa649b4ac clean up code for C++20 readiness
two change:

* remove use of `register` in `md5.cpp`
* remove use of `using namespace std` in `Core.cpp` (which causes an ambiguous name resolution error between `byte` and `std::byte`). while there are other ways to resolve this, `using namespace std` is a code smell anyway, so eliminating it is the best option
2023-02-24 20:52:49 -06:00
Myk Taylor 49331384df
update changelog 2023-02-24 17:24:20 -08:00
Myk Taylor f1d5551e51
fix on-map character rendering 2023-02-24 17:23:01 -08:00
Myk Taylor 88516a899a
allow map interface tiles to be cleared 2023-02-24 17:22:55 -08:00
Myk Taylor ab4af88c92
update changelog 2023-02-24 17:21:38 -08:00
Myk Taylor d7d3dcb0be
keep focus strings if they are already labeled
i.e. don't add a "dfhack/" prefix if the focus string already has the
string "dfhack" in it
2023-02-24 17:20:12 -08:00
Myk Taylor 1cacc526e3
allow token.tile to be a function 2023-02-24 17:16:30 -08:00
Myk Taylor 2e53c5bc6d
update changelog 2023-02-24 17:14:27 -08:00
Myk Taylor 8b378735fa
don't fire HotkeyLabel if the label is disabled 2023-02-24 17:13:45 -08:00
Myk Taylor dafafefe11
update changelog 2023-02-24 17:11:59 -08:00
Myk Taylor 0febce5e8f
add docs 2023-02-24 17:09:11 -08:00
Myk Taylor 75b1cd748a
convert otherwise unused THIN_FRAME to INTERIOR_FRAME
without a signature
2023-02-24 17:07:57 -08:00
Myk Taylor a684f294c5
add templated version of join_strings 2023-02-24 17:05:08 -08:00
Myk Taylor 472cab846f
move changelog entry to next version 2023-02-24 16:58:17 -08:00
Myk Taylor 30ea58374c
better detection of fire and magma safety 2023-02-24 16:57:44 -08:00
Myk 816371ca69
Merge pull request #2945 from cppcooper/channel-safely
Fix out-of-bounds error in Channel safely
2023-02-24 15:58:57 -08:00
Myk ddd0c7b644
Merge branch 'develop' into channel-safely 2023-02-24 15:54:12 -08:00
Josh Cooper 4813a15b35 Updates changelog 2023-02-24 15:51:23 -08:00
Josh Cooper 00eb02c1bc Implements plugin: channel-safely v1.2.4
- changes report* lookup in `NewReportEvent()`
  - adds a nullptr check
- adds df::coord bound checking in various places
  - where the `get_*neighbours()` functions are used
  - `simulate_fall()`
  - `is_safe_to_dig_down()` and `is_safe_fall()`
- adds nullptr checks to the `is_*job()` functions
- added todo comments for `is_safe_to_dig_down()`
2023-02-24 15:51:11 -08:00
Myk Taylor 4bf0849d51
fix usage of squad equipment vector 2023-02-24 15:50:56 -08:00
Myk Taylor b8fdc985ec
bump version and changelog to 50.07-alpha2 2023-02-24 15:41:54 -08:00
DFHack-Urist via GitHub Actions f84299bc46 Auto-update submodules
library/xml: master
2023-02-24 23:31:20 +00:00
Myk Taylor f922be8769
fix more autolabor chattiness 2023-02-24 13:25:04 -08:00
Myk 85ac04032a
Merge pull request #2944 from myk002/myk_dig_now_revert
revert recent changes to dig-now due to lockups
2023-02-24 12:48:23 -08:00
Myk Taylor 934422264e
remove entries for reverted code from changelog 2023-02-24 12:44:26 -08:00
Myk Taylor 69b89e9a6b
revert code changes to dig-now (causing lockups) 2023-02-24 12:44:06 -08:00
Myk 2659bf2ed4
Merge pull request #2943 from myk002/myk_autobutcher_deannouncement
[autobutcher] log to console instead of announcements
2023-02-24 10:30:48 -08:00
DFHack-Urist via GitHub Actions d8758fdfb7 Auto-update submodules
scripts: master
2023-02-24 07:15:12 +00:00
Myk Taylor be54440177
fix up changelog 2023-02-23 22:33:46 -08:00
Myk Taylor 6dbc22350f
log to console instead of announcements 2023-02-23 22:24:32 -08:00
Myk Taylor 29e0698177
re-mark channel-safely as untested 2023-02-23 21:14:37 -08:00
Myk Taylor b976097ccf
sync spreadsheet to tags 2023-02-23 21:01:58 -08:00
DFHack-Urist via GitHub Actions 1ed0a41dd1 Auto-update submodules
library/xml: master
scripts: master
2023-02-23 07:15:08 +00:00
Myk 3fa9babb48
Merge pull request #2911 from kelvie/label-hover
Usability: Show mouse hover on all clickable Labels/Lists
2023-02-22 20:39:02 -08:00
Kelvie Wong 3c24e67a9a Address additional PR comments
on_activate is likely to happen first so we shouldn't need to check the
other.
2023-02-22 17:22:04 -08:00
Myk c54a2346f3
Merge pull request #2908 from cppcooper/dig-now
dig-now bug fixing
2023-02-22 11:22:59 -08:00
PopnROFL 7901fdf6ec Update CMakeLists.txt
N++ defaulted to tabs. Fixing.
2023-02-22 07:26:00 -06:00
PopnROFL 15b00587a0 Update CMakeLists.txt
Increased MSVC version to the latest, and updated the error messaging so you know what version you have (if it's installed at all)
2023-02-22 07:26:00 -06:00
Myk b516c8753e
Merge branch 'develop' into dig-now 2023-02-21 18:59:30 -08:00
Josh Cooper d18911ca5a
Update changelog.txt 2023-02-21 00:01:15 -08:00
DFHack-Urist via GitHub Actions 81db7f09a2 Auto-update submodules
library/xml: master
2023-02-21 07:15:14 +00:00