Myk Taylor
|
f111b69f2f
|
Merge branch 'develop' into myk_cpp20
|
2023-07-03 11:49:54 -07:00 |
|
Myk Taylor
|
9ca96567a5
|
move conversion logic to MiscUtils
but keep minimal wrappers in SDL module so we don't leak memory
|
2023-07-03 11:05:58 -07:00 |
|
Myk Taylor
|
fdf2430fc4
|
filter out spurious STRING keybindings
that don't match actual SDL string input
|
2023-07-03 09:09:52 -07:00 |
|
Myk Taylor
|
d39440d33b
|
migrate markForTrade logic from logistics to core
|
2023-07-02 19:05:50 -07:00 |
|
Myk Taylor
|
175c249d29
|
support copy/paste from system clipboard
|
2023-07-02 18:04:06 -07:00 |
|
Myk Taylor
|
d54c13121b
|
use new icons from RafaelKB
|
2023-06-25 18:56:37 -07:00 |
|
Myk Taylor
|
8235680ff0
|
add unsuspend map textures
|
2023-06-25 18:40:04 -07:00 |
|
Myk Taylor
|
8f1efcd8a3
|
remove need to ignore warnings for dfhack-dependent targets
|
2023-06-25 17:44:06 -07:00 |
Myk
|
e101a6d9dc
|
Update Textures.h
|
2023-06-23 14:36:26 -07:00 |
|
Myk Taylor
|
840a2b3525
|
ensure DFHack screens get all string input
|
2023-06-23 14:36:18 -07:00 |
Taxi Service
|
3e2940ef8f
|
attempt to set optional tilesize arguments for load_texture()
|
2023-06-23 14:35:45 -07:00 |
|
Myk Taylor
|
52151b0e98
|
remove SDL functions that don't exist anymore
|
2023-06-23 14:31:14 -07:00 |
|
Myk Taylor
|
4e48ce64f1
|
get things mostly ported to SDL2
|
2023-06-23 14:31:12 -07:00 |
|
Myk Taylor
|
974a6155c0
|
reinstated Buildings.setOwner
|
2023-05-31 18:48:08 -07:00 |
|
Myk Taylor
|
a5a6b70a51
|
launch DFHack through steam if DF is run from steam
|
2023-05-20 02:59:39 -07:00 |
|
Myk Taylor
|
1a703c344f
|
support disabling DFHack with --disable-dfhack
|
2023-05-15 17:41:28 -07:00 |
|
Myk
|
b1ae39764b
|
Merge branch '5008-beta1' into myk_nosdlreal
|
2023-04-26 15:48:13 -07:00 |
|
Myk Taylor
|
5a4dec35f1
|
reorder template declarations so we can push vectors of maps
|
2023-04-24 14:28:21 -07:00 |
|
Myk Taylor
|
b5459faffe
|
format version string in help the same way
|
2023-04-23 18:20:50 -07:00 |
|
Myk Taylor
|
9f605d6396
|
call DF's stubs for SDL semaphore functions
|
2023-04-12 21:48:02 -07:00 |
|
Myk Taylor
|
21784568bd
|
migrate from SDL interposing to the hooks API
|
2023-04-12 21:34:16 -07:00 |
|
Myk Taylor
|
6a7446780b
|
hide terminal console when running on steam deck
|
2023-04-10 04:35:34 -07:00 |
|
Taxi Service
|
7c63ea9394
|
added BOLD_FRAME and INTERIOR_MEDIUM_FRAME
|
2023-04-03 20:13:57 +02:00 |
|
Myk Taylor
|
76bacee238
|
dynamically add mod scripts to the script path
|
2023-03-25 12:56:48 -07:00 |
|
Myk Taylor
|
2bc92042a5
|
allow enable to interpret aliases
|
2023-03-24 23:25:24 -07:00 |
|
Myk Taylor
|
c47f068769
|
add Lua::Push for sets
|
2023-03-15 00:28:18 -07:00 |
|
Myk Taylor
|
0562dc5234
|
constify some MaterialInfo methods
|
2023-03-05 18:16:49 -08:00 |
|
Myk Taylor
|
028bbca07b
|
allow vectors to be read from indices other than 1
|
2023-03-05 16:32:05 -08:00 |
|
Myk Taylor
|
d3ef96cc05
|
allow MaterialInfo structs to be sorted
|
2023-03-05 16:32:05 -08:00 |
|
Myk
|
663b014eae
|
Merge pull request #2682 from 20k/squadwork
makeSquad, updateRoomAssignments
|
2023-02-26 21:40:33 -08:00 |
|
Myk Taylor
|
c513c246a5
|
more SDL wrapping for stonesense
|
2023-02-26 21:18:16 -08:00 |
|
Myk Taylor
|
851bb50dc8
|
add SDL_PushEvent shim for RemoteFortressReader
|
2023-02-26 21:18:08 -08:00 |
20k
|
2bd48f1f90
|
address some review comments
|
2023-02-26 18:05:35 +00:00 |
|
20k
|
d84b118767
|
docs, rework, rename
|
2023-02-26 18:05:35 +00:00 |
|
20k
|
3912c6290f
|
Military module start
|
2023-02-26 18:05:34 +00:00 |
|
20k
|
ce3ee386fd
|
makeSquad, updateRoomAssignments
|
2023-02-26 18:05:34 +00:00 |
|
Myk Taylor
|
a684f294c5
|
add templated version of join_strings
|
2023-02-24 17:05:08 -08:00 |
Kelvie Wong
|
f8d94afb7d
|
Add getSelectedCivZone to dfhack.gui
Mostly helpful for my own automation in my custom lua scripts.
Tested it with barracks, meeting areas, and pastures.
|
2023-02-13 15:22:33 -08:00 |
Robob27
|
65f38ec75c
|
Add isGeldable, isMarkedForGelding, isPet
|
2023-02-11 05:44:45 -05:00 |
|
Myk Taylor
|
cd12f95849
|
add const & to Push overloads; remove circular def
|
2023-02-08 12:15:19 -08:00 |
Roxy
|
826f918954
|
remove isHospital as hospitals are no longer civzones
|
2023-02-06 19:11:00 -05:00 |
|
Myk Taylor
|
9e318842a4
|
implement some Gui module hotkey guards
and clean up focus string matching logic
|
2023-02-06 00:58:57 -08:00 |
|
Myk Taylor
|
526d7c1726
|
allow focus string generation to fall through unfocuses ZScreens
|
2023-02-05 18:01:46 -08:00 |
|
Robob27
|
14f1e4b52f
|
Per confirm pause maybe?
|
2023-02-05 19:04:21 -05:00 |
|
Robob27
|
8f32f1ed7b
|
Fixup focusStrings->focusString
|
2023-02-05 19:04:21 -05:00 |
|
Robob27
|
a770a4cae4
|
WIP
|
2023-02-05 19:04:21 -05:00 |
|
Myk Taylor
|
81abd52313
|
include TRACE messages in the build
|
2023-02-03 12:25:44 -08:00 |
|
Myk Taylor
|
8c7be9a8c2
|
don't use negative plant indices
and clean up the Kitchen module a bit more
|
2023-02-02 23:33:24 -08:00 |
|
Myk
|
21f93173c3
|
Merge pull request #2778 from myk002/myk_halfsies
support offset text in graphics mode for pens
|
2023-02-01 17:50:24 -08:00 |
|
Myk
|
7468170751
|
Merge pull request #2771 from myk002/myk_seedwatch
update seedwatch
|
2023-02-01 17:49:57 -08:00 |
|
Myk Taylor
|
58be8cfd69
|
support offset text in graphics mode for pens
|
2023-02-01 17:39:32 -08:00 |
|
Myk Taylor
|
aae5d5f411
|
reduce diff in Kitchen.h
|
2023-02-01 04:28:07 -08:00 |
|
Myk Taylor
|
be40d55e64
|
update seedwatch
|
2023-02-01 04:03:28 -08:00 |
|
Myk Taylor
|
aa22917aeb
|
add new control panel textures
|
2023-01-31 23:52:30 -08:00 |
|
Myk
|
274e995790
|
Merge pull request #2747 from myk002/myk_on_off
Add new on/off icons
|
2023-01-29 16:55:01 -08:00 |
|
Myk Taylor
|
1c6235633f
|
add dfhack.units.getCitizens()
|
2023-01-29 16:28:05 -08:00 |
|
Myk Taylor
|
c2d6debcd8
|
add on/off light textures and expose to lua
|
2023-01-29 00:35:29 -08:00 |
|
Myk
|
99d1ed6828
|
Merge branch 'develop' into myk_no_inception
|
2023-01-28 11:58:37 -08:00 |
|
Myk Taylor
|
863ca2ca65
|
solve the inception problem
where hideGuard smashes the viewscreen stack with multiple insertions
for the same screen
|
2023-01-28 08:02:46 -08:00 |
|
Myk Taylor
|
22dd49ce38
|
remove "room" checking for buildings -- there is no room
|
2023-01-27 13:38:21 -08:00 |
|
Myk Taylor
|
9aaa55cd7f
|
add textures and frames for various use cases
|
2023-01-23 03:58:51 -08:00 |
|
Myk
|
d82a795ef4
|
Merge pull request #2681 from 20k/develop
More civzone <-> building work, add removing zones with associated squads support
|
2023-01-22 17:14:24 -08:00 |
|
20k
|
598354d9d4
|
getbiometype naming, docs
|
2023-01-21 20:33:40 +00:00 |
|
20k
|
9054efd7c8
|
Update miscutils to support member pointer to a variable defined in the base when passing in a derived type
|
2023-01-21 19:15:28 +00:00 |
|
Myk
|
310940e1a2
|
Merge branch 'develop' into Autoclothing
|
2023-01-20 14:05:26 -08:00 |
|
Myk Taylor
|
eae2cec22f
|
use keyboard cursor
and adapt to a "bad" cursor not being equal to -30000 anymore
|
2023-01-20 09:31:44 -08:00 |
|
Myk
|
d201cf0182
|
Merge pull request #2662 from 20k/develop
Zone <-> building interactions
|
2023-01-20 09:30:52 -08:00 |
|
20k
|
8b7c8d83b5
|
remove save fixup
Add notifyCivzoneModified
|
2023-01-19 21:55:20 +00:00 |
|
Myk Taylor
|
d6b69ca8fc
|
move useful functions from uicommon to MiscUtils
|
2023-01-16 23:46:47 -08:00 |
Rose
|
0e021e392d
|
Added a report to autoclothing, as well as some changes to DFHack::Units to enable it.
|
2023-01-13 21:20:01 -08:00 |
|
Myk Taylor
|
ac06508d92
|
add some more icon textures we can use
contributed by TaxiService on the DFHack Discord server
|
2023-01-12 21:04:41 -08:00 |
|
Myk Taylor
|
079d5e4178
|
support foreground and background writing from pens
|
2023-01-12 12:30:07 -08:00 |
|
Myk Taylor
|
7cf703ef23
|
turn down Ruby support
|
2023-01-09 23:59:55 -08:00 |
|
Myk Taylor
|
2234328a91
|
use an actual pin texture for ZScreen pins
|
2023-01-09 00:47:13 -08:00 |
|
Myk Taylor
|
6f46ae672e
|
add Gui::getDFViewscreen and Lua binding
|
2023-01-06 12:17:36 -08:00 |
|
Myk Taylor
|
1934014659
|
framework for passthru, z-order swapping windows
|
2023-01-05 18:07:38 -08:00 |
|
Myk Taylor
|
845391f4e6
|
fix overzealous "ui" -> "plotinfo" replacement
some comments were just talking about the UI..
|
2023-01-05 17:46:30 -08:00 |
|
Myk Taylor
|
5e5775f5e3
|
rename globals according to structures update
|
2023-01-05 17:11:01 -08:00 |
|
Myk
|
a5b11065db
|
Merge pull request #2547 from lethosor/codegen-stl-map-stub+v50
[v50] Add read-only container_identity for std::map
|
2023-01-05 15:35:27 -08:00 |
|
Myk Taylor
|
4e51e02924
|
move SDL shims to a new DFSDL module
|
2023-01-04 17:15:32 -08:00 |
|
Myk Taylor
|
5d04b9c4cb
|
add Textures module and load DFHack logo
undocumented for now since it's internal. in the future, perhaps this
could morph into a dynamic texture loading facility for tools
|
2023-01-04 13:30:18 -08:00 |
lethosor
|
feeefcf149
|
Add read-only container_identity for std::map
|
2023-01-03 01:16:42 -05:00 |
|
Myk Taylor
|
7d5d2d0a9b
|
clear out obsolete area map and menu logic
in particular, return the correct map dimensions in getDwarfmodeDims()
|
2022-12-31 22:49:30 -08:00 |
|
Myk Taylor
|
4789637625
|
implement new dfhooks API
|
2022-12-25 18:15:55 -08:00 |
|
Myk Taylor
|
48a9e1c518
|
more new var names
|
2022-12-22 05:16:40 +00:00 |
|
Myk Taylor
|
839e927f9b
|
comment out problematic code from Renderer
|
2022-12-21 14:06:58 -08:00 |
|
Myk Taylor
|
768c95ecb6
|
absorb Putnam's work on Screen
|
2022-12-16 14:47:43 -06:00 |
|
Myk Taylor
|
ccc9e976e2
|
comment out problematic code in Screen.cpp
|
2022-12-16 14:47:43 -06:00 |
Tachytaenius
|
0836962007
|
Rename [xyz]CategoryActionTimers to [xyz]GroupActionTimers in action timer API
|
2022-12-01 23:24:04 +00:00 |
|
Tachytaenius
|
ae532e1452
|
Rename affectedActionTypeCategory to affectedActionTypeGroup in action timer API
|
2022-12-01 23:22:02 +00:00 |
|
Tachytaenius
|
76cdbfbc5c
|
Rename affectedActionCategory to affectedActionTypeCategory in action timer API
|
2022-12-01 23:19:10 +00:00 |
|
Tachytaenius
|
f06f17b59c
|
Rename affectedActionTypes to affectedActionCategory in action timer API
|
2022-12-01 23:17:57 +00:00 |
|
Tachytaenius
|
a925c34413
|
Rename [xyz]ActionTimer functions to [xyz]ActionTimers
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
f863b9807a
|
Add action timer API input validation
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
8f0b7663d9
|
Change ints in action timer API function signatures to int32_ts
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
7f54a77ed9
|
Continue work on unit action timer API
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
16ef4f8313
|
Rename action_type_group to unit_timer_action_type_group
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
fa589b5764
|
Make progress with action timer API
|
2022-12-01 13:34:54 +00:00 |
|
Tachytaenius
|
0f8ce360ac
|
Make first pass of action timer API
|
2022-12-01 13:34:54 +00:00 |
|
Myk
|
11c27d40dd
|
Merge branch 'develop' into Bumber64-patch-2
|
2022-11-18 17:34:00 -08:00 |