1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:19:55 +00:00
Commit graph

160 commits

Author SHA1 Message Date
David Cernat
6205ff6b04 Add OpenMW commits up to 30 Jan 2019
# Conflicts:
#	apps/openmw/mwworld/worldimp.cpp
2019-08-21 15:48:07 +03:00
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
2019-08-21 14:37:54 +03:00
David Cernat
68886e7539 Add OpenMW commits up to 2 Dec 2018
# Conflicts:
#	.travis.yml
#	README.md
2019-08-21 13:08:56 +03:00
David Cernat
1b9842c175 [CI] Fix oversights in .travis.yml and before_script_linux.sh 2019-08-21 11:23:49 +03:00
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
2019-08-21 09:04:36 +03:00
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
Bret Curtis
b4a78a7e68
add libboost-iostreams-dev 2019-01-20 21:18:52 +01:00
Bret Curtis
8e113a32b2
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
Remove unnecessary Recastnavigation headers & static libs from macOS package
2018-12-21 17:47:15 +01:00
Nikolay Kasyanov
e0161bb2bf Update macOS dependencies, use Xcode 10.1 2018-12-20 22:36:06 +01:00
Nikolay Kasyanov
f98a454ec1 Add a script to verify macOS package contents 2018-12-20 21:18:41 +01:00
Bret Curtis
53c98bd8e1 added TODO and updated notification email for coverity 2018-11-16 10:00:54 +01:00
Bret Curtis
fc15fa0a89 we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml 2018-11-14 21:14:14 +01:00
Bret Curtis
68f62c974a give Xenial a try 2018-11-14 20:53:33 +01:00
Bret Curtis
815909d3cf fix typo 2018-11-14 16:09:30 +01:00
Bret Curtis
b284432e79 Merge branch 'master' into coverity_scan 2018-11-14 14:30:55 +01:00
Bret Curtis
475d8f9915 disable openmw-cs as well, only build the rest due to time constraints 2018-11-14 13:14:54 +01:00
Bret Curtis
25e4156940 enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence 2018-11-14 10:01:12 +01:00
Bret Curtis
7b7138fc0a try gcc5 as last resort 2018-11-13 10:24:07 +01:00
Bret Curtis
6c5e40ef7a try with gcc-6 2018-11-12 23:54:22 +01:00
Bret Curtis
beb22758a6 try gcc-7 instead 2018-11-12 22:18:57 +01:00
Bret Curtis
8b4e7bc73c all on one line 2018-11-12 15:36:13 +01:00
Bret Curtis
e677474319 try and set this globally 2018-11-12 15:09:49 +01:00
Bret Curtis
8ad9d26c2c try using conditionals 2018-11-12 15:05:09 +01:00
Bret Curtis
f8ba0acd1f give this a try 2018-11-12 14:39:50 +01:00
Bret Curtis
3fe7106668 Merge branch 'master' into HEAD 2018-11-09 11:23:28 +01:00
Andrei Kortunov
e5b8491b58 Make Clang analyzer to take assertions in account, even for release builds 2018-11-09 10:03:08 +04:00
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
2018-11-08 17:38:09 +01:00
Marc Zinnschlag
1900cf822b Merge branch 'master' into coverity_scan 2018-09-08 11:22:41 +02:00
elsid
ef631a0961
Add dependency for GMock 2018-08-11 16:52:53 +03:00
Marc Zinnschlag
1d7241f128 Merge remote-tracking branch 'upstream/coverity_scan' into coverity_scan
Conflicts:
	.travis.yml
2018-08-01 15:27:54 +02: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
scrawl
b3a2604592 Disable tools build to try and stay under the time limit 2017-10-15 09:47:48 +00: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