Najeeb Al-Shabibi
78bea2a550
fixed a typo brain fart moment
2023-09-27 23:34:19 +01:00
Najeeb Al-Shabibi
5f8a68c490
Merge branch 'develop' into eventmanager_cleanup
2023-09-27 20:59:21 +01:00
Najeeb Al-Shabibi
f5aab7ee45
pulled event handler calls out of the loops over global vectors to avoid potential iterator invalidation by an event callback, and did some tidying
2023-09-27 20:55:22 +01:00
DFHack-Urist via GitHub Actions
888c88dfcf
Auto-update submodules
...
library/xml: master
scripts: master
2023-09-27 20:55:22 +01:00
Myk Taylor
5c670d20db
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-27 20:55:22 +01:00
Myk Taylor
6ad724b483
add detailed focus strings for setupdwarfgame
2023-09-27 20:55:22 +01:00
Mikhail Panov
73fed1e833
Updated changelog.txt
2023-09-27 20:55:22 +01:00
Mikhail
32a2d9f9b5
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-27 20:55:22 +01:00
DFHack-Urist via GitHub Actions
e253642660
Auto-update submodules
...
library/xml: master
scripts: master
2023-09-27 02:23:08 +00:00
Myk
da77be29be
Merge pull request #3816 from myk002/myk_remousify
...
align mouse button semantics to DF
2023-09-26 19:09:23 -07:00
Myk
e48c8d57b5
Merge pull request #3815 from myk002/myk_focus
...
add detailed focus strings for setupdwarfgame
2023-09-26 19:08:58 -07:00
Myk
5e31fa3730
Merge pull request #3783 from Halifay/combat_skill_rating_polishing
...
Combat ratings polishing
2023-09-26 09:05:18 -07:00
Mikhail Panov
49c05aa398
Updated changelog.txt
2023-09-26 17:54:34 +03:00
Mikhail Panov
1e4e6ed03f
Merge remote-tracking branch 'main_repository/develop' into combat_skill_rating_polishing
2023-09-26 17:42:27 +03:00
Myk Taylor
eefd38c66c
align mouse button semantics to DF
...
we, um, had it backwards
2023-09-26 03:52:24 -07:00
Myk Taylor
932f3324d3
add detailed focus strings for setupdwarfgame
2023-09-26 03:45:15 -07:00
DFHack-Urist via GitHub Actions
8313737833
Auto-update submodules
...
scripts: master
2023-09-26 07:13:08 +00:00
DFHack-Urist via GitHub Actions
7e21d384ab
Auto-update submodules
...
library/xml: master
scripts: master
2023-09-25 07:13:23 +00:00
Myk
bc01d4bf45
Merge pull request #3813 from ab9rf/autolabor-3812
...
autolabor: fix #3812
2023-09-24 17:56:48 -07:00
Myk
a721fee8cd
Update docs/changelog.txt
2023-09-24 17:21:28 -07:00
Kelly Kinkade
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
Myk
1a5c9d9cff
Merge pull request #3810 from master-spike/authors_master_spike
...
Update Authors.rst
2023-09-24 15:08:29 -07:00
Najeeb Al-Shabibi
d7d142c616
Authors.rst master-spike added
2023-09-24 21:13:04 +01:00
Myk
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
Najeeb Al-Shabibi
7d9dad4688
dig - doc rewording and added change to changelog
2023-09-24 20:51:30 +01:00
Najeeb Al-Shabibi
2a5e59134c
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 20:24:39 +01:00
Myk
0eba20d559
Merge pull request #3716 from shevernitskiy/freezed-textures
...
reserved texpos range
2023-09-24 11:59:25 -07:00
Najeeb Al-Shabibi
26dd4e1f78
dig doc unexpected indentation actually fixed fr this time
2023-09-24 12:30:32 +01:00
Najeeb Al-Shabibi
15ede64d9b
dig doc unexpected indentation actually fixed
2023-09-24 12:23:25 +01:00
Najeeb Al-Shabibi
dff9edb26b
dig doc unexpected indentation fixed
2023-09-24 12:20:55 +01:00
Najeeb Al-Shabibi
ff03fc1f2d
trailing whitespace removed
2023-09-24 12:17:50 +01:00
Najeeb Al-Shabibi
bf9dbd87a9
Merge branch 'develop' into dig_digtype_nohidden
2023-09-24 12:15:52 +01:00
Najeeb Al-Shabibi
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
shevernitskiy
be26449ef7
ugh
2023-09-24 13:22:20 +03:00
shevernitskiy
bb5e178756
fix eof
2023-09-24 13:19:48 +03:00
shevernitskiy
9f4f14d025
put back unformatted hotkeys
2023-09-24 13:18:58 +03:00
shevernitskiy
7e4fe64605
oops
2023-09-24 13:10:48 +03:00
shevernitskiy
ae67ec05de
remove doubled check
2023-09-24 13:01:31 +03:00
shevernitskiy
f4348095a3
upstream
2023-09-24 11:45:07 +03:00
shevernitskiy
d2bc834fa9
fix exception on close, dummy surface refcount
2023-09-24 11:44:04 +03:00
shevernitskiy
bd4d831582
add flag for dummy & resolve conflicts
2023-09-24 11:44:04 +03:00
shevernitskiy
25cc778fce
review refactor
2023-09-24 11:44:04 +03:00
shevernitskiy
770402a292
erase from delayed when deleteHandle()
2023-09-24 11:44:04 +03:00
shevernitskiy
033a849de2
Apply suggestions from code review
...
Co-authored-by: Myk <myk.taylor@gmail.com>
2023-09-24 11:44:04 +03:00
shevernitskiy
469a97f781
review
2023-09-24 11:44:04 +03:00
shevernitskiy
5b34ac63e1
fix for gcc
2023-09-24 11:44:03 +03:00
shevernitskiy
6f26650255
reserved texpos range
2023-09-24 11:44:03 +03:00
Myk
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
lethosor
f5084c4054
Merge remote-tracking branch 'lethosor/core-fatal-sdl-messagebox' into develop
2023-09-24 01:26:14 -04:00
Najeeb Al-Shabibi
6fe0fb5bf9
removed trailing whitespace
2023-09-22 12:45:33 +01:00