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

161 commits

Author SHA1 Message Date
David Cernat
a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
 2018-07-04 01:52:29 +03:00
Bret Curtis
e068ee3533 tell unzip to overwrite all files 2018-06-26 14:01:10 +00:00
Bret Curtis
308d78e3da only download via curl if file on server is different than what is currently cached on VM. 2018-06-26 13:54:37 +00:00
Bret Curtis
ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 2018-06-26 13:50:45 +00:00
Nikolay Kasyanov
90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 2018-06-20 19:59:55 +02:00
David Cernat
2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts 
# Conflicts:
#	README.md
 2018-06-08 06:01:00 +03:00
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