49c05aa398
Updated changelog.txt
2023-09-26 17:54:34 +03:00
1e4e6ed03f
Merge remote-tracking branch 'main_repository/develop' into combat_skill_rating_polishing
2023-09-26 17:42:27 +03:00
8313737833
Auto-update submodules
...
scripts: master
2023-09-26 07:13:08 +00:00
7e21d384ab
Auto-update submodules
...
library/xml: master
scripts: master
2023-09-25 07:13:23 +00:00
bc01d4bf45
Merge pull request #3813 from ab9rf/autolabor-3812
...
autolabor: fix #3812
2023-09-24 17:56:48 -07:00
a721fee8cd
Update docs/changelog.txt
2023-09-24 17:21:28 -07:00
0559af9f13
autolabor: fix #3812
...
make sure autolabor resets the work detail bypass flag whenever autolabor is unloaded for _any_ reason
i tested `disable autolabor`, `unload autolabor`, and unloading a fort with autolabor enabled; in all cases the work detail bypass flag was cleared as desired
closes #3812
2023-09-24 19:10:46 -05:00
1a5c9d9cff
Merge pull request #3810 from master-spike/authors_master_spike
...
Update Authors.rst
2023-09-24 15:08:29 -07:00
d7d142c616
Authors.rst master-spike added
2023-09-24 21:13:04 +01:00
f4d682a970
Merge pull request #3800 from master-spike/dig_digtype_nohidden
...
Adjusted behaviour of "digtype" to only designate non-hidden squares, and designate them as auto-dig
2023-09-24 13:03:37 -07:00
7d9dad4688
dig - doc rewording and added change to changelog
2023-09-24 20:51:30 +01:00
2a5e59134c
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 20:24:39 +01:00
0eba20d559
Merge pull request #3716 from shevernitskiy/freezed-textures
...
reserved texpos range
2023-09-24 11:59:25 -07:00
26dd4e1f78
dig doc unexpected indentation actually fixed fr this time
2023-09-24 12:30:32 +01:00
15ede64d9b
dig doc unexpected indentation actually fixed
2023-09-24 12:23:25 +01:00
dff9edb26b
dig doc unexpected indentation fixed
2023-09-24 12:20:55 +01:00
ff03fc1f2d
trailing whitespace removed
2023-09-24 12:17:50 +01:00
bf9dbd87a9
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 12:15:52 +01:00
b22ca57f50
added previous 'hidden' and 'no-auto' functionality as options, and adjusted how z-level options are specified
2023-09-24 12:15:46 +01:00
be26449ef7
ugh
2023-09-24 13:22:20 +03:00
bb5e178756
fix eof
2023-09-24 13:19:48 +03:00
9f4f14d025
put back unformatted hotkeys
2023-09-24 13:18:58 +03:00
7e4fe64605
oops
2023-09-24 13:10:48 +03:00
ae67ec05de
remove doubled check
2023-09-24 13:01:31 +03:00
f4348095a3
upstream
2023-09-24 11:45:07 +03:00
d2bc834fa9
fix exception on close, dummy surface refcount
2023-09-24 11:44:04 +03:00
bd4d831582
add flag for dummy & resolve conflicts
2023-09-24 11:44:04 +03:00
25cc778fce
review refactor
2023-09-24 11:44:04 +03:00
770402a292
erase from delayed when deleteHandle()
2023-09-24 11:44:04 +03:00
033a849de2
Apply suggestions from code review
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-09-24 11:44:04 +03:00
469a97f781
review
2023-09-24 11:44:04 +03:00
5b34ac63e1
fix for gcc
2023-09-24 11:44:03 +03:00
6f26650255
reserved texpos range
2023-09-24 11:44:03 +03:00
2b11baa35f
Merge pull request #3797 from master-spike/remotefortressreadercpp_lerp_name_conflict_fix
...
Fix lerp() name conflict on Windows
2023-09-23 22:59:13 -07:00
f5084c4054
Merge remote-tracking branch 'lethosor/core-fatal-sdl-messagebox' into develop
2023-09-24 01:26:14 -04:00
6fe0fb5bf9
removed trailing whitespace
2023-09-22 12:45:33 +01:00
2083bab2e9
added a +z option to digtype
2023-09-22 12:41:41 +01:00
b7fcf035bc
Stopped setting auto-dig on non-default dig designations as auto-dig doesn't work for anything except for the standard 'mine' designation
2023-09-22 12:18:38 +01:00
6f45e347af
digtype now doesn't designate hidden tiles for digging, instead only designating visible tiles in 'auto' mode (also changed MapCache* to unique_ptr<MapCache>)
2023-09-22 12:14:41 +01:00
3af118dce9
Check that SDL_ShowSimpleMessageBox has been bound first
...
This function can be called before DFSDL is initialized
2023-09-21 01:18:56 -04:00
aa6c4094c5
Use SDL_ShowSimpleMessageBox in Core::fatal()
...
This allows the message to be displayed consistently in a dialog on all platforms.
2023-09-21 01:13:07 -04:00
3d6d148ad7
using namespace std removed and replaced with std:: prefix, to resolve naming conflict of lerp with std::lerp in C++20
2023-09-21 02:40:03 +01:00
8d03dd4d71
Update xml for 50.10-r1.1
2023-09-19 18:14:59 -04:00
8e86c5c0ab
update xml ref
2023-09-18 10:06:06 -07:00
68d94ad715
Removed redundant uppercase in mental stability formula. Reworked thresholds for combat skill effectiveness formulas to have a higher 100 cap (more descriptive about very strong warriors).
2023-09-18 12:49:36 +03:00
64d46af38e
bump to 50.10-r1
2023-09-17 23:52:37 -07:00
66a93ad0cc
update xml ref
2023-09-17 23:32:24 -07:00
a61b8d11d0
Revert "use osyncstream for writing to gamelog.txt"
...
This reverts commit 4695b8c86d
2023-09-17 21:38:48 -07:00
4695b8c86d
use osyncstream for writing to gamelog.txt
2023-09-17 21:23:45 -07:00
48c48baab4
allow semi-wild units to be butchered
2023-09-17 21:23:45 -07:00
Mikhail Panov
DFHack-Urist via GitHub Actions
Myk
Kelly Kinkade
Najeeb Al-Shabibi
shevernitskiy
lethosor
Myk Taylor
Mikhail