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
|
2019-08-20 10:06:15 +03:00 |
|
Koncord
|
77386525f2
|
[General] Update Travis CI
|
2019-02-14 01:56:10 +08:00 |
|
elsid
|
ef631a0961
|
Add dependency for GMock
|
2018-08-11 16:52:53 +03:00 |
|
Grim Kriegor
|
88e4927146
|
[Pipeline] Add missing LuaJIT dependency
|
2018-07-14 19:39:19 +01:00 |
|
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
|
2018-07-04 01:52:29 +03:00 |
|
Bret Curtis
|
ae4cb0c3ee
|
no need for macos_qt_formula since on osx there is no more qt4, just qt5
|
2018-06-26 13:50:45 +00:00 |
|
Nikolay Kasyanov
|
90ccf5b42b
|
[macOS, CI] Build using macOS 10.13 SDK
|
2018-06-20 19:59:55 +02:00 |
|
Kyle Cooley
|
d78ae4bab4
|
Allow the clang build to fail for now
|
2018-05-10 21:19:41 -04:00 |
|
Kyle Cooley
|
cf5bd0dca7
|
Travis: use qt5, newer boost libraries, callff, gcc/clang builds...
|
2018-05-10 18:02:45 -04:00 |
|
David Cernat
|
ecb0ad0d77
|
Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
2017-12-25 02:03:02 +02:00 |
|
scrawl
|
269c3227ea
|
Make sure we have cmake for the before_install step
|
2017-12-13 10:44:32 +00:00 |
|
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
|
2017-10-16 07:37:29 +03:00 |
|
scrawl
|
4c174ecd12
|
Merge changes to coverity scan script
|
2017-10-15 17:06:58 +02:00 |
|
David Cernat
|
721b218cc2
|
Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
|
2017-08-05 00:09:34 +03:00 |
|
Nikolay Kasyanov
|
e7e8750816
|
[macOS, CI] Remove encrypted FTP credentials from repo
It seems more convenient to keep them in Travis settings.
|
2017-07-31 09:41:23 +02:00 |
|
Nikolay Kasyanov
|
ccae232563
|
[macOS, CI] Use most recent available Qt
|
2017-07-30 16:34:49 +02:00 |
|
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 |
|