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

428 commits

Author SHA1 Message Date
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
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
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
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
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
David Cernat
08e3e9af76 [CI] Assign execution permission to before_script_linux.sh 2021-01-10 06:59:42 +02:00
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
 2021-01-05 07:25:31 +02:00
wareya
18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 2020-12-27 22:16:11 +00:00
David Cernat
4620adc662 Add OpenMW commits up to 30 Nov 2020 
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwphysics/actor.cpp
 2020-12-01 01:15:39 +02:00
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.
 2020-11-17 16:14:05 +00:00
David Cernat
676481d061 Add OpenMW commits up to 14 Nov 2020 
# Conflicts:
#   .travis.yml
#   apps/openmw/mwmechanics/tickableeffects.cpp
 2020-11-14 19:59:59 +02:00
corristo
b8ed3b0059 [macOS, CI] Update dependencies, don't use lz4 from Homebrew 
Also, enable double precision support for Bullet.
 2020-11-10 08:21:46 +00:00
David Cernat
7f435ceeac Add OpenMW commits up to 1 Nov 2020 
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
 2020-11-01 23:17:59 +02:00
psi29a
c86094e4db Bump to C++17 2020-10-20 23:38:05 +02:00
Bret Curtis
06689cfe2a bingo; cleanup 2020-10-20 23:22:37 +02:00
Bret Curtis
8b5aa4c001 try for link overwriting 2020-10-20 23:06:08 +02:00