Commit Graph

14909 Commits (c63906a91c6fd532502950db38c418742fa985f6)
 

Author SHA1 Message Date
Myk Taylor 8900bc84d8
fix crash in buildingplan
when a player cancels out of placing a building type with plan mode
enabled and then immediately switches to placing a different building
type where plan mode is not enabled, the placement errors array would be
erroneously cleared and allow placement of the building. this would
cause DF to crash if there were no materials available to build the
building with.
2022-11-30 04:51:11 -08:00
Myk Taylor cd69103b8b
update path references, move NEWS files back 2022-11-30 04:16:41 -08:00
Myk Taylor e952957f91
move dev docs into dev dir 2022-11-30 04:01:32 -08:00
Myk Taylor 64ce2559fd
move "about" docs into subdir 2022-11-30 03:46:21 -08:00
Myk Taylor f66a08d3f4
fix numbering of markdown list 2022-11-30 03:25:56 -08:00
Myk 018bf712d5
Merge pull request #2429 from cppcooper/patch-3
Updates Units::isAnimal
2022-11-29 18:43:04 -08:00
Myk 73ded20ffe
Merge pull request #2445 from ab9rf/fix-2444
correct QUERN construct labor
2022-11-29 18:42:18 -08:00
Kelly Kinkade 5e3786a6ce changelog 2022-11-29 19:57:44 -06:00
Kelly Kinkade bc502f8132 correct QUERN construct labor 2022-11-29 18:32:57 -06:00
Myk b7bb0c49e6
Merge pull request #2430 from myk002/myk_overlay_gui_prep
[overlay] prep lua code for usage by gui/overlay
2022-11-29 15:15:48 -08:00
Myk 33d54493f2
fix typo in docs 2022-11-29 15:14:22 -08:00
myk002 4c72bdb5ed add reference to gui/overlay to the overlay docs 2022-11-29 15:12:02 -08:00
myk002 f5d20c99a3 prep for usage by gui/overlay 2022-11-29 15:12:02 -08:00
myk002 9d17be84a8 set width to something representative on init
so if the widget is enabled in gui/overlay without ever being resized with real data,
it won't be truncated
2022-11-29 15:12:02 -08:00
DFHack-Urist via GitHub Actions c866f3f155 Auto-update submodules
scripts: master
2022-11-29 23:10:05 +00:00
Myk 9038c1c568
Merge pull request #2437 from myk002/myk_ctest
Combine unit testing branches and simplify
2022-11-29 15:07:47 -08:00
Myk 04bdce0d40
Merge pull request #2435 from myk002/myk_default_search_key
supply default search key for tokenized text
2022-11-29 15:07:23 -08:00
Myk aac89d4942
Merge branch 'develop' into myk_default_search_key 2022-11-29 15:07:12 -08:00
Myk 5b311163a9
Merge pull request #2431 from myk002/myk_widget_fixes
fix minor errors in ResizablePanel, Label, and HotkeyLabel widgets
2022-11-29 15:06:15 -08:00
Myk 3e0a44d068
Merge pull request #2432 from myk002/myk_no_signature
allow frames to be drawn without the DFHack signature
2022-11-29 15:05:59 -08:00
Myk 757aa303b7
Update library/MiscUtils.test.cpp
Co-authored-by: Josh Cooper <cppcooper@users.noreply.github.com>
2022-11-29 15:05:04 -08:00
Josh Cooper 807894ac6c Updates Units::isAnimal
Now checks that the unit cannot learn or speak, and has either a wilderness population source, a pet/pet_exotic token, or is trainable for war/hunting
2022-11-29 13:19:19 -08:00
myk002 d0a6a3e930
remove unnecessary target modifications 2022-11-28 17:43:55 -08:00
myk002 88074dacf0
move tests into the same dir as the main files 2022-11-28 17:31:10 -08:00
myk002 7fbeb215d7
Merge branch 'myk_unit_testing' into myk_ctest 2022-11-28 17:26:27 -08:00
myk002 f921b02a1b
Merge remote-tracking branch 'cppcooper/unit-testing' into myk_ctest 2022-11-28 17:25:10 -08:00
myk002 a22e3117d3
simplify the github action to just ninja test
since ninja all was just run
2022-11-28 17:22:17 -08:00
myk002 ae035d5836
simplify unit testing setup 2022-11-28 17:16:48 -08:00
Josh Cooper 3999ed5c72 Implements plugin: channel-safely v1.1b 2022-11-28 17:10:55 -08:00
myk002 e4c13114a9
Merge branch 'develop' into myk_unit_testing 2022-11-28 16:36:28 -08:00
myk002 726771c8d3
supply default search key for tokenized text 2022-11-28 16:02:47 -08:00
myk002 23e467deaf
use consistent bounds checking style in hotkeys 2022-11-28 15:50:05 -08:00
myk002 4e7b4dc554
show hotkeys bound to number keys, F11, and F12 2022-11-28 15:37:01 -08:00
myk002 adb9c5ea12
fix frame size calculation when frame_inset is set
also fix error when clicking on HotkeyLabels where no on_activate
callback has been set
2022-11-28 15:12:22 -08:00
myk002 fb6483fe6c
allow frames to be drawn without DFHack signature 2022-11-28 15:04:28 -08:00
Josh Cooper 72ad7a1b01 Adds googletest/include for test targets only 2022-11-25 09:43:04 -08:00
Josh Cooper b11b1c3d5f Updates build.yml & moves TEST variable setup 2022-11-25 09:43:04 -08:00
Josh Cooper d03f93c0d7 Adds a second test stage 2022-11-25 09:43:04 -08:00
Josh Cooper cd7fe8a213 Update .gitmodules
Co-authored-by: Alan <lethosor@users.noreply.github.com>
2022-11-25 09:43:04 -08:00
Josh Cooper a716b2796e Updates test binary name in build.yml 2022-11-25 09:43:04 -08:00
Josh Cooper 25f87306b4 Removes separated unit test executables 2022-11-25 09:43:04 -08:00
Josh Cooper 69d988332c Updates build.yml to call test-all 2022-11-25 09:43:04 -08:00
Josh Cooper 79551f7ef0 Updates CMake TESTING vars 2022-11-25 09:43:04 -08:00
Josh Cooper 3e2d0f2ec2 Updates GithubActions yml file to use new BUILD_TESTING variable 2022-11-25 09:43:04 -08:00
Josh Cooper de91fa7f28 Adds -Wno-sign-compare to test targets 2022-11-25 09:43:04 -08:00
Josh Cooper 9fdb2f7e47 Adds -Wno-sign-compare to gtest target 2022-11-25 09:43:04 -08:00
Josh Cooper 32b030e348 Adds -Wno-maybe-uninitialized to gtest target 2022-11-25 09:43:04 -08:00
Josh Cooper e1f9a95d4f Rolls back googletest to release-1.8.1 2022-11-25 09:43:04 -08:00
Josh Cooper 268719ed1f Integrates googletest 2022-11-25 09:43:04 -08:00
Tim Siegel 8e18d610f5 cmake: Add SDL dep for Linux dfhack; deprecate BUILD_TESTS
On Linux, libdfhack.so depends on libSDL.so, but that was not marked
inside CMake. As it's only used via LD_PRELOAD, there was no problem.
But when linking unit tests against it, this becomes necessary. It may
be wise to add a find_package(SDL) to provide the user with more
control, but just a hard-coded "SDL" should work for most installs.

The CTest module creates a BUILD_TESTING option, which clashes
(thematically, not in code) with the existing BUILD_TESTS option.
Resolve it thus:
- Deprecate BUILD_TESTS; it still works, but is marked as an advanced
  option so it doesn't show in the CMake UI by default.
- Add a new BUILD_TEST_SCRIPTS that does what BUILD_TESTS used to do,
  but is a "dependent" option so it goes away if BUILD_TESTING=OFF.

The up-shot is that, by default, the C++ unit tests will be built
(BUILD_TESTING=ON) and the Lua integration tests are not installed
(BUILD_TEST_SCRIPTS=OFF).
2022-11-25 09:43:04 -08:00