Commit Graph

115 Commits (fa3baac0f33aac3a066b3df4360ca2a9a02f27df)

Author SHA1 Message Date
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Nikolay Kasyanov 97c3c45ba8 [macOS, CI] Use Qt 5.7 7 years ago
Nikolay Kasyanov 913601facc [macOS, CI] reenable packaging to make nightlies work 7 years ago
Bret Curtis 39185e6f8c purge the rest of boost::shared and any other boost related things that no longer are required
put boost system back in, clean others up

revert Qt

add back boost fstream
7 years ago
Nikolay Kasyanov bf630b99fa Use most recent Xcode 7 years ago
Nikolay Kasyanov 27a5c06f04 [OS X, CI] Disable packaging 7 years ago
Nikolay Kasyanov c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 7 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
7 years ago
Nikolay Kasyanov e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 7 years ago
David Cernat 90387aedea Merge pull request #182 from OpenMW/master
Add OpenMW commits up to 5 Mar 2017
7 years ago
Nikolay Kasyanov 672aa80dc5 Revert "Make Travis build test-release-build-on-travis"
4eb5183d73
7 years ago
David Cernat df051a777a Merge pull request #181 from OpenMW/master
Add OpenMW commits up to 4 Mar 2017
7 years ago
Nikolay Kasyanov 4eb5183d73 Make Travis build test-release-build-on-travis 7 years ago
Koncord 366c24ab04 [CI] Update secure token 7 years ago
Koncord 19bd7e50ba [CI] Use QT5 instead QT4 7 years ago
Koncord 0e9746044d [CI] Disable OS X build, again 7 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 ab238e07c4 Fix unnoticed merge conflict 8 years ago
David Cernat bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
8 years ago
Nikolay Kasyanov 2967fbdf4c [CI] Fix email notification configuration 8 years ago
Nikolay Kasyanov 37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 8 years ago
Nikolay Kasyanov 525af97ffc [macOS] Use newer Xcode version on CI 8 years ago
Nikolay Kasyanov 9b74adbb2c [macOS] Reenable CI 8 years ago
David Cernat 973db7c78a Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
8 years ago
scrawl 2eb6ef50ca Revert "[OS X] Reenable CI"
This reverts commit c99d9a47e8.
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 c99d9a47e8 [OS X] Reenable CI 8 years ago
David Cernat 47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
8 years ago
scrawl a5ca33ad0b Disable failing OSX build 8 years ago
Koncord 485a1b1e3b Disable OS X in Travis CI 8 years ago
Koncord b2f1bb06f2 fix travis 2 8 years ago
Koncord 31c372a0e7 resolve depends for travis 8 years ago
David Cernat e9dce26f38 Resolve conflicts in pull request #50
# Conflicts:
#	CMakeLists.txt
8 years ago
Bret Curtis b39516466f lib was unnecessary, deps for travis included openthreads20 which is now built on ppa with osg-3.4 package. translation: fixed on ppa side 8 years ago
Bret Curtis b67d7ec1e0 apparently the lib needs to go in as well 8 years ago
Bret Curtis b944c8716e bump OSG to 3.4 8 years ago
Koncord 0ee5202670 Update .travis.yml 8 years ago
Roman Proskuryakov f4f81a14c9 Use Travis addons.apt.packages to install packages 8 years ago
Roman Proskuryakov 2b860e2600 Reduce the number of if conditions in Travis config 8 years ago
Nikolay Kasyanov 697b809c79 Reactivate OS X CI 8 years ago
scrawl 89512af808 Increase number of jobs for coverity scan build to 2, enable OpenMW-CS build
As of the recent travis migration we should have enough memory to not run out... hopefully.
8 years ago
Bret Curtis b8d19eb9cd make use of 2 dedicated cores while assuming both are blocked on I/O 8 years ago
Bret Curtis 19b39de351 use trusty 8 years ago
scrawl 231570f091 travis.yml fix 9 years ago
scrawl 489addf772 Don't attempt to run openmw_test_suite on coverity scan branch, since it is not being built 9 years ago
scrawl ab97a90c76 Add travis-ci script to detect tab characters in the code 9 years ago
scrawl 3d3b37324d Change build targets again 9 years ago
scrawl 4b002863c8 Re-enabled a few build targets 9 years ago
scrawl 65ba072dcd Disable most targets except for OpenMW in coverity script 9 years ago