35d659091d
Merge remote-tracking branch 'myk002/blueprint_in_blueprints' into develop
2020-07-17 17:32:59 -04:00
56e43a0dde
Linux: make Process::getPath (and dfhack.getDFPath()) not depend on cwd, for consistency with other platforms
2020-07-16 23:21:56 -04:00
bb91fdcf8c
Merge remote-tracking branch 'upstream/develop' into blueprint_in_blueprints
2020-07-16 09:24:52 -07:00
0afbe9d931
include algorithm on windows for std::replace
2020-07-16 08:42:39 -07:00
bb1fcff410
use FILENAME_MAX instead of PATH_MAX for compat
2020-07-16 08:33:23 -07:00
c0d10b9e44
Update submodules
2020-07-16 01:49:16 -04:00
1ae341b637
Check that we created a dir before we return true
2020-07-15 22:02:12 -07:00
c19fc1f349
gcc-4.8 compatibility
2020-07-15 21:35:21 -07:00
df6f3a0455
Mark ref_target as a metafield so meta_primitive_newindex fails properly
...
unit:_field('hist_figure_id').ref_target = 4 now fails with "Cannot write field int32_t.ref_target: builtin property or method" instead of "not found"
2020-07-14 02:31:18 -04:00
a44a2e2298
Merge branch 'develop' into lua-ref-target
2020-07-14 01:31:23 -04:00
07a2b4a9d7
Use language_name_type enum item names
2020-07-11 02:05:38 -04:00
24d64175fb
Remove top-level links from TOCs
2020-07-08 02:13:37 -04:00
25f1b14a88
update structures
2020-07-01 23:12:45 -05:00
72ce52e004
update structures
2020-07-01 23:10:34 -05:00
ae0f57f0e0
Update submodules
2020-07-01 23:54:31 -04:00
9def098ef9
add enum-attrs to pronoun_type
2020-06-29 21:30:22 -05:00
d13e5a3f31
update structures
...
handle renaming of caste_raw::gender
2020-06-29 20:20:37 -05:00
a9f219baf9
update for DFHack/df-structures#7dfea1f1d4e453b97d5529785701db46360596ce
2020-06-29 16:16:44 -05:00
ee56d8157f
Update xml
2020-06-27 00:15:48 -04:00
5570a5743b
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-06-26 09:53:41 +02:00
8a7e8f4fac
Update xml
2020-06-25 01:12:18 -04:00
e2301ecae7
Update structures, fix reaction_productst::produce() parms
2020-06-23 13:31:27 -06:00
85855a2d88
update structures
2020-06-21 16:16:16 -05:00
7b4ae9b6a3
update structures
2020-06-20 23:08:55 -05:00
5073bd31c4
update structures
2020-06-19 19:37:54 -05:00
bd216dbc11
update structures
2020-06-15 23:47:35 -05:00
d5b5b81450
changes
2020-06-02 15:03:59 +02:00
5d05cfc7cc
Fix several functions in the Units module ignoring unit caste.
...
Fixes #1583 .
2020-06-02 01:18:57 -05:00
2fc7fa7ac2
Update xml, scripts
...
See #1576
2020-05-28 23:11:08 -04:00
4e97269312
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-05-23 10:25:08 +02:00
f20446534b
fix DfOtherVectors computed size
2020-05-14 14:01:12 -05:00
7dd4b6d968
update structures
2020-05-14 13:07:11 -05:00
6c20fe4c80
implement df-other-vectors-type for lua
2020-05-09 18:28:40 -05:00
7cf9624de9
add assert to make sure other_id array index is in bounds
2020-05-09 18:28:40 -05:00
fc10ed3df6
Implementation for df-other-vectors-type in C++. Still needs Lua and Ruby support.
2020-05-09 18:28:40 -05:00
0ffafbde29
update structures
2020-05-09 18:28:19 -05:00
d0c030c3da
Update xml (changelog only)
2020-05-04 19:27:17 -04:00
ec7f97bb7a
adapted to enum value name change
2020-05-02 17:37:10 +02:00
1c57aa7bb4
update structures
2020-05-02 02:01:32 -05:00
947d0db182
update structures
2020-05-02 01:54:38 -05:00
217535decb
Update xml
2020-05-01 22:52:35 -04:00
24cebbda58
Fix segfault when setting DFHACK_HEADLESS but not PRINT_MODE:TEXT
...
endwin() is unhappy if initscr() wasn't called
2020-04-28 21:38:47 -04:00
2108c2363d
Use strcmp
2020-04-28 01:21:11 -04:00
9e085b66ac
Merge branch 'develop' into lua-ref-target
2020-04-27 23:24:29 -04:00
6bdbf5b0dd
Update to 0.47.04-r1, update xml, scripts, changelog version
2020-04-25 21:33:02 -04:00
7c1d1c43e5
Merge remote-tracking branch 'PatrikLundell/stocks' into develop
...
Conflicts:
docs/changelog.txt
2020-04-25 21:12:27 -04:00
f008da32f8
Update submodules
2020-04-25 17:58:09 -04:00
405af5a20b
Update structures
2020-04-25 02:01:21 -04:00
55a82e43c6
Update xml, fix stockpiles build
2020-04-24 23:50:35 -04:00
c6ed0a2458
Update xml, scripts, authors
2020-04-24 21:15:04 -04:00
27e42ed25d
Update xml
2020-04-23 23:12:43 -04:00
84f13b643b
update structures
2020-04-23 15:34:26 -05:00
c5513c3ca1
Update xml
2020-04-23 01:11:29 -04:00
0272fd57f8
Update submodules
2020-04-22 22:16:24 -04:00
21be5cf061
adapted to structures
2020-04-22 15:32:49 +02:00
f371ae6da8
adapted to histfig_nemesis_id->union
2020-04-22 12:38:37 +02:00
07571e9eb4
updated and resolved conflict
2020-04-22 11:43:37 +02:00
9a10ea9fe5
Update submodules
2020-04-22 02:13:24 -04:00
66314806b1
update structures
2020-04-19 22:03:13 -05:00
54d4b68f3c
don't crash if the path to an instance-vector contains a null pointer
2020-04-18 20:40:17 -05:00
c8ff8d0d8e
update scripts and structures
2020-04-17 11:52:16 -05:00
8427f518c9
match capitalization changes I made to df-structures in specific_ref
2020-04-15 20:05:15 -05:00
253b15aeb9
update structures
2020-04-15 19:03:40 -05:00
f4f2aa0d5e
removed underscores, adapted to structure (re)naming
2020-04-15 10:18:37 +02:00
b0d184e2f9
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-04-15 09:45:54 +02:00
57d565c735
Merge remote-tracking branch 'PatrikLundell/TranslateName' into develop
2020-04-15 01:07:34 -04:00
67c1321a06
update structures
2020-04-11 13:03:38 -05:00
9a2549bad6
Update xml
2020-04-09 23:56:01 -04:00
125f4b129b
Add ref_target attribute to primitive field references
2020-04-09 00:02:07 -04:00
55988e3fc4
adapted to updated structures, remote Using units for age
2020-04-08 08:45:40 +02:00
5ce84a76f9
Merge branch 'develop' of https://github.com/DFHack/dfhack into Units
2020-04-08 08:35:58 +02:00
509755d726
update structures
2020-04-07 16:08:19 -05:00
6b810b97a0
DataDefs.h can have little a documentation
2020-04-07 13:46:44 -05:00
c8e63cf7a6
update structures
2020-04-07 10:17:01 -05:00
f83fee86de
Make pairs(df.type) return class methods
2020-04-06 19:12:53 -04:00
cc2a5acdd3
Update xml, authors
2020-04-05 23:29:53 -04:00
a0e2abe20a
Units update need coordination with structure identity
2020-04-04 14:00:26 +02:00
c8a0ac146c
Update submodules, changelog, CMakeLists, Authors
2020-04-04 01:36:52 -04:00
eb4cfcec90
Update xml
2020-04-04 00:36:02 -04:00
1024f39a26
Update submodules
2020-04-02 01:47:53 -04:00
63a26b987d
Fix issue #1528
2020-04-01 11:16:24 +02:00
4844ff5071
Update submodules
2020-04-01 00:25:12 -04:00
ffe73028f9
update structures
2020-03-30 10:36:45 -05:00
6c00ace68b
Merge branch 'develop' of gh:DFHack/dfhack into develop
2020-03-30 03:03:00 -04:00
9b1dddc336
Update xml, scripts, change unit_action.data field names back
...
Fixes #1520
Makes part of dfhack/scripts#130 unnecessary
2020-03-30 03:00:41 -04:00
52cf892383
update structures and scripts
2020-03-29 14:08:30 -05:00
6eb73d9046
Fall back to stdout if tty fails to open
...
May help with #1477
2020-03-28 13:14:03 -04:00
b6e0d3f73d
Update xml
2020-03-28 01:36:41 -04:00
67908e0f53
Console-posix: Reset color on shutdown
...
Ensures that dfhack-run doesn't leave behind a colorful prompt
2020-03-25 00:30:12 -04:00
65a7db44be
Update xml, scripts
2020-03-24 01:28:02 -04:00
24ceff8f7d
Update xml, scripts
2020-03-23 00:49:57 -04:00
49fcb29097
Update xml, scripts
2020-03-22 17:24:39 -04:00
b67de60a9b
update structures
2020-03-22 12:36:19 -05:00
0b69f98561
update structures
2020-03-22 12:22:43 -05:00
97916fd55e
implement tagged union structures attributes
2020-03-21 14:29:14 -05:00
b29d009b14
update structures; implement struct_field_info_extra
2020-03-21 13:21:35 -05:00
5b8952baf8
ghidra: handle destructor ABI differences
2020-03-21 08:53:11 -05:00
b2940b69f8
update structures
2020-03-21 07:49:22 -05:00
77e40a52c0
Update scripts, xml, authors
2020-03-21 02:02:00 -04:00
37e7bed779
add df.global:_field method. add test case to check for overlapping globals.
2020-03-20 09:41:58 -05:00
d28b35b6eb
update structures
2020-03-15 15:29:02 -05:00
2f4bd32d28
update structures and scripts
2020-03-15 15:19:51 -05:00
60722d778f
update structures and scripts
2020-03-15 02:17:19 -05:00
39486083f5
handle overlapping structures in check-structures-sanity better
...
update structures
2020-03-12 22:16:30 -05:00
1a4c4a5f33
update structures
2020-03-12 14:03:23 -05:00
f204f14e52
update scripts and structures
2020-03-12 12:53:24 -05:00
2a6b2cacbd
update scripts and structures
2020-03-12 12:34:57 -05:00
b9841110c3
update structures and scripts
2020-03-09 17:53:34 -05:00
a7d263fa67
getFullName of the container AND the item, also exclude container of char ( #1515 )
...
* getFullName of the container AND the item, also exclude container of char
* bit vector condition was backwards
2020-03-09 13:12:04 -05:00
ffb3c29cfc
simplify Graphic module. update structures.
...
it appears that all this added complexity including an extra pointer dereference was to avoid including the vector header.
2020-03-08 00:12:48 -06:00
c4e9c8d29c
update structures
2020-03-07 15:15:02 -06:00
5f83681fbc
update scripts and structures
2020-03-07 12:08:03 -06:00
a214e00407
allow union vectors to have tags that are bit vectors if they have exactly 2 members
2020-03-06 16:48:33 -06:00
508ab79af2
document where tagged unions should be implemented for Lua
2020-03-06 16:33:02 -06:00
635e709d95
name ui_look_list union
...
update scripts and structures
2020-03-06 16:06:27 -06:00
fa574cfbec
allow dfhack-run to output colors.
...
refactor Console-posix to avoid having a parameter equivalent to not calling the function at all.
2020-03-06 15:02:03 -06:00
885fa541fd
update structures
2020-03-05 00:06:32 -06:00
84cae060b1
move find_union_tag from check-structures-sanity to DataDefs.h
2020-03-04 18:23:49 -06:00
08e1fe1f02
update structures
2020-03-03 22:42:40 -06:00
6d15d349bc
update structures
2020-03-03 21:45:13 -06:00
676e73d477
update structures
2020-03-02 23:59:55 -06:00
e356925795
update structures
2020-03-02 23:12:03 -06:00
7784e569a5
update structures
2020-03-02 22:29:53 -06:00
c29b606a4a
check-structures-sanity: suggest known structure types for large unknown pointers
...
update structures
2020-03-02 21:33:04 -06:00
66ded03bc1
update structures
2020-03-02 20:41:13 -06:00
4da0a761ea
update structures
2020-03-02 18:36:28 -06:00
269b3cb8eb
add support for finding vtable pointers to check-structures-sanity
...
update structures
2020-03-02 15:34:29 -06:00
0024457167
update structures
...
don't mark lua argument as a pointer (to be revisited at some point)
2020-03-02 02:27:15 -06:00
102fedc2ff
update structures
2020-03-01 00:20:31 -06:00
dc5ef1fe58
update structures
2020-02-29 20:11:41 -06:00
aaace29e11
update structures
2020-02-29 18:29:32 -06:00
18523a1821
Convert untagged unions to tagged. Fix some edge cases in check-structures-sanity union checking.
2020-02-29 15:08:39 -06:00
94e818fd53
reference union_identity in the df namespace
2020-02-29 13:26:42 -06:00
3ddbb5cec1
fix typo
2020-02-29 13:24:12 -06:00
a30678cee3
subclass struct_identity for unions
2020-02-29 13:11:23 -06:00
196f4d3c06
Update submodules
2020-02-27 18:54:30 -05:00
141928ead0
Fix gui.FilteredList widget search on plain string choices
2020-02-27 07:56:30 +01:00
92eb8b058b
update scripts and structures
2020-02-26 12:10:15 -06:00
e26787604a
update structures
2020-02-24 12:16:59 -06:00
f6f5d54f9d
update structures
2020-02-24 10:20:32 -06:00
1f34c813c8
update structures
2020-02-24 10:13:46 -06:00
8a4eac3d3e
Merge pull request #1503 from TymurGubayev/dev/minor-improvement/dfhack-lua/printall_recurse
...
allow custom filter in calls to `dfhack.printall_recurse`
2020-02-24 10:05:28 -06:00
546178bc56
update structures
2020-02-24 03:03:58 -06:00
e9564a28f5
allow tagged unions to not be union followed by tag
2020-02-23 21:33:32 -06:00
1d8998de22
allow custom filter in `dfhack.printall_recurse`
...
Objects with links like `job` output way too much. With this change, it's possible to provide an optional filter and exclude the `list_link`.
```
[lua]# j = dfhack.gui.getSelectedJob()
[lua]# printall_recurse(j, {[tostring(j.list_link)]=true, [tostring(j.pos)]=true})
```
2020-02-23 16:57:57 +01:00
1e3e3829a7
update structures
2020-02-22 23:36:14 -06:00
5580d375aa
add more diagnostics that will help in the identification of stl-string fields
2020-02-22 15:34:48 -06:00
0711b2569a
in -sizes mode, report sizes of unknown structures behind pointers.
...
update structures
2020-02-22 14:04:53 -06:00
57154e33c8
warn about misidentified generic pointers
...
update structures
2020-02-21 18:49:02 -06:00
53da38ca47
add additional pointer, string, and vector sanity checks
...
update structures and scripts
2020-02-21 17:31:31 -06:00
f383f63eea
fix check-structures-sanity not catching certain types of invalid string on GCC builds.
...
update structures.
2020-02-21 17:31:31 -06:00
14eade3886
update structures
2020-02-21 02:52:56 -06:00
eb35ff9b47
update structures
2020-02-21 02:31:37 -06:00
f708bb5cff
update structures
2020-02-21 01:41:05 -06:00
38410544b0
handle tagged unions in check-structures-sanity
...
update structures
2020-02-20 22:17:25 -06:00
903f829e30
update structures
2020-02-20 20:19:50 -06:00
1beb0f417e
update structures
2020-02-20 17:44:24 -06:00
f81587bd82
update structures
2020-02-18 21:05:54 -06:00
0d36e62d81
fix some weird uses of the part of speech enum
2020-02-18 16:39:39 -06:00
c43c9de477
update structures
2020-02-18 16:33:24 -06:00
fce52866c7
update structures
2020-02-17 22:43:12 -06:00
91771f9c64
update structures
2020-02-17 22:02:25 -06:00
28bf6667cb
Update xml
2020-02-16 21:22:31 -05:00
a703e2b2fc
update structures
2020-02-16 19:02:36 -06:00
b033a215bd
update for Dwarf Fortress 0.47.03
2020-02-16 18:48:27 -06:00
4e42da9e4f
update structures
2020-02-16 10:36:06 -06:00
631b8e772c
update structures; fix -lowmem being enabled due to being uninitialized on the stack.
2020-02-15 16:10:54 -06:00
122169a559
update scripts and structures
...
fix a crash if check-structures-sanity was called with a lua expression that evaluated to nil
2020-02-15 12:04:00 -06:00
bc5b0a6dd0
update structures
2020-02-15 02:58:00 -06:00
99ccc55d65
update structures
2020-02-15 01:23:26 -06:00
c2584d615c
Define MapExtras::BiomeInfo::MAX_LAYERS ( #1496 )
...
Definition is required even for constexpr variables in some compilation
setups (e.g. debug builds).
2020-02-15 01:22:58 -06:00
9caf6e97e6
add -enums, -sizes, and specific starting point flags to check-structures-sanity
2020-02-14 19:47:26 -06:00
f7f7bd7ca7
update structures
2020-02-13 21:23:42 -06:00
69c4f5c972
update structures
2020-02-13 02:12:26 -06:00
8fe950f815
update structures
...
sizecheck no longer segfaults on the medium world
2020-02-13 00:52:00 -06:00
3996189f9f
update structures and scripts
2020-02-12 23:52:58 -06:00
e9a295c788
update structures
2020-02-12 19:00:18 -06:00
b754192f2d
update structures
2020-02-12 16:18:05 -06:00
ddc3cfcfbc
update structures
2020-02-12 13:34:04 -06:00
7bb921be19
update structures
2020-02-12 11:35:58 -06:00
3c9f6f79ab
fix some warnings
2020-02-10 19:35:17 -06:00
7b9ea1f1b6
update structures
2020-02-10 18:23:57 -06:00
69611ab325
exit if a fatal startup error is encountered while in headless mode ( #1491 )
2020-02-09 18:05:09 -06:00
5b56125ad6
update structures
2020-02-08 23:02:25 -06:00
b375586b67
Update to DF 0.47.02
2020-02-07 16:00:53 -06:00
0243e422e5
Allow plugins to define subclasses of dfhack_viewscreen that have their own virtual_identity.
2020-02-07 16:00:14 -06:00
5db7d518ee
update structures; fix some minor compile warnings
2020-02-05 12:35:43 -06:00
321d948f8d
Fix crash on missing symbols.
...
Fixes #1487 .
2020-02-03 20:21:10 -06:00
9c52b4e5e6
update structures
2020-02-02 17:31:01 -06:00
dfc90fe660
Update df-structures and scripts.
2020-02-02 17:10:11 -06:00
62e3802d26
Update to DF 0.47.01
2020-01-29 14:51:48 -06:00
121497a466
Propagated getBookTitle to Lua
2020-01-26 11:47:47 +01:00
876ac6c056
Renamed to getBookTitle, cut down on virtual_cast
2020-01-25 21:46:10 +01:00
c6bbf39c6c
Issue #1262 . Added Items::getTitle and used in stocks
2020-01-25 12:43:02 +01:00
815821eb93
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
depends/lua/CMakeLists.txt
plugins/CMakeLists.txt
plugins/devel/CMakeLists.txt
2020-01-18 22:28:43 -05:00
bb9bc4e353
Update submodules
2020-01-18 18:52:32 -05:00
96d8dffd32
Make dfhack.run_command return the command_result value.
...
Rename local variables to match dfhack.run_command_silent for clarity.
2020-01-14 17:53:52 -06:00
47fa9e1159
Update authors, submodules
2020-01-13 23:35:31 -05:00
5eca50476e
Merge remote-tracking branch 'nornagon/unit-description' into develop
2020-01-13 23:31:23 -05:00
be5dc2d4a4
Make Units::isGay act consistently when called on an asexual unit.
...
The function appears to be used to determine whether heterosexual relationships are possible, so asexual units will always return true for isGay.
Old behavior was to treat asexual units as male.
2020-01-09 14:48:30 -06:00
5de368a1ed
unit_{=> get_}physical_description
2020-01-04 22:17:03 +11:00
7644dde9e4
default to empty description if symbol unavailable
2019-12-14 12:01:13 -08:00
50e696acf6
getDescription => getPhysicalDescription
2019-12-14 09:36:47 -08:00
7fce6fe0b0
move THISCALL define to header, clean up code a little
2019-12-13 23:54:27 -08:00
dfab521a71
specify __thiscall
...
According to https://docs.microsoft.com/en-us/cpp/cpp/thiscall?view=vs-2019 , "on ARM and x64 machines, __thiscall is accepted and ignored by the compiler.". So it should be OK to specify this for all win32
2019-12-12 17:51:41 -08:00
9a37849603
use symbols.xml
2019-12-07 22:41:55 -08:00
910f965838
wip
2019-12-07 22:17:59 -08:00
49563b4618
Merge remote-tracking branch 'warmist/FilteredListFix' into develop
2019-11-02 16:28:06 -04:00
08aeb6faeb
Fix EventManager building ID type
...
The pointer to the building ID was sometimes not dereferenced properly.
Addressed by switching to an ID cast to a pointer type for consistency with
other types of events.
Fixes #1434
Ref #1003 (19695b4ee7#1253 (a7dfacd1c5
2019-10-05 20:26:31 -04:00
7d5970303f
Update xml ( dfhack/df-structures#286 )
2019-10-04 00:14:08 -04:00
ca7d0f1cac
Add algorithm include for MSVC
2019-10-03 23:26:57 -04:00
f3658db85f
Merge branch 'develop' into avoid_rebuilding_df_statics_if_core_h_changes
2019-10-03 23:23:36 -04:00
a2b5c1ddd9
lua/widgets filtered list input fix
...
FilteredList was not consuming input events.
2019-09-30 22:00:06 +03:00
ac5a54c8db
Merge branch 'develop' into cmake-cleanup
...
Conflicts:
library/CMakeLists.txt
plugins/CMakeLists.txt
2019-08-23 23:58:00 -04:00
0f4162acc9
Merge pull request #1402 from BenLubar/persist
...
Add Persistence module.
2019-08-23 23:37:06 -04:00
222b88063c
Update submodules
2019-08-23 21:37:50 -04:00
2ef46562c8
Avoid calling doSaveData twice when unloading a world
...
This was happening because of a switch to viewscreen_game_cleanerst and back to
viewscreen_savegamest when saving
2019-08-23 20:45:35 -04:00
100e584c34
Fix saving persistent data on regular save
2019-08-23 20:30:06 -04:00
07575095fd
Merge branch 'develop' into persist
2019-08-22 22:00:50 -04:00
88757d5c27
Merge branch 'develop' into cmake-cleanup
2019-07-20 19:22:33 -04:00
99038c395a
Merge remote-tracking branch 'ab9rf/biometype' into develop
2019-07-20 16:32:46 -04:00
8a07426643
Merge branch 'develop' into cmake-cleanup
2019-07-20 15:15:39 -04:00
49f3de979f
Make ServerMain and ServerConnection data race free
...
RemoteServer and PluginManager side would need complete redesign to be
data race free and concurrent. But as that would be unlikely to be
required from DFHack I decided simpler solution that is fixing data
ownership to a thread and all ServerConnection share a single lock which
allows access to PluginManager and Core.
2019-07-18 23:05:11 -04:00
0605b9601c
Make Core::started thread safe
2019-07-18 23:05:11 -04:00
0ed5c8db39
Fix data race between threaded init and EventManager
...
The initial run_dfhack_init loads shared state information that is used
by EventManager when state changes. There is a small risk that
EventManager can handle events while run_dfhack_init is still running.
2019-07-18 23:04:40 -04:00
76da2c2aaf
Clean up CMakeLists.txt style
2019-07-16 22:19:11 -04:00
b60faa8021
dfhack-run: add note about installation when called with no arguments
2019-07-13 15:51:46 -04:00
c125926727
Update submodules and Authors.rst
...
Ref #1432
Ref dfhack/stonesense#54
Ref dfhack/scripts#93
2019-07-10 19:21:23 -04:00
5b11d14c6c
Rename save/load to "save data"/"load data"
2019-05-29 19:52:03 -04:00
ceebef5fe2
Merge branch 'develop' into persist
2019-05-28 21:08:16 -04:00
dd9c433f17
Use BYPRODUCTS to keep ninja builds from re-running codegen every time
...
This partially reverts f02466de8ahttps://cmake.org/cmake/help/v3.14/command/add_custom_command.html :
> The `BYPRODUCTS` option is ignored on non-Ninja generators except to mark
> byproducts `GENERATED`.
Since `$GENERATED_HDRS` are already marked generated, this change should have
no effect on non-Ninja generators.
2019-05-13 19:47:39 -04:00
32a0ab9679
Update submodules
2019-05-11 23:34:59 -04:00
e5eade1ad7
Make gui.dwarfmode.{get_movement_delta,get_hotkey_target} public
2019-04-30 16:53:09 -04:00
6c266075de
Console-posix: fix crash with prompts longer than screen width
...
Also add an extra fallback check around substr
Fixes #1425
2019-01-15 21:06:49 -05:00
f0632347d0
Remove Core.h include from DataDefs.h
...
Core.h isn't required for DataDefs.h which removes Core.h dependency
from DataStatics*.
2018-12-30 17:08:42 -05:00
e74946f62e
Update xml and related changelog entries
2018-12-27 17:37:13 -05:00
a2f8742128
Merge remote-tracking branch 'suokko/runtime_debug_prints' into develop
...
Also fix and reorganize changelog
2018-12-27 16:28:25 -05:00
13c6bfc1b2
Merge remote-tracking branch 'sgayda2/memory_fixes' into develop
2018-12-22 11:54:31 -05:00
b913076451
Update xml, stonesense, changelog
...
Merged DFHack/df-structures#296 and (modified) attached changelog
entry
2018-11-24 17:09:24 -05:00
368f8d0504
Remove and replace checks for OnBreak
2018-11-24 14:52:26 -05:00
02f047e9f1
a pox on whitespace
2018-09-11 18:41:32 -05:00
3817773b5a
eliminate stray whitespace
2018-09-11 17:32:33 -05:00
10267f3e70
Only save on the first frame of the save screen.
2018-08-26 19:11:41 -05:00
a672ffcb95
Use viewscreen_savegamest instead of viewscreen_optionst
2018-08-26 19:05:44 -05:00
4e690df96a
Add Persistence module.
...
Alter World to use Persistence instead of storing data in historical figures.
Fake historical figures will be converted to the new format when a world is loaded.
Added plugin_save and plugin_load functions to the plugin API.
Made the weird int7/int28 code that was in the old persistence API slightly safer.
2018-08-26 18:27:58 -05:00
338572d270
resolve uninitialized variable warning
2018-08-16 12:15:56 -05:00
59d70d6687
Add function to infer biome type to Maps module
...
This moves code intended to infer biome type currently living in a
couple of plugins into the Maps module, so that this code can be shared
more easily by multiple plugins, as discussed in #1392 .
2018-08-15 20:28:18 -05:00
e56cb2a25a
Update xml (setup_character_info.skill_points_remaining)
2018-08-04 00:59:15 -04:00
9bd5ecd738
Merge pull request #1372 from BenLubar/dfhack-viewscreen-identity
...
Add an identity to dfhack_viewscreen and dfhack_lua_viewscreen.
2018-07-26 16:06:24 -04:00
4837e65322
Add an identity to dfhack_viewscreen and dfhack_lua_viewscreen.
2018-07-22 17:31:39 -05:00
c53353fc28
Update changelog, xml
2018-07-20 23:29:24 -04:00
163c9b4059
Add utils.OrderedTable, make test order consistent
...
Also added OrderedTable tests and comment support to expect.*()
2018-07-19 12:40:25 -04:00
063602349c
Add a basic test library and a couple GUI module tests (squashed)
...
Also modified Core/Console a bit to get this to actually produce output on
Travis (DFHACK_DISABLE_CONSOLE now allows console output, just not input)
Squashed merge from lethosor/tests
2018-07-18 14:29:13 -04:00
3b44c18576
Followups for #1325
...
- Fix git tag detection
- Fix changelog entry position
- Update/clean up docs some
2018-07-17 00:58:49 -04:00
1d6c3dc871
Merge remote-tracking branch 'suokko/fix_cmake_dependencies_to_generated_headers' into develop
2018-07-17 00:24:18 -04:00
38cccdb0f4
Update the module create calls to return unique_ptrs
2018-07-14 19:55:25 -07:00
6f90273bb6
More usage of smart pointers throughout core and version info.
2018-07-14 19:55:25 -07:00
699f864110
use dts::make_unique instead of new
2018-07-14 19:51:46 -07:00
6cfd987c0d
Remove an outdated comment, with c++11 enabled the code is thread safe
2018-07-14 19:51:46 -07:00
12c8046f90
Some memory management changes for Core
2018-07-14 19:51:46 -07:00
b5ddde8475
Use a shared_ptr to avoid having to manage VersionInfo vector memory
2018-07-14 19:51:46 -07:00
c127ceab96
Use a unique_ptr for VersionInfo to avoid worrying about memory
2018-07-14 19:51:46 -07:00
790d16cc1c
Merge remote-tracking branch 'sgayda2/call_once' into develop
2018-07-14 21:08:15 -04:00
99d05117ab
fix a return statement in FirstCall
2018-07-14 12:15:52 -07:00
c2a64b3573
Update changelog, xml, bump to r1
2018-07-13 21:16:35 -04:00
f85b2c2b3c
Merge branch 'develop' of gh:dfhack/dfhack into develop
2018-07-13 20:00:52 -04:00
78f2431c93
Update xml
2018-07-13 19:59:46 -04:00
b44789285c
Fix Windows df-structures stubs failing to compile if the option to keep symbols is specified.
2018-07-13 15:49:37 -05:00
f02466de8a
Correct codegen.pl output dependecies for VC
...
The change allows correct and optimized incremental builds with VC and
ninja but unix makefile backend will rebuild everything if anything
changes in structures.
2018-07-13 17:01:36 +03:00
bc8b8ef256
Use configure_file to optimize incremental builds for git-describe.h
2018-07-13 16:07:46 +03:00
c92b52537c
Only run once codegen.pl and git-describe.cmake with make
...
ninja has a single build file which avoided issues if multiple targets
depend on same files. But Unix Makefiles generator user recursive make
which requires each ADD_CUSTOM_COMMAND to have only one target depending
on them.
Then makefile generator also has stupid rule that it touches all
secundary output files if primary file has been updated.
It was surprising hard to find a version that actually works correctly
for both issues. Solution is using BYPRODUCTS and refactoring command
and target dependencies.
As a bonus this change now allows build to work from source tarball if
the tarball includes git-describe.h.
2018-07-13 15:23:54 +03:00
fad9d58ac6
Keep git-describe.h in source tree
...
Temporary file goes to binary directory to avoid race between
simultanous builts.
2018-07-13 15:16:04 +03:00
68d1dfa0da
Keep make output short
...
Without custom comment add_custom_command would list all target files.
2018-07-13 15:15:42 +03:00
3f34ea196b
Fix build not to delete git-describe.h
...
make doesn't keep primary output file if secundary is missing.
always_rebuild must be primary output to make the phony command work
correctly.
2018-07-13 15:15:42 +03:00
2956e654d4
Add dependency from codegen.pl to df/*.h
2018-07-13 15:15:42 +03:00
5154370402
Add full paths to codegen.pl error messages
...
I noticed that relative paths were not correctly guessed by vim. I
decided to fix the paths to allow me quickly to jump to error line in
xml.
2018-07-13 15:15:42 +03:00
b3b23e8278
Add dependency from git-describe.h to DFHackVersion.cpp
...
Using add_custom_command allows cmake to track dependency from command
to git-describe.h that is implicit dependency of DFHackVersion.cpp.
The change also fixes issues if there is multiple build directories and
git-describe.h missing but git-dsecribe.h.tmp is present.
2018-07-13 15:15:39 +03:00
9ee368d456
Merge remote-tracking branch 'suokko/MapCache_reduce_latency_from_designation_to_jobs' into develop
2018-07-11 11:51:24 -04:00
7afa3690bf
Add support for DFHACK_BUILD_ID
...
Used for BuildMaster builds, for example
2018-07-11 11:47:55 -04:00
2d8be8f4ad
Update xml (dlsym vtables, dfhack/df-structures#282 )
2018-07-10 13:01:54 -04:00
fa8c6724f6
Merge remote-tracking branch 'suokko/dlsym_libgraphics' into develop
2018-07-10 12:25:11 -04:00
dd3c04eb26
Merge remote-tracking branch 'suokko/windows_crash_after_die' into develop
2018-07-10 11:57:10 -04:00
06511340ab
Merge remote-tracking branch 'BenLubar/proto-docs' into develop
2018-07-10 11:26:31 -04:00
7d92d3f48f
Fix the class vs struct warning
2018-07-10 18:24:34 +03:00
5eea7198a9
Make Core::~Core safe to call after die
...
Fixes #1356
2018-07-10 18:24:34 +03:00
4a842810d5
Update xml, changelog
2018-07-10 11:24:26 -04:00
ce6af3d649
Use c++ standard std::_Exit instead of _exit
...
_exit seems to run dll unloading code which calls static destructors.
Standrd requires std::_Exit not to call destructors which makes using it
attractive in case MSVC actually follows the standard.
2018-07-10 18:21:09 +03:00
96c9b8b864
Add windows emulation for RTLD_DEFAULT
...
I'm not sure if calling GetModuleHandle in static construction is safe.
But I assumme it is and works correctly.
There is still potential issue that documentation can be understood
meaning that the HMODULE will resolve only symbols from exe while
RTLD_DEFAULT resolves all global symbols.
2018-07-10 17:10:30 +03:00
ca5c11603f
Support dlsym loading from libgraphics vtables
2018-07-10 17:08:23 +03:00
2dac3c53c7
Add stress cutoffs to Units module, fix dwarfmonitor/manipulator
...
Fixes #1292
2018-07-09 15:59:12 -04:00
46e53fc3b3
Make df2console only call df2utf if the output stream is a console
...
Fixes output in command-prompt, for example
2018-07-09 11:00:28 -04:00
7fcc6be6f6
Update xml, changelog
2018-07-09 10:46:19 -04:00
ab179bbf42
Fix crash when editing lines that are exactly console width
...
plen+cooked_cursor==cols => begin = -1 which is passed to substr. The
sign is incorrect as code should be removing a character from begin
instead of trying to add a character.
2018-07-09 16:12:39 +03:00
e96c6f07ce
fixes from comments
2018-07-08 15:53:26 -07:00
68770ecbf2
Use std::call_once to ensure thread safety and a single call to initialize the SDL pointers
2018-07-08 12:52:06 -07:00
5d16e5a74c
Bump to 0.44.12-alpha1
2018-07-08 14:26:57 -04:00
480907259c
Rename ui_sidebar_menus.command_line field
...
Ref dfhack/df-structures#277
2018-07-07 23:51:20 -04:00
03b01048d7
Merge remote-tracking branch 'BenLubar/linked-list' into develop
2018-07-07 23:49:53 -04:00
037e7e4901
Merge remote-tracking branch 'suokko/spotclean_ui_state_fix_1194' into develop
...
Moved/adjusted changelog entry
2018-07-07 18:08:53 -04:00
dec61b89be
Fix windows ReadConsoleInput return value check
...
I messed up the check. I forgot that windows commonly has opposite
return values to posix and failed to check it from documentation.
Fixes 1345
2018-07-08 00:50:43 +03:00
lethosor
Myk Taylor
Ben Lubar
PatrikLundell
Quietust
Pierre-David Bélanger
nicolasayala
Timur Kelman
Clément Vuchener
Jeremy Apthorp
Warmist
Alan
Pauli
Kelly Kinkade
Stoyan Gaydarov