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

205 commits

Author SHA1 Message Date
Bret Curtis
937cbfa0a1
small commit to rigger AV 2018-06-07 17:09:39 +02:00
AnyOldName3
a1ab1dc7fe Add easily understood error messages to the prebuild script instead of vague/silent failures. 2018-06-07 15:28:45 +01:00
David Cernat
c20a0c72c5 Merge pull request #442 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
 2018-06-04 19:34:26 +03:00
Bret Curtis
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor 
AppVeyor: build with Release configuration
 2018-05-29 10:25:02 +02:00
Andrei Kortunov
de2513653e AppVeyor: build with Release configuration 2018-05-28 09:08:30 +04:00
David Cernat
669d4d3d7e
Merge pull request #440 from OpenMW/master 
Add OpenMW commits up to 27 May 2018
 2018-05-27 16:10:16 +03:00
Nikolay Kasyanov
ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 2018-05-24 23:00:59 +02:00
David Cernat
815d17d9db
Merge pull request #433 from OpenMW/master 
Add OpenMW commits up to 21 May 2018
 2018-05-21 02:07:08 +03:00
Alexander "Ananace" Olofsson
d05de8e411
Give boost the correct toolset for 2017 2018-05-20 18:51:28 +02:00
Alexander "Ananace" Olofsson
3bd8dc3ef6
Use the right boost version for Appveyor 2018-05-20 18:22:02 +02:00
Alexander "Ananace" Olofsson
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor 2018-05-20 18:09:31 +02:00
Alexander "Ananace" Olofsson
ea6c73333b
Bumping Qt to 5.10 for Appveyor 2018-05-20 17:14:32 +02:00
Kyle Cooley
cf5bd0dca7 Travis: use qt5, newer boost libraries, callff, gcc/clang builds... 2018-05-10 18:02:45 -04:00
David Cernat
365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts 
Conflicts:
	components/CMakeLists.txt
 2018-03-30 10:28:52 +03:00
