David Cernat
339a196579
Add OpenMW VR commits up to 4 Jul 2021
...
# Conflicts:
# CMakeLists.txt
# LICENSE
# README.md
# apps/openmw/CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwinput/bindingsmanager.cpp
# apps/openmw/mwmechanics/combat.cpp
2022-02-15 19:45:10 +02:00
David Cernat
572b16af41
Add OpenMW 0.47 commits to OpenMW VR up to 4 Dec 2021
...
# Conflicts:
# .gitlab-ci.yml
# CI/before_script.msvc.sh
# CI/install_debian_deps.sh
# CMakeLists.txt
# apps/openmw/mwrender/screenshotmanager.cpp
# files/ui/advancedpage.ui
2021-12-07 21:49:20 +02:00
David Cernat
62f0237376
Add OpenMW commits up to 17 Jun 2021
2021-06-17 10:33:19 +02:00
Bret Curtis
7be09078b4
bump mac deps to include collada
2021-06-17 01:12:31 +02:00
Bret Curtis
91e1898aa2
make use of gitlab openmw-deps
2021-06-11 20:27:17 +02:00
Bret Curtis
49ce26361e
update mac deps to include latest OSGoS 3.6, mygui 3.4.1 and multi-threaded bullet
2021-06-11 16:44:15 +02:00
David Cernat
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
2021-05-21 16:00:09 +02:00
elsid
4d7e5245a3
Support benchmarks for windows
...
Don't run the binary because gitlab can't execute it successfully due to
unknown reason.
2021-05-11 13:16:59 +02:00
elsid
6492e9522a
Run benchmarks on gitlab CI
2021-05-10 00:21:03 +02:00
David Cernat
ea6d5c68ae
Add OpenMW commits up to 6 May 2021
...
# Conflicts:
# CMakeLists.txt
# components/CMakeLists.txt
2021-05-06 23:32:48 +02:00
psi29a
1e9a7894d5
Merge branch 'no_recommends' into 'master'
...
Don't install recommended packages in Debian's CI
See merge request OpenMW/openmw!756
2021-05-05 11:45:59 +00:00
jvoisin
885ff36b01
Don't install recommended packages in Debian's CI
2021-05-05 11:45:59 +00:00
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
2021-05-05 13:35:39 +02:00
Bret Curtis
a1bc10888c
add implicit dependancy fontconfig for macos
2021-05-05 11:46:59 +02:00
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
2021-05-02 20:52:57 +00:00
David Cernat
a3f304107b
Add OpenMW commits up to 2 May 2021
...
# Conflicts:
# components/CMakeLists.txt
2021-05-02 20:55:49 +02:00
fredzio
6fd04cb8f6
Remove support for single-precision Bullet, fail during configuration instead of during linking.
2021-05-02 17:48:50 +02:00
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
2021-05-02 13:56:31 +00:00
AnyOldName3
a8c5fc74d1
Massively simplify the worst Bash ever
2021-04-28 06:51:15 +00:00
madsbuvi
f4e36f4be5
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-04-24 21:14:51 +02:00
jvoisin
ce654b0504
Don't run brew uninstall outside of travis-ci
2021-04-23 19:21:33 +02:00
nighthawk469
511d3344fe
Revert CMAKE_OSX_SYSROOT as this interferes with the gitlab ci builds.
2021-04-22 23:43:30 +00:00
nighthawk469
03bb569995
Revert Xcode sdk version from 11.6 to 10.2
2021-04-22 18:41:02 +00:00
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
2021-04-13 23:52:37 +02:00
jvoisin
dc10ab7bad
Install curl in the coverity job
2021-04-12 11:26:33 +02:00
elsid
010f290fd5
Update OSX deployment target to 10.14
...
To support std::variant
2021-04-11 14:07:15 +02:00
madsbuvi
1bee59c2b1
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-03-26 17:59:23 +01:00
Max
72a2e3722e
update syntax
2021-03-24 14:01:40 -07:00
Max
91bca0cb1f
attempt to fix build issue
2021-03-24 13:28:34 -07:00
AnyOldName3
4862e8c8f4
Bump aqt version
2021-03-21 21:30:17 +00:00
David Cernat
59cb31e0a7
Add OpenMW commits up to 20 Mar 2021
...
# Conflicts:
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/aipursue.cpp
# components/CMakeLists.txt
2021-03-20 16:44:11 +02:00
psi29a
a4719ffdf3
Merge branch 'fix-windows-theme' into 'master'
...
Deploy Qt style DLL
Closes #5907
See merge request OpenMW/openmw!667
2021-03-18 08:27:52 +00:00
AnyOldName3
b38a817600
Ensure vswhere finds us a single suitable MSVC installation
...
Also document the numerous arguments to achieve this.
2021-03-17 23:29:48 +00:00
AnyOldName3
1c296a1a78
Deploy Qt style DLL
2021-03-17 18:11:36 +00:00
Bret Curtis
9fbb530dde
be explicit and print version information to verification
2021-03-05 13:25:46 +01:00
Bret Curtis
53cb20454f
add path hack only to verify, will remove later
2021-03-05 13:20:03 +01:00
Bret Curtis
f03beb7963
uninstall qt@6
2021-03-05 13:12:42 +01:00
Bret Curtis
8fc0f965bb
which qmake?
2021-03-05 13:10:22 +01:00
Bret Curtis
87ede9284b
be more explicit
2021-03-05 13:08:38 +01:00
Bret Curtis
17059cefea
give qt@5 a try
2021-03-05 13:07:26 +01:00
Bret Curtis
caa8b0ca1a
give qt5 a show for brew
2021-03-05 13:03:21 +01:00
Bret Curtis
28cb14289a
initial attempt at FindRecastNavigation.cmake
2021-03-02 22:48:17 +01:00
madsbuvi
fff57bc047
missing debian dependencies
2021-03-02 16:35:35 +01:00
madsbuvi
d598923421
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-03-02 14:32:34 +01:00
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
2021-02-24 13:02:57 +02:00
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
2021-02-05 02:16:03 +02:00
madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-01 15:09:00 +01:00
Gleb Mazovetskiy
2798db5418
CI/before_script.linux.sh: <tab> -> 4 spaces and remove unused ENV
2021-01-26 19:00:55 +00:00
Gleb Mazovetskiy
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
2021-01-26 19:00:55 +00:00
psi29a
4974b64cbf
Update CI/before_install.osx.sh
2021-01-17 15:58:43 +00:00
