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
b6ee76b77b
Switch to latest Qt5 version which is C++11-compatible
8 years ago
315ec46ff6
Merge pull request #224 from OpenMW/master
...
Add OpenMW commits up to 3 Jun 2017
8 years ago
224fcc9a4a
[macOS, CI] Fix dependency installation
8 years ago
93bd3207db
Merge pull request #212 from OpenMW/master
...
Add OpenMW commits up to 6 May 2017
8 years ago
fd03c76e68
And apparently they're only doing zips now
8 years ago
ae05c37a46
Update Windows CI scripts to use ffmpeg 3.2.4
8 years ago
e0234dc362
Merge pull request #183 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
8 years ago
e24cb0fe5d
[macOS, CI] Configure deployment of nightly builds to FTP
8 years ago
57c5ecfba8
[macOS, CI] Use most recent prebuilt dependencies
8 years ago
f1abc5d7cb
[macOS, CI] Use Release configuration
8 years ago
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
8 years ago
cda83559aa
Update Bullet to 2.86
8 years ago
316e5fa22e
[CI] Disable Browser
8 years ago
dfb87e9e0d
Merge pull request #124 from OpenMW/master
...
Add OpenMW commits up to 11 Jan
8 years ago
7bd95c8ce3
[macOS] Use https link to download dependencies on CI
8 years ago
07423f973f
[macOS] Use newer prebuilt dependencies on CI
8 years ago
5bdfb72752
Merge pull request #116 from OpenMW/master
...
Add OpenMW changes up to 26 Dec
8 years ago
a0990e5899
[macOS] Switch CI to Xcode 8.2
8 years ago
bf0a96d552
Merge pull request #114 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
8 years ago
37c8a36dd8
[macOS] Parametrize Qt5 version used on CI
8 years ago
6d8d9e5dbc
[macOS] Take Qt prefix path from Homebrew for CI resilience
...
Recent CI failure was caused by path changed by Homebrew.
8 years ago
ec211e58d0
Merge pull request #98 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/CMakeLists.txt
8 years ago
3adf4cb97f
Link OpenMW with libz on macOS
8 years ago
David Cernat
Alexander "Ace" Olofsson
AnyOldName3
Nikolay Kasyanov
Nikolay Kasyanov
scrawl
PlutonicOverkill
tlmullis
Bret Curtis
Koncord