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

272 commits

Author SHA1 Message Date
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
 2019-08-21 19:04:04 +03:00
David Cernat
95a5607509 Add OpenMW commits up to 22 Feb 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/spellcasting.cpp
#	apps/openmw/mwscript/containerextensions.cpp
 2019-08-21 17:29:24 +03:00
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
d439edce70 [CI] Fix oversight in before_script_linux.sh 2019-08-21 14:46:13 +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
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
 2019-08-21 05:08:50 +03:00
David Cernat
7de1a3d016 [CI] Assign execution permissions to Linux .sh files 2019-08-20 13:33:08 +03:00
David Cernat
7edfca06cf [CI] Fix issues in before_install.linux.sh 2019-08-20 13:15:57 +03:00
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
 2019-08-20 13:15:00 +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
Bret Curtis
8c1a73ff11
Merge pull request #2220 from elsid/ccache 
Use ccache for linux CI build
 2019-03-07 12:21:05 +01:00
elsid
26dfa287f9
Use ccache for linux CI build 2019-03-07 11:17:51 +03:00
elsid
7d2c741d1d
Fix compare with empty value 2019-03-07 00:33:26 +03:00
elsid
e99f783c65
Remove white spaces and trailing spaces 2019-03-07 00:33:26 +03:00
Alexander Olofsson
f8118272f4
Package FreeType plugin for OSG in Windows 
Fixes #4872
 2019-02-22 18:37:49 +01:00
Chris Djali
cb5a57e41b
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm 
Shadows
 2019-02-20 15:35:49 +00:00
Koncord
77386525f2 [General] Update Travis CI 2019-02-14 01:56:10 +08:00
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.
 2019-02-04 21:32:54 +01:00
AnyOldName3
8482236a82 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2019-01-24 23:09:23 +00:00
Azdul
6d8215ecb6 Google Test / Google Mock / OpenMW unit tests on Windows 2019-01-23 14:21:03 +01:00
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.
 2019-01-20 11:03:37 +01:00
Nikolay Kasyanov
9cce6ecfe3 [macOS] Update deploy script to use ssh/scp 2019-01-16 23:04:26 +01:00
Nikolay Kasyanov
956934911a [macOS, CI] Use CMake 3.12.4 
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
 2018-12-26 10:17:32 +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
AnyOldName3
e2515f6db7 Merge branch 'master' into osgshadow-test-vdsm 2018-12-18 19:51:27 +00:00
AnyOldName3
2a2d9f0006 Fix if statements 2018-12-07 15:03:36 +00:00
AnyOldName3
14fcb9158f Add NMake support to the Windows prebuild script. 2018-12-07 14:46:32 +00:00
AnyOldName3
642002b302 Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-29 01:19:01 +00: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
Alexander Olofsson
f8f66b83b6 Update OpenAL-soft to 1.19.1 2018-11-13 22:17:04 +01:00
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
 2018-11-09 10:07:36 +01: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
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.
 2018-11-03 20:19:44 +01:00
Andrei Kortunov
f88d5e808c Rewrite media decoder to use FFMpeg 3.2+ API (task #4686) 2018-11-03 22:34:25 +04:00
AnyOldName3
d0c254bc7e Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm 2018-11-01 16:48:21 +00:00
elsid
792a0585c0 Add recastnavigation as subdirectory 2018-11-01 17:01:22 +01:00
AnyOldName3
afd700dab9 Ensure different Boost versions get different names 2018-10-31 23:38:10 +00:00
AnyOldName3
3785ba6aa0 Merge upstream/master 2018-10-30 22:38:09 +00:00
elsid
49d81241db Merge branch 'master' into pathfinder_detour 2018-10-28 17:08:09 +03:00
Nikolay Kasyanov
f62ca24356 [macOS, CI] Use dependencies with downgraded MyGUI, fixing #4665 2018-10-26 19:33:04 +02:00
elsid
3d97e96f55
Add dependency to recastnavigation 2018-10-13 22:16:25 +03:00
AnyOldName3
0124be5713 Merge upstream/master 2018-10-10 21:23:19 +01:00
Capostrophic
e627f49df4 Fix AppVeyor build 2018-10-07 20:22:52 +03:00
elsid
2073218fc6
Use specific googletest version 2018-09-28 22:39:27 +03:00
AnyOldName3
80082308f0 Merge upstream (shadermanager log system revamp) 2018-08-17 18:22:13 +01:00