mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 09:49:55 +00:00
Code Issues Releases Wiki Activity
19464 commits 38 branches 54 tags 122 MiB
Commit graph

115 commits

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
 2017-06-18 18:16:10 +03:00
Nikolay Kasyanov
97c3c45ba8 [macOS, CI] Use Qt 5.7 2017-06-13 09:18:02 +02:00
Nikolay Kasyanov
913601facc [macOS, CI] reenable packaging to make nightlies work 2017-06-11 11:18:39 +02:00
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
 2017-06-09 19:08:53 +02:00
Nikolay Kasyanov
bf630b99fa Use most recent Xcode 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
27a5c06f04 [OS X, CI] Disable packaging 2017-06-09 16:49:25 +02:00
Nikolay Kasyanov
c16506d07c [OS X, CI] Use Xcode 8/macOS 10.12 SDK 2017-06-09 16:49:25 +02:00
David Cernat
e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
 2017-03-13 18:20:07 +02:00
Nikolay Kasyanov
e24cb0fe5d [macOS, CI] Configure deployment of nightly builds to FTP 2017-03-07 21:53:49 +01:00
David Cernat
90387aedea Merge pull request #182 from OpenMW/master 
Add OpenMW commits up to 5 Mar 2017
 2017-03-06 18:40:13 +02:00
Nikolay Kasyanov
672aa80dc5 Revert "Make Travis build test-release-build-on-travis" 
4eb5183d73
 2017-03-05 14:05:19 +01:00
David Cernat
df051a777a Merge pull request #181 from OpenMW/master 
Add OpenMW commits up to 4 Mar 2017
 2017-03-04 22:56:16 +02:00
Nikolay Kasyanov
4eb5183d73 Make Travis build test-release-build-on-travis 2017-03-04 21:44:14 +01:00
Koncord
366c24ab04 [CI] Update secure token 2017-02-26 19:31:15 +08:00
Koncord
19bd7e50ba [CI] Use QT5 instead QT4 2017-01-27 21:35:14 +08:00
Koncord
0e9746044d [CI] Disable OS X build, again 2017-01-27 19:39:33 +08:00
David Cernat
5bdfb72752 Merge pull request #116 from OpenMW/master 
Add OpenMW changes up to 26 Dec
 2016-12-26 01:09:20 +02:00
Nikolay Kasyanov
a0990e5899 [macOS] Switch CI to Xcode 8.2 2016-12-24 16:05:24 +01:00
David Cernat
ab238e07c4 Fix unnoticed merge conflict 2016-12-20 05:25:31 +02:00
David Cernat
bf0a96d552 Merge pull request #114 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
 2016-12-20 05:21:24 +02:00
Nikolay Kasyanov
2967fbdf4c [CI] Fix email notification configuration 2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
37c8a36dd8 [macOS] Parametrize Qt5 version used on CI 2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
525af97ffc [macOS] Use newer Xcode version on CI 2016-12-18 18:22:43 +01:00
Nikolay Kasyanov
9b74adbb2c [macOS] Reenable CI 2016-12-18 18:22:43 +01:00
David Cernat
973db7c78a Merge pull request #113 from OpenMW/master 
Add OpenMW commits up to 17 Dec
 2016-12-17 23:27:09 +02:00
scrawl
2eb6ef50ca Revert "[OS X] Reenable CI" 
This reverts commit c99d9a47e8.
 2016-12-14 20:03:42 +01:00
David Cernat
4d72e7ce37 Merge pull request #91 from OpenMW/master 
Add OpenMW commits up to 31 Oct
 2016-10-31 12:22:37 +02:00
Nikolay Kasyanov
c99d9a47e8 [OS X] Reenable CI 2016-10-30 21:36:43 +01:00
David Cernat
47ebd24b4a Merge pull request #79 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.travis.yml
#	apps/openmw/mwinput/inputmanagerimp.cpp
 2016-10-24 09:18:21 +03:00
scrawl
a5ca33ad0b Disable failing OSX build 2016-10-19 21:59:49 +02:00
Koncord
485a1b1e3b Disable OS X in Travis CI 2016-09-04 17:58:28 +08:00
Koncord
b2f1bb06f2 fix travis 2 2016-09-04 16:51:16 +08:00
Koncord
31c372a0e7 resolve depends for travis 2016-09-04 15:44:37 +08:00
David Cernat
e9dce26f38 Resolve conflicts in pull request #50 
# Conflicts:
#	CMakeLists.txt
 2016-08-31 07:28:32 +03:00
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 2016-08-30 20:09:28 +02:00
Bret Curtis
b67d7ec1e0 apparently the lib needs to go in as well 2016-08-30 19:12:18 +02:00
Bret Curtis
b944c8716e bump OSG to 3.4 2016-08-30 19:00:27 +02:00
Koncord
0ee5202670 Update .travis.yml 2016-08-30 22:04:58 +08:00
Roman Proskuryakov
f4f81a14c9 Use Travis addons.apt.packages to install packages 2016-08-15 18:45:29 +03:00
Roman Proskuryakov
2b860e2600 Reduce the number of if conditions in Travis config 2016-08-15 16:29:01 +03:00
Nikolay Kasyanov
697b809c79 Reactivate OS X CI 2016-03-06 16:09:10 +01:00
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.
 2016-01-21 14:34:11 +01:00
Bret Curtis
b8d19eb9cd make use of 2 dedicated cores while assuming both are blocked on I/O 2016-01-20 14:30:33 +01:00
Bret Curtis
19b39de351 use trusty 2016-01-19 11:15:36 +01:00
scrawl
231570f091 travis.yml fix 2015-11-08 01:21:59 +01:00
scrawl
489addf772 Don't attempt to run openmw_test_suite on coverity scan branch, since it is not being built 2015-11-04 22:24:25 +01:00
scrawl
ab97a90c76 Add travis-ci script to detect tab characters in the code 2015-09-17 00:18:00 +02:00
scrawl
3d3b37324d Change build targets again 2015-07-11 01:38:29 +02:00
scrawl
4b002863c8 Re-enabled a few build targets 2015-07-11 00:45:11 +02:00
scrawl
65ba072dcd Disable most targets except for OpenMW in coverity script 2015-07-01 02:09:13 +02:00