Commit Graph

432 Commits (3603408c67488887132e6d0a3d52797f7a59080a)

Author SHA1 Message Date
Bret Curtis e7caf7a037 bump that qt 5 years ago
Bret Curtis 4c94fcd52b add msvc2019 and ditch msvc2015 5 years ago
naratzul 0220bcdef3 Add Visual Studio 2019 support 5 years ago
David Cernat 5181c601c0 Add OpenMW commits up to 2 May 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat f671c0bddc Add OpenMW commits up to 1 Apr 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/engine.cpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwgui/trainingwindow.cpp
#	apps/openmw/mwgui/travelwindow.cpp
#	apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat de16b8118c [CI] Fix execution permission for before_script_linux.sh 5 years ago
David Cernat 8729c3c5e3 Add OpenMW commits up to 9 Mar 2019
# Conflicts:
#	.travis.yml
#	CI/before_script.linux.sh
#	README.md
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwscript/animationextensions.cpp
#	apps/openmw/mwscript/guiextensions.cpp
#	apps/openmw/mwscript/miscextensions.cpp
#	apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat 95a5607509 Add OpenMW commits up to 22 Feb 2019
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat 6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat d439edce70 [CI] Fix oversight in before_script_linux.sh 5 years ago
David Cernat 6fdef4fd0a Add OpenMW commits up to 1 Jan 2019
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
5 years ago
David Cernat 1b9842c175 [CI] Fix oversights in .travis.yml and before_script_linux.sh 5 years ago
David Cernat cbba81df03 Add OpenMW commits up to 14 Nov 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat 3efffe92e3 Add OpenMW commits up to 5 Nov 2018
# Conflicts:
#	CI/before_install.linux.sh
#	CMakeLists.txt
#	apps/openmw/mwmechanics/aifollow.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#	apps/openmw/mwphysics/physicssystem.hpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/CMakeLists.txt
5 years ago
David Cernat 7de1a3d016 [CI] Assign execution permissions to Linux .sh files 5 years ago
David Cernat 7edfca06cf [CI] Fix issues in before_install.linux.sh 5 years ago
David Cernat fba07194cf Add OpenMW commits up to 29 Oct 2018
# Conflicts:
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwinput/inputmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/aicombat.cpp
#	apps/openmw/mwmechanics/character.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat 84cab59057 Add OpenMW commits up to 19 Aug 2018
# Conflicts:
#	.travis.yml
#	CI/before_install.linux.sh
#	CI/before_script.linux.sh
#	apps/openmw/engine.cpp
#	apps/openmw/main.cpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/containerextensions.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/cellstore.cpp
#	apps/openmw/mwworld/containerstore.cpp
#	apps/openmw/mwworld/scene.cpp
#	apps/openmw/mwworld/worldimp.cpp
#	components/misc/debugging.hpp
5 years ago
Nikolay Kasyanov c89876538d Fix macOS nightly preupload check
Previously, it was always ls'ing home directory.
6 years ago
Nikolay Kasyanov d305e1933a Get ccache path from Homebrew
Also, don't use legacy syntax to get Qt path.
6 years ago
Nikolay Kasyanov 95ae9c4ac8 Don't downgrade CMake 6 years ago
Nikolay Kasyanov a11c391231 Enable ccache for macOS CI 6 years ago
Bret Curtis 8c1a73ff11
Merge pull request #2220 from elsid/ccache
Use ccache for linux CI build
6 years ago
elsid 26dfa287f9
Use ccache for linux CI build 6 years ago
elsid 7d2c741d1d
Fix compare with empty value 6 years ago
elsid e99f783c65
Remove white spaces and trailing spaces 6 years ago
Alexander Olofsson f8118272f4
Package FreeType plugin for OSG in Windows
Fixes #4872
6 years ago
Chris Djali cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
Shadows
6 years ago
Koncord 77386525f2 [General] Update Travis CI 6 years ago
Nikolay Kasyanov cdbd3a9c09
Fix macOS CI
It looks like Homebrew has deprecated some syntax making CMake formula invalid, now a for of the formula is used.
6 years ago
AnyOldName3 8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
Azdul 6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 6 years ago
Nikolay Kasyanov 4a266b3277
[macOS, CI] Update dependencies
They now include boost iostreams for TES 4/5 BSA support.
See https://gitlab.com/OpenMW/openmw/merge_requests/56.
6 years ago
Nikolay Kasyanov 9cce6ecfe3 [macOS] Update deploy script to use ssh/scp 6 years ago
Nikolay Kasyanov 956934911a [macOS, CI] Use CMake 3.12.4
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
6 years ago
Bret Curtis 8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
Remove unnecessary Recastnavigation headers & static libs from macOS package
6 years ago
Nikolay Kasyanov e0161bb2bf Update macOS dependencies, use Xcode 10.1 6 years ago
Nikolay Kasyanov f98a454ec1 Add a script to verify macOS package contents 6 years ago
AnyOldName3 e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 6 years ago
AnyOldName3 2a2d9f0006 Fix if statements 6 years ago
AnyOldName3 14fcb9158f Add NMake support to the Windows prebuild script. 6 years ago
AnyOldName3 642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
Bret Curtis fc15fa0a89 we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml 6 years ago
Alexander Olofsson f8f66b83b6 Update OpenAL-soft to 1.19.1 6 years ago
Bret Curtis 461ba74d6d
Merge pull request #2017 from sthalik/pr/allow-build-under-cygwin-msys2-etc
fix build with CI dependencies on all Cygwin derivatives
6 years ago
Bret Curtis 9ae077c033
use c++11 std::align from <memory> (#2026)
* use c++11 std::align from <memory>

* for Ubuntu, use gcc5 instead of 4.8

* use travis to set gcc to 5

eval

and sudo

* use eval in .travis.yml

* use gcc-8

* replace precise with trusty llvm toolchain, because we have been using trusty for awhile now

* push things to matrix, so we can support multiple releases if we want

* we should not be allowing for failures, we are ready to start trusting clang and its analyzer

* scan-build was pushed to another package

* use gcc-8 still but wrap in scan-build

* travis.yml cleanup, have output of scripts go to stdout, make search for substring a regex

use double []

fix missing ,

use bash to use regex

black spaces matter

* set human readable names for our various builds, split out our static analysis between openmw and openmw-cs

* test if not set, then set otherwise ignore

* use quotes

* do not eval it, set it in travis env

* no more &&

* what does clang7 have to say?

* use sourceline for now

* use clang-7 instead of clang-7.0

* yes, llvm-toolchain-trusty-7 not llvm-toolchain-trusty-7.0

* for static analysis, openmw is compiled and checked on its own while openmw-cs is build with all the rest. this might change in the future.

and actually do it the other way around
6 years ago
Stanislaw Halik b099981c91 fix CI msvc build outside git bash
It was only by accident that git bash worked for CI basing on the
"real_pwd()" expression. Replace the dubious replacement pattern with
"cygpath", which is present on git bash, Cygwin, and msys2 alike. In
particular git bash uses msys2 internally.

I was able to confirm a working build under msys2 with a wrapper for
MSVC invocation via the Ninja generator.
6 years ago
Andrei Kortunov f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 6 years ago
AnyOldName3 d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 6 years ago
elsid 792a0585c0 Add recastnavigation as subdirectory 6 years ago
AnyOldName3 afd700dab9 Ensure different Boost versions get different names 6 years ago
AnyOldName3 3785ba6aa0 Merge upstream/master 6 years ago
elsid 49d81241db Merge branch 'master' into pathfinder_detour 6 years ago
Nikolay Kasyanov f62ca24356 [macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665 6 years ago
elsid 3d97e96f55
Add dependency to recastnavigation 6 years ago
AnyOldName3 0124be5713 Merge upstream/master 6 years ago
Capostrophic e627f49df4 Fix AppVeyor build 6 years ago
elsid 2073218fc6
Use specific googletest version 6 years ago
AnyOldName3 80082308f0 Merge upstream (shadermanager log system revamp) 6 years ago
elsid ef631a0961
Add dependency for GMock 6 years ago
AnyOldName3 cc23a968d1 Merge upstream/master 7 years ago
David Cernat 65de028e0d
Merge pull request #462 from OpenMW/master
Add OpenMW commits up to 23 Jul 2018
7 years ago
Bret Curtis 84b80ae405 no spaces in assignment 7 years ago
Bret Curtis b910106713 Catch an unbound variable before it happens. 7 years ago
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
7 years ago
Bret Curtis 739c49d59b Merge branch 'master' into 'win10_ci'
# Conflicts:
#   CI/before_script.msvc.sh
7 years ago
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
7 years ago
Bret Curtis 57e2573593
Update before_script.msvc.sh
check if temp directory exists, error out and warn user about it.
7 years ago
Bret Curtis 70e9d5c0a0 ; it? 7 years ago
Bret Curtis 11030e56c4 detect existing dir 7 years ago
Bret Curtis 4f07ca28a6 Try passing the _real_ windows dir to innoinstaller, then using the linux-like directory for mv. 7 years ago
Bret Curtis d4c9586bd0 try just converting the \ to a / 7 years ago
Bret Curtis af75c1e909
Update before_script.msvc.sh
reverting back to what works
7 years ago
Bret Curtis 4d60fe5a76 reverting back 7 years ago
Bret Curtis b8b07b52f0 try this... 7 years ago
Bret Curtis 4177fd04eb
Update before_script.msvc.sh
Does it blend?
7 years ago
Bret Curtis 209359bbc3 Try this on for size... 7 years ago
Bret Curtis 78a3f95ee4 Update before_script.msvc.sh 7 years ago
Bret Curtis 2bf0d598cf
Update before_script.msvc.sh
Wrap in quites
7 years ago
Bret Curtis c474709127
Update before_script.msvc.sh 7 years ago
Bret Curtis ca0f6fff4a Update before_script.msvc.sh 7 years ago
Bret Curtis dc48a46e50 Update before_script.msvc.sh 7 years ago
Bret Curtis a6d6dd5995 updating for the nits 7 years ago
Bret Curtis 8811c7141a
Update before_script.msvc.sh
taking nits into account :)
7 years ago
Bret Curtis c2ff30c4d7 correcting from GH/AV feedback, testing on GL. 7 years ago
Bret Curtis a532aef935
Update before_script.msvc.sh
updating version check and correct indentation, wrap BOOST_SDK in "" to support dirs with spaces.
7 years ago
Bret Curtis 4c0e475092
Update before_script.msvc.sh
Use powershell trick with boost_temp so there is little chance of collision.
7 years ago
Bret Curtis bccd83c656 Use 1.67 7 years ago
Bret Curtis bc830a9c45 use boost_temp 7 years ago
Bret Curtis 63bbc77ee7 try using the powershell trick from AnyOldName3 7 years ago
Bret Curtis 3379eafd33 Update before_script.msvc.sh 7 years ago
Bret Curtis 3ceb9116de Give pwd -W a try 7 years ago
Bret Curtis c4a4111b2e Update before_script.msvc.sh 7 years ago
Bret Curtis fb6ad9faec try %TMP% ? 7 years ago
Bret Curtis 4ad3d66629 try using just ${TMP} 7 years ago
Bret Curtis 8be52d228e
Update before_script.msvc.sh
small fixes
7 years ago
Bret Curtis 60ec340fa3 remove toolset_real, use just toolset, do proper comparison 7 years ago
Bret Curtis 71314f0c3a Use boost 1.67 instead of 1.61 7 years ago
Bret Curtis 46575d8de7
Update before_script.msvc.sh
1.61 -> 1.67
7 years ago
Bret Curtis 660193ae1b
Update before_script.msvc.sh
This has working GL Win10 MSVC updates, should be cross-compatible with appveyor.
7 years ago
Bret Curtis 1c4363eaa6 Using SYSTEMDRIVE because TEMP apparently means something different in bash then to windows cmd. 7 years ago
Bret Curtis 7bf502dd02 Bash it out! 7 years ago
Bret Curtis 1061270ac0 Try using @TEMP@ instead of hard coding it. 7 years ago
Bret Curtis 45d77372a0 with 260 char path fixed, this should work. 7 years ago
Bret Curtis f17426cbcd give boost 1.67 a spin with msvc 14.1 7 years ago
Bret Curtis bd602847b5 fix broken QT 5.7.0 link 7 years ago
Bret Curtis 59a4251a6a try to extract boost higher up in dir, then move. 7 years ago
Bret Curtis b6fc204dd3 be more aggressive about suppressing message boxes 7 years ago
Bret Curtis f7e1083ba4 get more output from boost 7 years ago
Bret Curtis e068ee3533 tell unzip to overwrite all files 7 years ago
Bret Curtis 308d78e3da only download via curl if file on server is different than what is currently cached on VM. 7 years ago
Bret Curtis ae4cb0c3ee no need for macos_qt_formula since on osx there is no more qt4, just qt5 7 years ago
AnyOldName3 9df59720e4 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 7 years ago
Nikolay Kasyanov 90ccf5b42b [macOS, CI] Build using macOS 10.13 SDK 7 years ago
AnyOldName3 553094669b Merge upstream/master (& fix merge conflicts) 7 years ago
David Cernat 2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
Bret Curtis 937cbfa0a1
small commit to rigger AV 7 years ago
AnyOldName3 a1ab1dc7fe Add easily understood error messages to the prebuild script instead of vague/silent failures. 7 years ago
David Cernat c20a0c72c5 Merge pull request #442 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
Bret Curtis d73c6ebe60
Merge pull request #1721 from akortunov/appveyor
AppVeyor: build with Release configuration
7 years ago
Andrei Kortunov de2513653e AppVeyor: build with Release configuration 7 years ago
AnyOldName3 759e6fb804 Merge remote-tracking branch 'refs/remotes/upstream/master' 7 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
7 years ago
Nikolay Kasyanov ba3a02ad05 [macOS, CI] Do not upload a nightly if there's already one of the same commit 7 years ago
AnyOldName3 9ff31cc80d Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 7 years ago
David Cernat 815d17d9db
Merge pull request #433 from OpenMW/master
Add OpenMW commits up to 21 May 2018
7 years ago
Alexander "Ananace" Olofsson d05de8e411
Give boost the correct toolset for 2017 7 years ago
Alexander "Ananace" Olofsson 3bd8dc3ef6
Use the right boost version for Appveyor 7 years ago
Alexander "Ananace" Olofsson bcfa2a13a6
Use the VS2017 packaging of Qt5 for Appveyor 7 years ago
Alexander "Ananace" Olofsson ea6c73333b
Bumping Qt to 5.10 for Appveyor 7 years ago
AnyOldName3 44b2cf2b7f Merge upstream. 7 years ago
Kyle Cooley cf5bd0dca7 Travis: use qt5, newer boost libraries, callff, gcc/clang builds... 7 years ago
David Cernat 365f485e8d Merge pull request #397 from OpenMW/master while resolving conflicts
Conflicts:
	components/CMakeLists.txt
7 years ago
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 7 years ago
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
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
7 years ago
AnyOldName3 0e481a457e Merge remote-tracking branch 'refs/remotes/upstream/master' 7 years ago
David Cernat 07f0cc2b0e
Merge pull request #353 from OpenMW/master
Add OpenMW commits up to 4 Dec 2017
7 years ago
Alexander "Ace" Olofsson 50deed126b
Update SDL to 2.0.7 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
Alexander "Ace" Olofsson 04af200ae8 Downgrade MyGUI to 3.2.2 for Windows builds 7 years ago
AnyOldName3 ef8a7d1cb9 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 7 years ago
David Cernat 37304655da Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
7 years ago
Alexander "Ace" Olofsson 32bdd500af Updating OSG packages to 3.4.1 7 years ago
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
7 years ago
AnyOldName3 147455626e Merge OpenMW/master 7 years ago
AnyOldName3 20607bdcd9 Actually add shadow DLL under Windows automatically for real this time 7 years ago
AnyOldName3 c2cd338086 Add shadow DLL under Windows automatically 7 years ago
AnyOldName3 f8fe992dc0 Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files 7 years ago
AnyOldName3 b94bbe00cb Merge remote-tracking branch 'upstream/master' into osgshadow-test 7 years ago
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
7 years ago
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
7 years ago
AnyOldName3 f50063402d Adjust shaders to support shadows 7 years ago
David Cernat 721b218cc2 Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
8 years ago
Nikolay Kasyanov ffcdedced3 [macOS, CI] Use FTP URL from environment
This URL is also subject to change, moving to Travis settings.
8 years ago
David Cernat bfbf1bbac4 Merge pull request #247 from OpenMW/master
Add OpenMW commits up to 26 Jul 2017
8 years ago
scrawl c23b75ab9a Merge pull request #1339 from PlutonicOverkill/vs2017-support
Add Visual Studio 2017 support (Feature #3952)
8 years ago
David Cernat 2c1ece79fc Merge pull request #245 from OpenMW/master
Add OpenMW commits up to 22 Jul 2017
8 years ago
Nikolay Kasyanov 411b78562e [macOS, CI] Use most recent dependencies
Includes a fix for https://bugs.openmw.org/issues/3904.
8 years ago
PlutonicOverkill 0eb54fa96a Remove TOOLSET and XP_TOOLSET 8 years ago
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.
8 years ago
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