Myk
|
0eba20d559
|
Merge pull request #3716 from shevernitskiy/freezed-textures
reserved texpos range
|
2023-09-24 11:59:25 -07:00 |
donhth
|
ac02483b52
|
Merge branch 'develop' into make-tubefill-live-again
|
2023-09-24 07:35:34 -04:00 |
Najeeb Al-Shabibi
|
26dd4e1f78
|
dig doc unexpected indentation actually fixed fr this time
|
2023-09-24 12:30:32 +01:00 |
|
donhth
|
437f96f3c0
|
add changelog entry, remove unavailable tag for tubefill
|
2023-09-24 07:30:31 -04: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 |
Kelly Kinkade
|
9cdfe36aea
|
reenable `spectate`
by request from the community
|
2023-09-24 04:37:24 -05: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 |
|
donhth
|
303ce1fdc3
|
re-enable tubefill.
|
2023-09-23 15:54:46 -04:00 |
Mikhail Panov
|
8a424de7ff
|
Updated orders.rst
|
2023-09-22 19:04:49 +03:00 |
|
Mikhail Panov
|
a236722a75
|
Changed hotkeys + orders.cpp compilation error fix.
|
2023-09-22 18:37:14 +03:00 |
|
Mikhail Panov
|
9c866d5134
|
Merge remote-tracking branch 'main_repository/develop' into work_orders_manager_enhancement
|
2023-09-22 18:30:21 +03:00 |
|
Mikhail Panov
|
a500233e0b
|
Moved onde order recheck to orders plugin.
|
2023-09-22 18:29:45 +03:00 |
|
Mikhail Panov
|
3fc289cefa
|
Added single order recheck option to orders recheck. Sorting by material and job type consider frequency as a higher priority.
|
2023-09-22 16:26:23 +03:00 |
|
Najeeb Al-Shabibi
|
6fe0fb5bf9
|
removed trailing whitespace
|
2023-09-22 12:45:33 +01:00 |
|
Najeeb Al-Shabibi
|
2083bab2e9
|
added a +z option to digtype
|
2023-09-22 12:41:41 +01:00 |
|
Najeeb Al-Shabibi
|
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 |
|
Najeeb Al-Shabibi
|
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 |
|
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 |
Mikhail
|
8826c27fa0
|
Changed 'reset' to recheck for clarity.
|
2023-09-18 13:41:02 +03:00 |
|
Mikhail
|
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 |
|
Mikhail
|
7d3786586a
|
Reverted sort.lua. Changed orders sort by material keybing from T to M.
|
2023-09-18 12:28:34 +03: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 |