Commit Graph

120 Commits (b847914d6f15ad7b11dc23f59e8a5e52e406f0d3)

Author SHA1 Message Date
David Cernat df67ae4689 Merge pull request #229 from OpenMW/master
Add OpenMW commits up to 20 Jun 2017
8 years ago
tlmullis 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
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Nikolay Kasyanov 016da1f10c [macOS, CI] Use most recent dependencies 8 years ago
Nikolay Kasyanov dd882b69c6 [macOS, CI] Use Release configuration 8 years ago
Nikolay Kasyanov 071419db4a [macOS, CI] Enable OpenCS build and see what happens 8 years ago
Nikolay Kasyanov c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 8 years ago
Nikolay Kasyanov 6260e15852 [OS X] Temporarily disable OpenCS build on CI 8 years ago
Nikolay Kasyanov 231908d9cf [OS X, CI] Use dependencies build against libc++ 8 years ago
Bret Curtis b6ee76b77b Switch to latest Qt5 version which is C++11-compatible 8 years ago
David Cernat 315ec46ff6 Merge pull request #224 from OpenMW/master
Add OpenMW commits up to 3 Jun 2017
8 years ago
Nikolay Kasyanov 224fcc9a4a [macOS, CI] Fix dependency installation 8 years ago
David Cernat 93bd3207db Merge pull request #212 from OpenMW/master
Add OpenMW commits up to 6 May 2017
8 years ago
Alexander "Ace" Olofsson fd03c76e68 And apparently they're only doing zips now 8 years ago
Alexander "Ace" Olofsson ae05c37a46 Update Windows CI scripts to use ffmpeg 3.2.4 8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
Nikolay Kasyanov e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 8 years ago
Nikolay Kasyanov 57c5ecfba8 [macOS, CI] Use most recent prebuilt dependencies 8 years ago
Nikolay Kasyanov f1abc5d7cb [macOS, CI] Use Release configuration 8 years ago
David Cernat 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
Alexander "Ace" Olofsson cda83559aa Update Bullet to 2.86 8 years ago
Koncord 316e5fa22e [CI] Disable Browser 8 years ago
David Cernat dfb87e9e0d Merge pull request #124 from OpenMW/master
Add OpenMW commits up to 11 Jan
8 years ago
Nikolay Kasyanov 7bd95c8ce3 [macOS] Use https link to download dependencies on CI 8 years ago
Nikolay Kasyanov 07423f973f [macOS] Use newer prebuilt dependencies on CI 8 years ago
David Cernat 5bdfb72752 Merge pull request #116 from OpenMW/master
Add OpenMW changes up to 26 Dec
8 years ago
Nikolay Kasyanov a0990e5899 [macOS] Switch CI to Xcode 8.2 8 years ago
David Cernat bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
8 years ago
Nikolay Kasyanov 37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 8 years ago
Nikolay Kasyanov 6d8d9e5dbc [macOS] Take Qt prefix path from Homebrew for CI resilience
Recent CI failure was caused by path changed by Homebrew.
8 years ago
David Cernat ec211e58d0 Merge pull request #98 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
8 years ago
Nikolay Kasyanov 3adf4cb97f Link OpenMW with libz on macOS 8 years ago
Nikolay Kasyanov 0115a3a874 Revert "Link OpenMW with libz on macOS"
This reverts commit 0c4dd05118.
8 years ago
Nikolay Kasyanov 0c4dd05118 Link OpenMW with libz on macOS 8 years ago
David Cernat 4d72e7ce37 Merge pull request #91 from OpenMW/master
Add OpenMW commits up to 31 Oct
8 years ago
Nikolay Kasyanov cf2e59c983 [OS X] Use Qt 5.5 on CI
Newer Qt versions require C++11.
8 years ago
David Cernat 3b7693c719 Resolve conflicts in pull request #55
# Conflicts:
#	README.md
#	apps/openmw/mwclass/npc.cpp
#	apps/openmw/mwmechanics/combat.cpp
8 years ago
Koncord e5e9c90441 Travis: disable build server for clang 8 years ago
Koncord 485a1b1e3b Disable OS X in Travis CI 8 years ago
Koncord 9abd4e5a16 Fail :D 8 years ago
Koncord b2f1bb06f2 fix travis 2 8 years ago
Koncord 9a4edff122 Disable unnecessary builds 8 years ago
Koncord 31c372a0e7 resolve depends for travis 8 years ago
Alexander "Ace" Olofsson 123e57a65c Include the OpenAL32.dll file into builds 8 years ago
scrawl 20da3bc240 Merge pull request #1037 from ace13/appveyor
Visual Studio 2015 support
8 years ago
Alexander "Ace" Olofsson bcaf160eab Add some missing Qt DLLs 8 years ago
Alexander "Ace" Olofsson c93f7b90c5 Disable the version changing on AppVeyor
Apparently it breaks the build detail links on GitHub, not really
acceptable that.
8 years ago
Alexander "Ace" Olofsson 61d9729767 A final bit of script cleanup and caching 8 years ago
Alexander "Ace" Olofsson 6abc3c04bd One letter wrong, oops 8 years ago
Alexander "Ace" Olofsson d781846f53 Fix the /bigobj issue and some script cleanup
Surprisingly specific problem I must say, 32-bit vs2015 unity builds
8 years ago