mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:19:55 +00:00
Code Issues Releases Wiki Activity
20235 commits 38 branches 54 tags 122 MiB
Commit graph

186 commits

Author SHA1 Message Date
David Cernat
e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 2017-10-16 07:37:29 +03:00
AnyOldName3
a52c485090 Fix list length error 2017-10-12 18:16:10 +01:00
AnyOldName3
6af8ad70a5 Remove superfluous copy_all_files macro 2017-10-12 17:50:20 +01:00
AnyOldName3
76c4ff983a Fix getting cmake property as variable 2017-10-12 17:17:25 +01:00
AnyOldName3
1f86fa3c31 Fix resource copying on non-MSVC targets 2017-10-12 17:09:01 +01:00
AnyOldName3
b00b94f0db Use CMAKE_CONFIGURATION_TYPES instead of manually listing the possible configuration types. 2017-10-12 15:40:37 +01:00
AnyOldName3
f9a3562ccd Remove duplicate macro definition and fix warning 2017-10-12 02:45:50 +01:00
AnyOldName3
5ceaaabeb2 Remove MESSAGE calls I accidentally left in 2017-10-11 22:08:49 +01:00
AnyOldName3
f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 2017-10-11 21:58:55 +01:00
David Cernat
bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 2017-09-12 07:38:49 +03:00
AnyOldName3
afbdc27a34 Move calls to cmake_minimum_required as early in the CMake process as possible. 2017-09-10 18:30:10 +01:00
AnyOldName3
de14e43680 Seemingly fix everything by setting policies that were unset upon entering the macro 2017-09-10 03:18:22 +01:00
AnyOldName3
33c77d7a2a Try using cmake_parse_arguments to make the macro work 2017-09-09 17:22:55 +01:00
krizd
c9f099ce07 Change CMake version check to include 3.8 2017-09-09 03:06:03 +01:00
AnyOldName3
5ce34f1cbf Move new behaviour into macro to reduce code duplication 2017-09-08 22:17:42 +01:00
Koncord
b847914d6f [General] Fix finding CallFF includes 2017-07-04 01:15:11 +08:00
Koncord
1c09e0c255 [Server] Add CallFF dependency 2017-06-30 17:58:41 +08:00
Koncord
9506f9ca35 [General] Allow luajit-2.1 2017-06-30 04:00:43 +08:00
Koncord
2d91c60a11 [General] Change "Lib" to "lib" in FindRakNet cmake module 2017-06-15 13:07:13 +08:00
Koncord
056ec2d434 [General] Fix CMake errors 2017-05-25 23:56:22 +08:00
Koncord
a27815fa7d [General] Allow backslashes in add_component_dir to specify subgroups 2017-04-22 13:56:03 +08:00
Koncord
505905ab7d [General] Allow backslashes in add_openmw_dir to specify subgroups 2017-04-18 16:49:21 +08:00
David Cernat
1d83098619 [Build] Use slilghtly retooled version of CMake's default FindLua51 2017-03-24 07:29:04 +02:00
David Cernat
e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
7f429f26e1 Allow getting available version information even when clone is shallow 2017-03-07 21:53:49 +01:00
David Cernat
fb34e2c4ba Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix" 
This reverts commit faf1c416f3.
 2017-02-23 02:29:25 +02:00
Battlerax
faf1c416f3 [Build] Fix for MSYS2 build while maintaining MSVC fix 2017-02-22 16:22:05 -06:00
Battlerax
b47260f9dc [Build] Fixed linker issue 2017-02-22 15:49:46 -06:00
David Cernat
213bc1e733 Print correct variable for Terra's library 2017-01-12 13:46:17 +02:00
David Cernat
10a0f165dd Print paths used for server dependencies in CMake, change tabs to spaces 2017-01-12 13:45:04 +02:00
Koncord
cbae39412a Fix RakNet module 2017-01-03 19:07:42 +08:00
U-VirtualBox-PC\Admin
6229269506 Some patches for lua on windows 2016-12-16 19:04:47 +03:00
David Cernat
436548413e Resolve conflicts in pull request #39 
# Conflicts:
#	CMakeLists.txt
 2016-08-18 15:10:52 +03:00
scrawl
b26478b860 Merge pull request #1028 from kpp/find_osg_plugins 
Find osg_plugins
 2016-08-16 17:05:44 +02:00
scrawl
ec14fe4d4c Merge pull request #1026 from kpp/find_sphinx 
Fix FindSphinx.cmake
 2016-08-16 16:49:43 +02:00
Roman Proskuryakov
0d83121a6f Removes unused FindPkgMacros 2016-08-16 06:06:30 +03:00
Roman Proskuryakov
95dc1258d6 Rewrites find_package for OpenSceneGraph plugins using LibFindMacros and osg_find_library 2016-08-16 06:06:30 +03:00
Roman Proskuryakov
ed2c2170f0 Rewrites FindSDL2 using LibFindMacros 2016-08-15 23:57:39 +03:00
Roman Proskuryakov
3df57b1833 Fixes LibFindMacros for libfind_process 2016-08-15 23:55:53 +03:00
Roman Proskuryakov
2311969f05 Reduce the number of copypaste in FindSphinx.cmake 2016-08-15 22:29:07 +03:00
David Cernat
d9cfd5bac2 Resolve conflicts with OpenMW 2016-08-15 19:14:13 +03:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui 
Find mygui
 2016-08-15 16:36:48 +02:00
Roman Proskuryakov
e0e69a8d8a Rewrites FindMyGUI with LibFindMacros 2016-08-15 15:59:02 +03:00
David Cernat
8686b9cc12 Merge pull request #29 from OpenMW/master 
Add OpenMW commits from end of July
 2016-08-04 00:56:36 +03:00
Koncord
1f0d6eba80 Fix FindRakNet 
Added ws2_32 for Windows
Fixed path to headers
 2016-08-02 18:41:50 +08:00
Aesylwinn
b4a000913c Merge remote-tracking branch 'yar/master' into Even 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwdialogue/filter.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/localscripts.cpp
#	components/CMakeLists.txt
#	components/compiler/exprparser.cpp
#	components/sceneutil/workqueue.cpp
 2016-07-17 23:50:52 -04:00
Koncord
1a32385632 Fix cmake modules 2016-07-12 20:37:39 +08:00
Koncord
1b259e2d33 Syncing inventory, animations, position, 8 key attributes 
Created Package system
 2016-07-07 23:50:48 +08:00
Koncord
1e29409dd5 Add OpenMW-mp target 2016-07-07 23:50:38 +08:00
Bret Curtis
ac8d347e9e we have html output and autodoc functionality 2016-07-05 12:07:31 +02:00