Commit Graph

432 Commits (00997fa7327293db6075d47d18bd36516537ba44)

Author SHA1 Message Date
David Cernat 62f0237376 Add OpenMW commits up to 17 Jun 2021 4 years ago
Bret Curtis 7be09078b4 bump mac deps to include collada 4 years ago
Bret Curtis 91e1898aa2 make use of gitlab openmw-deps 4 years ago
Bret Curtis 49ce26361e update mac deps to include latest OSGoS 3.6, mygui 3.4.1 and multi-threaded bullet 4 years ago
David Cernat 7a6dfc61ec Add OpenMW commits up to 21 May 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwscript/interpretercontext.cpp
#   components/CMakeLists.txt
4 years ago
elsid 4d7e5245a3
Support benchmarks for windows
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
4 years ago
elsid 6492e9522a
Run benchmarks on gitlab CI 4 years ago
David Cernat ea6d5c68ae Add OpenMW commits up to 6 May 2021
# Conflicts:
#   CMakeLists.txt
#   components/CMakeLists.txt
4 years ago
psi29a 1e9a7894d5 Merge branch 'no_recommends' into 'master'
Don't install recommended packages in Debian's CI

See merge request OpenMW/openmw!756
4 years ago
jvoisin 885ff36b01 Don't install recommended packages in Debian's CI 4 years ago
Bret Curtis 4129cc244c allow macos11xcode12 to fail for now; but not macos10.15xcode11; add support for macos10.14_xcode10; make sure fontconfig does not update other stuff 4 years ago
Bret Curtis a1bc10888c add implicit dependancy fontconfig for macos 4 years ago
psi29a 7f7041656d Merge branch 'enforce_double_bullet' into 'master'
Remove support for single-precision Bullet, fail during configuration instead of during linking (#5980)

See merge request OpenMW/openmw!806
4 years ago
David Cernat a3f304107b Add OpenMW commits up to 2 May 2021
# Conflicts:
#   components/CMakeLists.txt
4 years ago
fredzio 6fd04cb8f6 Remove support for single-precision Bullet, fail during configuration instead of during linking. 4 years ago
psi29a aca5d2fc12 Merge branch 'bump-macos-dependencies' into 'master'
Use prebuilt macOS dependencies with fixed SDL and OSG 3.6

Closes #5939

See merge request OpenMW/openmw!804

(cherry picked from commit 74612b1286330b1e34a9c37528502770496e5bba)

9aaca972 Use prebuilt macOS dependencies with fixed SDL and OSG 3.6
4 years ago
AnyOldName3 a8c5fc74d1 Massively simplify the worst Bash ever 4 years ago
jvoisin ce654b0504 Don't run `brew uninstall` outside of travis-ci 4 years ago
nighthawk469 511d3344fe Revert CMAKE_OSX_SYSROOT as this interferes with the gitlab ci builds. 4 years ago
nighthawk469 03bb569995 Revert Xcode sdk version from 11.6 to 10.2 4 years ago
David Cernat cedf70f367 Add OpenMW commits up to 13 Apr 2021
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/actors.cpp
#   apps/openmw/mwmechanics/summoning.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
4 years ago
jvoisin dc10ab7bad Install curl in the coverity job 4 years ago
elsid 010f290fd5
Update OSX deployment target to 10.14
To support std::variant
4 years ago
Max 72a2e3722e update syntax 4 years ago
Max 91bca0cb1f attempt to fix build issue 4 years ago
AnyOldName3 4862e8c8f4 Bump aqt version 4 years ago
David Cernat 59cb31e0a7 Add OpenMW commits up to 20 Mar 2021
# Conflicts:
#   apps/openmw/CMakeLists.txt
#   apps/openmw/mwmechanics/aipursue.cpp
#   components/CMakeLists.txt
4 years ago
psi29a a4719ffdf3 Merge branch 'fix-windows-theme' into 'master'
Deploy Qt style DLL

Closes #5907

See merge request OpenMW/openmw!667
4 years ago
AnyOldName3 b38a817600 Ensure vswhere finds us a single suitable MSVC installation
Also document the numerous arguments to achieve this.
4 years ago
AnyOldName3 1c296a1a78 Deploy Qt style DLL 4 years ago
Bret Curtis 9fbb530dde be explicit and print version information to verification 4 years ago
Bret Curtis 53cb20454f add path hack only to verify, will remove later 4 years ago
Bret Curtis f03beb7963 uninstall qt@6 4 years ago
Bret Curtis 8fc0f965bb which qmake? 4 years ago
Bret Curtis 87ede9284b be more explicit 4 years ago
Bret Curtis 17059cefea give qt@5 a try 4 years ago
Bret Curtis caa8b0ca1a give qt5 a show for brew 4 years ago
Bret Curtis 28cb14289a initial attempt at FindRecastNavigation.cmake 4 years ago
David Cernat 39dc6fc355 Add OpenMW commits up to 24 Feb 2021
# Conflicts:
#   CI/before_script.linux.sh
#   CMakeLists.txt
#   apps/openmw/CMakeLists.txt
#   components/CMakeLists.txt
4 years ago
David Cernat e1259fdc41 Add OpenMW commits up to 4 Feb 2021
# Conflicts:
#   apps/openmw/engine.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwrender/globalmap.cpp
4 years ago
Gleb Mazovetskiy 2798db5418 CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV 4 years ago
Gleb Mazovetskiy 99ba45a308 Optional static builds of OSG, MyGUI, Bullet 4 years ago
psi29a 4974b64cbf Update CI/before_install.osx.sh 4 years ago
David Cernat 08e3e9af76 [CI] Assign execution permission to before_script_linux.sh 4 years ago
David Cernat da3316daf8 Add OpenMW commits up to 4 Jan 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwmechanics/npcstats.hpp
#   apps/openmw/mwphysics/actor.cpp
#   apps/openmw/mwphysics/mtphysics.hpp
#   components/CMakeLists.txt
4 years ago
wareya 18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 4 years ago
David Cernat 4620adc662 Add OpenMW commits up to 30 Nov 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwphysics/actor.cpp
4 years ago
AnyOldName3 211894a178 Fix extraction with 7z 9.10
This is still used in the wild as lots of people install 7zip and never update it because it works. We can't check the version and abort if it's too old as the changelog doesn't make it clear which version fixed the behaviour.
4 years ago
David Cernat 676481d061 Add OpenMW commits up to 14 Nov 2020
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/tickableeffects.cpp
4 years ago
corristo b8ed3b0059 [macOS, CI] Update dependencies, don't use lz4 from Homebrew
Also, enable double precision support for Bullet.
4 years ago