MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'third-party-scripts' into develop

develop
expwnent 2015-09-25 17:48:25 -04:00
parent 5b5dd3aeae 8cc0a0bd42
commit a188b9d567
10 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitmodules vendored
Unescape Escape View File

@ -15,4 +15,19 @@
url = git://github.com/DFHack/clsocket.git url = git://github.com/DFHack/clsocket.git
[submodule "scripts/3rdparty/lethosor"] [submodule "scripts/3rdparty/lethosor"]
path = scripts/3rdparty/lethosor path = scripts/3rdparty/lethosor
url = https://github.com/DFHack/lethosor-scripts url = git://github.com/DFHack/lethosor-scripts
[submodule "scripts/3rdparty/roses"]
path = scripts/3rdparty/roses
url = git://github.com/DFHack/roses-scripts.git
[submodule "scripts/3rdparty/maxthyme"]
path = scripts/3rdparty/maxthyme
url = git://github.com/DFHack/maxthyme-scripts.git
[submodule "scripts/3rdparty/dscorbett"]
path = scripts/3rdparty/dscorbett
url = git://github.com/DFHack/dscorbett-scripts.git
[submodule "scripts/3rdparty/kane-t"]
path = scripts/3rdparty/kane-t
url = git://github.com/DFHack/kane-t-scripts.git
[submodule "scripts/3rdparty/maienm"]
path = scripts/3rdparty/maienm
url = git://github.com/DFHack/maienm-scripts.git

4
dfhack.init-example
Unescape Escape View File

@ -241,6 +241,10 @@ log-region
# add information to item viewscreens # add information to item viewscreens
view-item-info enable view-item-info enable
gui/load-screen enable
base/roses-init --all
####################################################### #######################################################
# Apply binary patches at runtime # # Apply binary patches at runtime #
####################################################### #######################################################

12
library/CMakeLists.txt
Unescape Escape View File

@ -372,12 +372,12 @@ install(DIRECTORY lua/
DESTINATION ${DFHACK_LUA_DESTINATION} DESTINATION ${DFHACK_LUA_DESTINATION}
FILES_MATCHING PATTERN "*.lua") FILES_MATCHING PATTERN "*.lua")
install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts #install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts
DESTINATION ${DFHACK_DATA_DESTINATION} # DESTINATION ${DFHACK_DATA_DESTINATION}
FILES_MATCHING PATTERN "*.lua" # FILES_MATCHING PATTERN "*.lua"
PATTERN "*.rb" # PATTERN "*.rb"
PATTERN "3rdparty" EXCLUDE # PATTERN "3rdparty" EXCLUDE
) # )
install(DIRECTORY ${dfhack_SOURCE_DIR}/patches install(DIRECTORY ${dfhack_SOURCE_DIR}/patches
DESTINATION ${DFHACK_DATA_DESTINATION} DESTINATION ${DFHACK_DATA_DESTINATION}

1
scripts/3rdparty/dscorbett vendored

@ -0,0 +1 @@
Subproject commit 544f890a62622e2c6188991afe61fdf3c0513227

1
scripts/3rdparty/kane-t vendored

@ -0,0 +1 @@
Subproject commit 462d68598a0ddbaca710e07013efbaabe464a695

2
scripts/3rdparty/lethosor vendored

@ -1 +1 @@
Subproject commit ceed207e38220e21067a91b8d6f7b9680a476f69 Subproject commit e3666a7385ca00565b95f3d7c6d41f6e7955816f

1
scripts/3rdparty/maienm vendored

@ -0,0 +1 @@
Subproject commit 8cffa1266d8903b568cf48366dd6f57095e3ae97

1
scripts/3rdparty/maxthyme vendored

@ -0,0 +1 @@
Subproject commit 7781264a20026c7db927255b7ce34caaacc52e54

1
scripts/3rdparty/roses vendored

@ -0,0 +1 @@
Subproject commit ce11419ef8ce026af883ce81205268eb0cc1a2b1

12
scripts/CMakeLists.txt
Unescape Escape View File

@ -1,2 +1,14 @@
include(Scripts.cmake) include(Scripts.cmake)
DFHACK_3RDPARTY_SCRIPT_REPO(dscorbett)
DFHACK_3RDPARTY_SCRIPT_REPO(kane-t)
DFHACK_3RDPARTY_SCRIPT_REPO(lethosor) DFHACK_3RDPARTY_SCRIPT_REPO(lethosor)
DFHACK_3RDPARTY_SCRIPT_REPO(maienm)
DFHACK_3RDPARTY_SCRIPT_REPO(maxthyme)
DFHACK_3RDPARTY_SCRIPT_REPO(roses)
install(DIRECTORY ${dfhack_SOURCE_DIR}/scripts
DESTINATION ${DFHACK_DATA_DESTINATION}
FILES_MATCHING PATTERN "*.lua"
PATTERN "*.rb"
PATTERN "3rdparty" EXCLUDE
)