bret curtis
4890ecd357 remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb 2018-03-27 20:20:40 +02:00
David Cernat
b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-03-09 21:07:46 +02:00
Harald H
d3b623b5d3 http to https for supported urls (#1625) 
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
 2018-03-08 21:23:24 +01:00
David Cernat
07f0cc2b0e
Merge pull request #353 from OpenMW/master 
Add OpenMW commits up to 4 Dec 2017
 2017-12-04 04:38:38 +02:00
Alexander "Ace" Olofsson
50deed126b
Update SDL to 2.0.7 2017-12-02 21:48:57 +01:00
David Cernat
e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	README.md
 2017-11-30 10:06:38 +02:00
Alexander "Ace" Olofsson
04af200ae8 Downgrade MyGUI to 3.2.2 for Windows builds 2017-10-28 13:37:41 +02:00
David Cernat
37304655da Merge pull request #326 from OpenMW/master 
Add OpenMW commits up to 25 Oct 2017
 2017-10-26 17:28:56 +03:00
Alexander "Ace" Olofsson
32bdd500af Updating OSG packages to 3.4.1 2017-10-22 23:13:01 +02:00
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
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
38247ff086 Merge pull request #303 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwbase/dialoguemanager.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#	apps/openmw/mwgui/container.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
 2017-10-06 04:10:04 +03:00
Nikolay Kasyanov
c598f1313c [macOS, CI] Update dependencies 
The following changes are included:
- https://github.com/OpenMW/openmw-deps-mac/pull/37
- https://github.com/OpenMW/openmw-deps-mac/pull/38
 2017-10-03 17:34:45 +02:00
David Cernat
721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
 2017-08-05 00:09:34 +03:00
Nikolay Kasyanov
ffcdedced3 [macOS, CI] Use FTP URL from environment 
This URL is also subject to change, moving to Travis settings.
 2017-08-01 20:35:10 +02:00
David Cernat
bfbf1bbac4 Merge pull request #247 from OpenMW/master 
Add OpenMW commits up to 26 Jul 2017
 2017-07-26 14:01:01 +03:00
scrawl
c23b75ab9a Merge pull request #1339 from PlutonicOverkill/vs2017-support 
Add Visual Studio 2017 support (Feature #3952)
 2017-07-25 21:07:34 +00:00
David Cernat
2c1ece79fc Merge pull request #245 from OpenMW/master 
Add OpenMW commits up to 22 Jul 2017
 2017-07-23 22:02:16 +03:00
Nikolay Kasyanov
411b78562e [macOS, CI] Use most recent dependencies 
Includes a fix for https://bugs.openmw.org/issues/3904.
 2017-07-22 21:25:59 +02:00
PlutonicOverkill
0eb54fa96a Remove TOOLSET and XP_TOOLSET 2017-07-22 17:58:04 +12:00
PlutonicOverkill
2d7689b978 Add Visual Studio 2017 support 
The new VS2017 configuration uses all the same settings as the
VS2015 one, but uses a different generator.

CMake by default looks for Boost libraries based on the compiler
being used, but Boost only has binaries for VS2015, so a hack is
used to make sure it looks for the correct ones.

I don't know what TOOLSET and XP_TOOLSET are for but I left them
just in case.
 2017-07-14 12:07:16 +12:00
David Cernat
df67ae4689 Merge pull request #229 from OpenMW/master 
Add OpenMW commits up to 20 Jun 2017
 2017-06-20 04:16:51 +03:00
tlmullis
fad760cc1d msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh 2017-06-19 06:00:42 -07:00
David Cernat
fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
 2017-06-18 18:16:10 +03:00
Nikolay Kasyanov
016da1f10c [macOS, CI] Use most recent dependencies 2017-06-13 08:44:55 +02:00
Nikolay Kasyanov
dd882b69c6 [macOS, CI] Use Release configuration 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
071419db4a [macOS, CI] Enable OpenCS build and see what happens 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
6260e15852 [OS X] Temporarily disable OpenCS build on CI 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
231908d9cf [OS X, CI] Use dependencies build against libc++ 2017-06-09 16:49:25 +02:00
Bret Curtis
b6ee76b77b Switch to latest Qt5 version which is C++11-compatible 2017-06-09 16:49:25 +02:00
David Cernat
315ec46ff6 Merge pull request #224 from OpenMW/master 
Add OpenMW commits up to 3 Jun 2017
 2017-06-03 17:19:34 +03:00
Nikolay Kasyanov
224fcc9a4a [macOS, CI] Fix dependency installation 2017-06-03 10:42:49 +02:00
David Cernat
93bd3207db Merge pull request #212 from OpenMW/master 
Add OpenMW commits up to 6 May 2017
 2017-05-06 18:39:42 +03:00
Alexander "Ace" Olofsson
fd03c76e68 And apparently they're only doing zips now 2017-05-06 09:38:14 +02:00
Alexander "Ace" Olofsson
ae05c37a46 Update Windows CI scripts to use ffmpeg 3.2.4 2017-05-06 09:21:02 +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
e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 2017-03-07 21:53:49 +01:00
Nikolay Kasyanov
57c5ecfba8 [macOS, CI] Use most recent prebuilt dependencies 2017-03-05 23:01:16 +01:00
Nikolay Kasyanov
f1abc5d7cb [macOS, CI] Use Release configuration 2017-03-05 23:01:16 +01:00
David Cernat
6763718412 Merge pull request #146 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/actors.cpp
 2017-02-10 21:39:16 +02:00
Alexander "Ace" Olofsson
cda83559aa Update Bullet to 2.86 2017-02-10 11:37:36 +01:00
Koncord
316e5fa22e [CI] Disable Browser 2017-01-27 19:44:35 +08:00
David Cernat
dfb87e9e0d Merge pull request #124 from OpenMW/master 
Add OpenMW commits up to 11 Jan
 2017-01-11 13:30:22 +02:00
Nikolay Kasyanov
7bd95c8ce3 [macOS] Use https link to download dependencies on CI 2017-01-05 14:06:52 +03:00
Nikolay Kasyanov
07423f973f [macOS] Use newer prebuilt dependencies on CI 2017-01-05 14:02:10 +03:00
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master 
Add OpenMW changes up to 26 Dec
 2016-12-26 01:09:20 +02:00
Nikolay Kasyanov
a0990e5899 [macOS] Switch CI to Xcode 8.2 2016-12-24 16:05:24 +01:00
David Cernat
bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
 2016-12-20 05:21:24 +02:00
Nikolay Kasyanov
37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
6d8d9e5dbc [macOS] Take Qt prefix path from Homebrew for CI resilience 
Recent CI failure was caused by path changed by Homebrew.
 2016-12-18 18:22:43 +01:00
David Cernat
ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/CMakeLists.txt
 2016-11-06 19:03:35 +02:00
Nikolay Kasyanov
3adf4cb97f Link OpenMW with libz on macOS 2016-11-05 12:18:22 +01:00
Nikolay Kasyanov
0115a3a874 Revert "Link OpenMW with libz on macOS" 
This reverts commit 0c4dd05118.
 2016-11-05 12:11:04 +01:00
Nikolay Kasyanov
0c4dd05118 Link OpenMW with libz on macOS 2016-11-05 12:09:47 +01:00
David Cernat
4d72e7ce37 Merge pull request #91 from OpenMW/master 
Add OpenMW commits up to 31 Oct
 2016-10-31 12:22:37 +02:00
Nikolay Kasyanov
cf2e59c983 [OS X] Use Qt 5.5 on CI 
Newer Qt versions require C++11.
 2016-10-30 21:36:43 +01:00
David Cernat
3b7693c719 Resolve conflicts in pull request #55 
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2016-09-15 08:49:57 +03:00
Koncord
e5e9c90441 Travis: disable build server for clang 2016-09-04 19:10:39 +08:00
Koncord
485a1b1e3b Disable OS X in Travis CI 2016-09-04 17:58:28 +08:00
Koncord
9abd4e5a16 Fail :D 2016-09-04 17:03:07 +08:00
Koncord
b2f1bb06f2 fix travis 2 2016-09-04 16:51:16 +08:00
Koncord
9a4edff122 Disable unnecessary builds 2016-09-04 16:06:49 +08:00
Koncord
31c372a0e7 resolve depends for travis 2016-09-04 15:44:37 +08:00
Alexander "Ace" Olofsson
123e57a65c Include the OpenAL32.dll file into builds 2016-09-02 06:57:36 +02:00
scrawl
20da3bc240 Merge pull request #1037 from ace13/appveyor 
Visual Studio 2015 support
 2016-08-29 12:40:09 +02:00
Alexander "Ace" Olofsson
bcaf160eab Add some missing Qt DLLs 2016-08-29 07:07:50 +02:00
Alexander "Ace" Olofsson
c93f7b90c5 Disable the version changing on AppVeyor 
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
 2016-08-29 00:37:20 +02:00
Alexander "Ace" Olofsson
61d9729767 A final bit of script cleanup and caching 2016-08-29 00:29:30 +02:00
Alexander "Ace" Olofsson
6abc3c04bd One letter wrong, oops 2016-08-28 23:26:02 +02:00
Alexander "Ace" Olofsson
d781846f53 Fix the /bigobj issue and some script cleanup 
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
 2016-08-28 23:23:44 +02:00
Alexander "Ace" Olofsson
bc6aa86b8a And escaping the printf input 2016-08-28 21:56:53 +02:00
Alexander "Ace" Olofsson
e47f4a9016 Missing STEP variable 2016-08-28 21:54:41 +02:00
Alexander "Ace" Olofsson
83de1f2de9 And use the correct OpenAL version 
Should really have run these on a clean dir locally, but time
constraints...
 2016-08-28 21:52:32 +02:00
Alexander "Ace" Olofsson
81a9258de9 Don't reset the APPVEYOR and CI variables 2016-08-28 21:48:00 +02:00
Alexander "Ace" Olofsson
dd5b6a46f5 Visual Studio 2015 support 2016-08-28 21:42:48 +02:00
Allofich
c89293770f Link Clang paths 2016-08-28 21:25:09 +09:00
scrawl
b26478b860 Merge pull request #1028 from kpp/find_osg_plugins 
Find osg_plugins
 2016-08-16 17:05:44 +02: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
9d51e1966f Rename SDL_SDK -> SDL2DIR as it is said in FindSDL2 documentation 2016-08-15 23:55:53 +03:00
scrawl
dae4a8353a Merge pull request #1024 from kpp/kpp_travis_improvements 
Improve Travis config
 2016-08-15 20:05:33 +02:00
Roman Proskuryakov
f4f81a14c9 Use Travis addons.apt.packages to install packages 2016-08-15 18:45:29 +03:00
scrawl
a44ba0e461 Merge pull request #966 from kpp/find_mygui 
Find mygui
 2016-08-15 16:36:48 +02:00
Roman Proskuryakov
4cffdb67d8 Uses case-sensitive MyGUI_* variables 2016-08-15 15:59:02 +03:00
Nikolay Kasyanov
bf0ec550da OS X: specify minimum CMake version & remove redundant argument from CI script 2016-07-07 01:09:59 +02:00
AnyOldName3
57640b8161 Improve the MSVC prebuild script to allow compiled binaries to be run directly with no further modification 2016-06-24 01:04:16 +01:00