Commit Graph

15038 Commits (ae67ec05dec9d9f3b818def9616b7f5d340bcecc)
 

Author SHA1 Message Date
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
lethosor 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
lethosor 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
Najeeb Al-Shabibi 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
lethosor 8d03dd4d71
Update xml for 50.10-r1.1 2023-09-19 18:14:59 -04:00
Myk Taylor 8e86c5c0ab
update xml ref 2023-09-18 10:06:06 -07:00
Myk Taylor 64d46af38e
bump to 50.10-r1 2023-09-17 23:52:37 -07:00
Myk Taylor 66a93ad0cc
update xml ref 2023-09-17 23:32:24 -07:00
Myk Taylor a61b8d11d0
Revert "use osyncstream for writing to gamelog.txt"
This reverts commit 4695b8c86d.
2023-09-17 21:38:48 -07:00
Myk Taylor 4695b8c86d
use osyncstream for writing to gamelog.txt 2023-09-17 21:23:45 -07:00
Myk Taylor 48c48baab4
allow semi-wild units to be butchered 2023-09-17 21:23:45 -07:00
Myk Taylor dc270abd0c
add wheelbarrows back to dreamfort stockpiles 2023-09-17 21:23:45 -07:00
Myk Taylor a8c4456c77
update xml ref 2023-09-17 21:16:35 -07:00
Myk Taylor 9905fc7eaf
update version to 50.10-r1 2023-09-17 21:16:17 -07:00
Myk Taylor 53574fb2b3
Merge branch '5010-beta' into develop 2023-09-17 21:15:33 -07:00
Kelly Kinkade c2448654ca Update scripts 2023-09-17 03:03:14 -05:00
DFHack-Urist via GitHub Actions 1c704fad6c Auto-update submodules
scripts: master
2023-09-17 07:11:59 +00:00
Kelly Kinkade aec2950277 update scripts 2023-09-17 01:38:07 -05:00
Myk 067109d74d
Merge pull request #3776 from Jajcus/preserve_LD_PRELOAD
linux: preserve existing LD_PRELOAD content
2023-09-16 11:39:58 -07:00
Jacek Konieczny 47e8eb8c15
Merge branch 'develop' into preserve_LD_PRELOAD 2023-09-16 20:34:59 +02:00
DFHack-Urist via GitHub Actions 03a24c7cff Auto-update submodules
library/xml: master
2023-09-16 07:11:54 +00:00
Jacek Konieczny ac5d9decd2 linux: preserve existing LD_PRELOAD content
that is needed for Steam overlay and game streaming to work

fixes https://github.com/DFHack/dfhack/issues/3768
2023-09-15 22:12:25 +02:00
Kelly Kinkade a13159bc35 use `TerminateProcess` for die on windows
evades issues with the stacktrace logger in 50.10
2023-09-14 17:42:15 -05:00
Myk Taylor ca32e6a1ae
update version and refs for 50.09-r4 2023-09-14 12:38:19 -07:00
Myk Taylor 2a0f5a5474
fix typo in quickstart guide 2023-09-14 11:54:41 -07:00
Myk Taylor 540bd602af
revise quickstart guide 2023-09-14 11:47:15 -07:00
Myk Taylor fc88bfcbbc
don't close the logo menu on mouseout
now that we no longer open on hover, it doesn't make as much sense, and
the behavior can be frustrating when the mouse is moved unintentionally
2023-09-14 11:46:30 -07:00
Myk Taylor 04999cae8d
unbreak Ctrl-Shift-C 2023-09-14 10:43:35 -07:00
Myk Taylor e7762e7bc6
update structures ref 2023-09-14 10:20:20 -07:00
Myk Taylor 6a1b1f2222
update structures ref 2023-09-14 10:18:49 -07:00
Myk Taylor 3634075df0
make DFHack logo glow on hover 2023-09-14 10:12:25 -07:00
Myk Taylor b6c4eb7701
realign tooltip ids in confirm 2023-09-14 09:59:51 -07:00
Myk Taylor b11a3ead1e
make DFHack logo respond to clicks, not mouseover 2023-09-14 01:31:19 -07:00
DFHack-Urist via GitHub Actions 74390cca76 Auto-update submodules
scripts: master
2023-09-14 07:13:19 +00:00
lethosor 017e280b18
Define identity_traits<shared_ptr<T>> for all T (opaque for now) 2023-09-13 21:57:44 -04:00
Myk Taylor 49e449a422
update xml ref 2023-09-13 18:20:49 -07:00
Myk Taylor 561f447a54
update xml ref 2023-09-13 18:17:23 -07:00
Myk Taylor 96f6893a32
update xml ref 2023-09-13 18:02:52 -07:00
Myk Taylor d9cae63e4e
move dfhack logo over a little 2023-09-13 18:02:44 -07:00