Commit Graph

8642 Commits (99490aff418c6afd20ef382e579b08ae61998f1b)
 

Author SHA1 Message Date
Kelly Kinkade 99490aff41 add support for craft item from pearl jobs (fixes #1162) 2018-07-30 21:32:15 -05:00
Ben Lubar 0983891089
Merge pull request #1367 from BenLubar/msvc-cmake-ninja
Change CMakeSettings.json to use Ninja. Add DFHACK_INCLUDE_CORE option for easier development.
2018-07-27 09:35:33 -05:00
Lethosor 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
Ben Lubar 977ef1a351
Get intellisense and code analysis working in CMakeSettings.json. 2018-07-23 16:14:22 -05:00
Ben Lubar a85d59787a
Add intellisenseMode to CMakeSettings.json. 2018-07-23 12:55:23 -05:00
Ben Lubar 4837e65322
Add an identity to dfhack_viewscreen and dfhack_lua_viewscreen. 2018-07-22 17:31:39 -05:00
lethosor d9fb364b3f Fix prospector out-of-bounds crash and improve checking
Fixes #1370
2018-07-21 00:27:11 -04:00
lethosor 8cafa2f58a License: sort, fix caps 2018-07-21 00:03:45 -04:00
lethosor c53353fc28 Update changelog, xml 2018-07-20 23:29:24 -04:00
lethosor 8bfa96f701 Update docs for #1365 2018-07-20 23:16:50 -04:00
lethosor 61df5e5286 Merge remote-tracking branch 'KlonZK/patch-1' into develop 2018-07-20 23:16:28 -04:00
Ben Lubar 40669d7a63
Change CMakeSettings.json to use Ninja.
Add DFHACK_INCLUDE_CORE option for easier development.
2018-07-20 13:29:18 -05:00
lethosor 09ec8910ca Avoid clearing CMAKE_CXX_FLAGS for plugins 2018-07-19 15:32:08 -04:00
lethosor af53fe6740 embark-assistant: fix x=16, y=16 dimensions 2018-07-19 14:48:28 -04:00
lethosor 46a28c5f52 Merge branch 'tests' into develop 2018-07-19 14:39:32 -04:00
lethosor 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
lethosor 0128bc39db Don't include stdout.log in build output
This has ncurses output in it
2018-07-19 11:43:43 -04:00
lethosor 5d3126403b Switch back to coroutines for tests 2018-07-19 11:26:38 -04:00
lethosor 1a2694fa2c Merge remote-tracking branch 'BenLubar/custom-plugins-cmake' into develop 2018-07-18 19:09:05 -04:00
lethosor 777a9147df Restore some important travis settings (build supported plugins again) 2018-07-18 15:20:10 -04:00
Ben Lubar 3e82bd8f35
Ignore CMakeLists.custom.txt and create it if it does not exist during cmake. 2018-07-18 14:00:40 -05:00
lethosor 75793c6750 Travis: remove DFHack-built things in DF folder from cache 2018-07-18 14:32:47 -04:00
lethosor 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
lethosor a779b247d4 Travis: fix Ninja build 2018-07-17 11:53:24 -04:00
lethosor 1ebac6fad9 travis: use ninja 2018-07-17 11:49:15 -04:00
lethosor 4070b5235e Merge branch 'docs' into develop 2018-07-17 11:11:31 -04:00
lethosor 55d5d47776 Fix architecture note in compile docs 2018-07-17 11:10:46 -04:00
lethosor 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
lethosor 1d6c3dc871 Merge remote-tracking branch 'suokko/fix_cmake_dependencies_to_generated_headers' into develop 2018-07-17 00:24:18 -04:00
KlonZK 29f6131e26
fix custom animation tables
move "local frames" from inside the block to outside.
2018-07-16 10:39:05 +02:00
lethosor 44b7e8df71 Update docs for #1351 2018-07-14 21:09:36 -04:00
lethosor 790d16cc1c Merge remote-tracking branch 'sgayda2/call_once' into develop 2018-07-14 21:08:15 -04:00
Stoyan Gaydarov 99d05117ab fix a return statement in FirstCall 2018-07-14 12:15:52 -07:00
lethosor c2a64b3573 Update changelog, xml, bump to r1 2018-07-13 21:16:35 -04:00
lethosor f85b2c2b3c Merge branch 'develop' of gh:dfhack/dfhack into develop 2018-07-13 20:00:52 -04:00
lethosor 78f2431c93 Update xml 2018-07-13 19:59:46 -04:00
lethosor 210510591b Merge remote-tracking branch 'PatrikLundell/embark-assistant' into develop 2018-07-13 19:58:27 -04:00
Ben Lubar 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
PatrikLundell baef5ca319 Added Finder scrolling and Frozen search 2018-07-13 20:44:11 +02:00
PatrikLundell 1af0ec4006 Added Finder scrolling and Frozen search 2018-07-13 20:43:49 +02:00
PatrikLundell 3d5cadeb8c Merge branch 'embark-assistant' of https://github.com/PatrikLundell/dfhack into embark-assistant 2018-07-13 17:53:34 +02:00
PatrikLundell 4137a17a78 Added Finder scrolling and Frozen search 2018-07-13 17:43:46 +02:00
PatrikLundell 658fac0b93 Added Finder scrolling and Frozen search 2018-07-13 17:43:22 +02:00
Pauli cb77c91049 Update Compile.rst to prefer ninja 2018-07-13 18:38:58 +03:00
Lethosor 3e47de5b45
Merge branch 'develop' into embark-assistant 2018-07-13 11:33:57 -04:00
PatrikLundell fdf52deb36 Added Finder scrolling and Frozen search 2018-07-13 17:23:34 +02:00
PatrikLundell 02dd97722c Added Finder scrolling and Frozen search 2018-07-13 17:23:12 +02:00
PatrikLundell 4d3f9ce13d Added Finder scrolling and Frozen search 2018-07-13 17:22:49 +02:00
PatrikLundell 539428b741 Added Finder scrolling and Frozen search 2018-07-13 17:22:26 +02:00
PatrikLundell f41715309a Added Finder scrolling and Frozen search 2018-07-13 17:21:42 +02:00