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
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
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
68886e7539
Add OpenMW commits up to 2 Dec 2018
...
# Conflicts:
# .travis.yml
# README.md
5 years ago
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
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
056591b957
Add OpenMW commits up to 14 Sep 2018
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
8482236a82
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
c9df63ffd1
Replace BSAOpt hash calculation with a custom function
6 years ago
a3bcd95546
Merge branch 'cc9cii' of https://github.com/cc9cii/openmw into tes4_bsa
6 years ago
b30d2bab57
Zlib only for Win32
6 years ago
25650e65bf
Read any BSA file - detection based on version in BSA header
6 years ago
a0e89208a0
[General] Fix standalone server build
6 years ago
2306d904c7
[macOS] Fail CMake when trying to use CMake 3.13 for macOS packaging
6 years ago
c3a2a2d73f
Do not package Recastnavigation headers and static libs
6 years ago
e2515f6db7
Merge branch 'master' into osgshadow-test-vdsm
6 years ago
066b74eb43
Merge pull request #2078 from AnyOldName3/cmake-13.1-osg-lib-fix
...
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY
6 years ago
44a408635a
wrap git command in gitfound
6 years ago
76d380e852
if unable to run git at this moment, use empty string
6 years ago
dcbca4b90b
Use if(EXISTS ${OSGDB_LIB} AND NOT IS_DIRECTORY ${OSGDB_LIB})
6 years ago
9067731a96
Adapt to CMake 3.13's new meaning of OSGDB_LIBRARY (i.e. that it can now be a list) while allowing for the possibility that the found libraries may be in different directories when debug and optimised versions exist.
6 years ago
b8b1a52216
add commit date; revert boost as we are not breaking anything yet
6 years ago
6596c400f3
indentation
6 years ago
fc10adb608
makes openmw.appdata.xml a template that accepts @OPENMW_VERSION@ so we do not have to update it all the time; fix deprecated warning for boost header; un-ignore openmw.appdata.xml
6 years ago
642002b302
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
caad388c26
bump our versions to 0.46, keep this commit in mind when trying to automate this into one place
6 years ago
25e4156940
enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence
6 years ago
f88d5e808c
Rewrite media decoder to use FFMpeg 3.2+ API (task #4686 )
6 years ago
b178e1868a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
719c9f0766
Remove compile definition which inadvertently broke other compile definitons
6 years ago
a5afae71e6
Remove unwanted compile definition.
6 years ago
a6d3210a9c
Include missing Windows header before calling Windows-specific functions
6 years ago
d0c254bc7e
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
6 years ago
4c82470933
Do not build recastnavigation tests
6 years ago
bc59a3c455
Build recastnavigation static libraries
6 years ago
792a0585c0
Add recastnavigation as subdirectory
6 years ago
0124be5713
Merge upstream/master
6 years ago
6ec6b9bc2a
OpenMW Integration.
...
Read the ESM/ESP records but do nothing with them for the moment.
6 years ago
3982573035
BSA enhancements.
...
* Implement hash based lookup for TES3 BSA files.
* Added TES4/TES5 BSA support.
* Implemented a hack (non-portable code) in an attempt to reduce startup time under Windows because Boost::filesystem seems to take forever on GetFileAttributeW. This implementation uses FindFirstFile/FindNextFile/FindClose instead.
6 years ago
d3defd83fc
Disable C4643 MSVC warning, caused by boost
6 years ago
cc23a968d1
Merge upstream/master
7 years ago
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
d000f2756e
Update disabled warnings
7 years ago
7fd66c77e6
Update CMake lists for Windows
...
Don't use the debug console on Release-mode builds
Disable spammy 4297 and 5032 warnings that are not specific to OpenMW
7 years ago
3e52857e2b
[General] Fix build for client and construction set
7 years ago
7a032baaa3
[General] Move OSG hack to ELSE branch
7 years ago
553094669b
Merge upstream/master (& fix merge conflicts)
7 years ago
a28b27f5d9
Merge pull request #443 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
c20a0c72c5
Merge pull request #442 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
cae744161b
increased version number
7 years ago
David Cernat
AnyOldName3
Capostrophic
Azdul
Koncord
Nikolay Kasyanov
Chris Djali
Bret Curtis
Andrei Kortunov
elsid
cc9cii
Capostrophic
Koncord
Marc Zinnschlag