David Cernat
|
9d6f3fdd09
|
Add OpenMW commits up to 1 Dec 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
|
5 years ago |
Andrei Kortunov
|
05a8702b6e
|
Fix Boost 1.70+ detection
|
5 years ago |
|
David Cernat
|
54301f5f89
|
Add OpenMW commits up to 29 Oct 2019
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
# apps/openmw/mwworld/inventorystore.cpp
|
5 years ago |
Bret Curtis
|
5a8bfac4df
|
hard code Qt to version
|
5 years ago |
|
Bret Curtis
|
e7caf7a037
|
bump that qt
|
5 years ago |
|
Bret Curtis
|
4c94fcd52b
|
add msvc2019 and ditch msvc2015
|
5 years ago |
naratzul
|
0220bcdef3
|
Add Visual Studio 2019 support
|
5 years ago |
|
David Cernat
|
5181c601c0
|
Add OpenMW commits up to 2 May 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
|
5 years ago |
|
David Cernat
|
f671c0bddc
|
Add OpenMW commits up to 1 Apr 2019
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
|
5 years ago |
|
David Cernat
|
de16b8118c
|
[CI] Fix execution permission for before_script_linux.sh
|
5 years ago |
|
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
|
5 years ago |
|
David Cernat
|
95a5607509
|
Add OpenMW commits up to 22 Feb 2019
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
|
5 years ago |
|
David Cernat
|
6205ff6b04
|
Add OpenMW commits up to 30 Jan 2019
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
|
5 years ago |
|
David Cernat
|
d439edce70
|
[CI] Fix oversight in before_script_linux.sh
|
5 years ago |
|
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
|
5 years ago |
|
David Cernat
|
68886e7539
|
Add OpenMW commits up to 2 Dec 2018
# Conflicts:
# .travis.yml
# README.md
|
5 years ago |
|
David Cernat
|
1b9842c175
|
[CI] Fix oversights in .travis.yml and before_script_linux.sh
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
|
David Cernat
|
7de1a3d016
|
[CI] Assign execution permissions to Linux .sh files
|
5 years ago |
|
David Cernat
|
7edfca06cf
|
[CI] Fix issues in before_install.linux.sh
|
5 years ago |
|
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
|
5 years ago |
|
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
|
5 years ago |
Nikolay Kasyanov
|
c89876538d
|
Fix macOS nightly preupload check
Previously, it was always ls'ing home directory.
|
6 years ago |
|
Nikolay Kasyanov
|
d305e1933a
|
Get ccache path from Homebrew
Also, don't use legacy syntax to get Qt path.
|
6 years ago |
|
Nikolay Kasyanov
|
95ae9c4ac8
|
Don't downgrade CMake
|
6 years ago |
|
Nikolay Kasyanov
|
a11c391231
|
Enable ccache for macOS CI
|
6 years ago |
|
Bret Curtis
|
8c1a73ff11
|
Merge pull request #2220 from elsid/ccache
Use ccache for linux CI build
|
6 years ago |
elsid
|
26dfa287f9
|
Use ccache for linux CI build
|
6 years ago |
|
elsid
|
7d2c741d1d
|
Fix compare with empty value
|
6 years ago |
|
elsid
|
e99f783c65
|
Remove white spaces and trailing spaces
|
6 years ago |
Alexander Olofsson
|
f8118272f4
|
Package FreeType plugin for OSG in Windows
Fixes #4872
|
6 years ago |
Chris Djali
|
cb5a57e41b
|
Merge pull request #1547 from AnyOldName3/osgshadow-test-vdsm
Shadows
|
6 years ago |
Koncord
|
77386525f2
|
[General] Update Travis CI
|
6 years ago |
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.
|
6 years ago |
AnyOldName3
|
8482236a82
|
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
|
6 years ago |
Azdul
|
6d8215ecb6
|
Google Test / Google Mock / OpenMW unit tests on Windows
|
6 years ago |
|
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.
|
6 years ago |
|
Nikolay Kasyanov
|
9cce6ecfe3
|
[macOS] Update deploy script to use ssh/scp
|
6 years ago |
|
Nikolay Kasyanov
|
956934911a
|
[macOS, CI] Use CMake 3.12.4
See https://gitlab.com/OpenMW/openmw/issues/4767 for details.
|
6 years ago |
|
Bret Curtis
|
8e113a32b2
|
Merge pull request #2081 from nikolaykasyanov/unneed-macos-files
Remove unnecessary Recastnavigation headers & static libs from macOS package
|
6 years ago |
|
Nikolay Kasyanov
|
e0161bb2bf
|
Update macOS dependencies, use Xcode 10.1
|
6 years ago |
|
Nikolay Kasyanov
|
f98a454ec1
|
Add a script to verify macOS package contents
|
6 years ago |
|
AnyOldName3
|
e2515f6db7
|
Merge branch 'master' into osgshadow-test-vdsm
|
6 years ago |
|
AnyOldName3
|
2a2d9f0006
|
Fix if statements
|
6 years ago |
|
AnyOldName3
|
14fcb9158f
|
Add NMake support to the Windows prebuild script.
|
6 years ago |
|
AnyOldName3
|
642002b302
|
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
|
6 years ago |
|
Bret Curtis
|
fc15fa0a89
|
we now have gcc-5 _and_ gcc-8, along with QT5 and use system tinyxml
|
6 years ago |
|
Alexander Olofsson
|
f8f66b83b6
|
Update OpenAL-soft to 1.19.1
|
6 years ago |
|
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
|
6 years ago |