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
7 years ago
e068ee3533
tell unzip to overwrite all files
7 years ago
308d78e3da
only download via curl if file on server is different than what is currently cached on VM.
7 years ago
ae4cb0c3ee
no need for macos_qt_formula since on osx there is no more qt4, just qt5
7 years ago
90ccf5b42b
[macOS, CI] Build using macOS 10.13 SDK
7 years ago
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
937cbfa0a1
small commit to rigger AV
7 years ago
a1ab1dc7fe
Add easily understood error messages to the prebuild script instead of vague/silent failures.
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
...
AppVeyor: build with Release configuration
7 years ago
de2513653e
AppVeyor: build with Release configuration
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
ba3a02ad05
[macOS, CI] Do not upload a nightly if there's already one of the same commit
7 years ago
815d17d9db
Merge pull request #433 from OpenMW/master
...
Add OpenMW commits up to 21 May 2018
7 years ago
d05de8e411
Give boost the correct toolset for 2017
7 years ago
3bd8dc3ef6
Use the right boost version for Appveyor
7 years ago
bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor
7 years ago
ea6c73333b
Bumping Qt to 5.10 for Appveyor
7 years ago
cf5bd0dca7
Travis: use qt5, newer boost libraries, callff, gcc/clang builds...
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
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
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
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
7 years ago
07f0cc2b0e
Merge pull request #353 from OpenMW/master
...
Add OpenMW commits up to 4 Dec 2017
7 years ago
50deed126b
Update SDL to 2.0.7
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
04af200ae8
Downgrade MyGUI to 3.2.2 for Windows builds
7 years ago
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
7 years ago
32bdd500af
Updating OSG packages to 3.4.1
7 years ago
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
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
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
7 years ago
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
7 years ago
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
ffcdedced3
[macOS, CI] Use FTP URL from environment
...
This URL is also subject to change, moving to Travis settings.
8 years ago
bfbf1bbac4
Merge pull request #247 from OpenMW/master
...
Add OpenMW commits up to 26 Jul 2017
8 years ago
c23b75ab9a
Merge pull request #1339 from PlutonicOverkill/vs2017-support
...
Add Visual Studio 2017 support (Feature #3952 )
8 years ago
2c1ece79fc
Merge pull request #245 from OpenMW/master
...
Add OpenMW commits up to 22 Jul 2017
8 years ago
411b78562e
[macOS, CI] Use most recent dependencies
...
Includes a fix for https://bugs.openmw.org/issues/3904 .
8 years ago
0eb54fa96a
Remove TOOLSET and XP_TOOLSET
8 years ago
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.
8 years ago
df67ae4689
Merge pull request #229 from OpenMW/master
...
Add OpenMW commits up to 20 Jun 2017
8 years ago
fad760cc1d
msbuild was always defaulting to building the Debug configuration so it was impossible to build any other configurations with build.msvc.sh
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
016da1f10c
[macOS, CI] Use most recent dependencies
8 years ago
dd882b69c6
[macOS, CI] Use Release configuration
8 years ago
071419db4a
[macOS, CI] Enable OpenCS build and see what happens
8 years ago
c16506d07c
[OS X, CI] Use Xcode 8/macOS 10.12 SDK
8 years ago
6260e15852
[OS X] Temporarily disable OpenCS build on CI
8 years ago
231908d9cf
[OS X, CI] Use dependencies build against libc++
8 years ago
David Cernat
Bret Curtis
Nikolay Kasyanov
AnyOldName3
Andrei Kortunov
Alexander "Ananace" Olofsson
Kyle Cooley
Harald H
Nikolay Kasyanov
scrawl
PlutonicOverkill
tlmullis