baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
b0c4336577
update DejaVuFontLicense entry
4 years ago
40e9b970b9
cmake versioning
5 years ago
cdb8505f1d
Use FetchContent feature of CMake to include openxr dependency instead of the old way.
5 years ago
c9e761eb88
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
5 years ago
2a4bdfedc1
Add CI option for VR build in before script.
...
Slight cmake refactoring.
5 years ago
e40b309d83
move project/cmake to top; set OpenGL_GL_PREFERENCE to LEGACY since we use GL2 and GLNVD is for GL3 and up ( https://github.com/openscenegraph/OpenSceneGraph/issues/639 ); set our RTD to point to stable and not master, stable follows our latest stable release
5 years ago
658b5033e6
OpenXR build and distribution (windows)
5 years ago
39e429c9eb
Add OpenMW commits up to 11 Jul 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
5 years ago
f47d2bb8af
make sure we use case-sensative BULLET_ prefix
5 years ago
76e6862c82
Revert formatting errors based on diff.
5 years ago
51fc105bfd
No longer relevant
5 years ago
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
58d73e14e6
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/environment.cpp
# apps/openmw/mwbase/environment.hpp
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwrender/animation.cpp
# apps/openmw/mwrender/camera.cpp
# apps/openmw/mwrender/camera.hpp
# apps/openmw/mwrender/renderingmanager.cpp
# apps/openmw/mwrender/renderingmanager.hpp
5 years ago
1fcef8fd62
[General] Use lower version requirement for Qt 5
5 years ago
16ca9e2fbd
put back INSTALL platforms
5 years ago
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
36a2308acd
Add OpenMW commits up to 30 May 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwscript/interpretercontext.cpp
5 years ago
62df188fd4
Add OpenMW commits up to 16 May 2020
...
# Conflicts:
# CI/before_script.linux.sh
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwscript/globalscripts.cpp
# apps/openmw/mwscript/interpretercontext.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/cellstore.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
# components/interpreter/context.hpp
5 years ago
d6e4fbe085
Fix mingw Windows build
5 years ago
cbbc82f053
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwinput/inputmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.cpp
# apps/openmw/mwrender/water.cpp
# apps/openmw/mwrender/water.hpp
# apps/openmw/mwworld/worldimp.cpp
5 years ago
add42830d9
Add a flag to use double-precision functions from Bullet
5 years ago
fa861f5d8e
Revert remove of platforms install
5 years ago
e095f6b306
Remove install for not existing file
5 years ago
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option
5 years ago
a20f8e77dc
Add OpenMW commits up to 25 Apr 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
5 years ago
513ac8986d
Add link to opencs documentation on readthedocs, available through
...
context menu.
The documentation opens in default browser.
There are 3 contexts:
- global: opens the OpenMW CS User Manual main page
- when a record is selected: opens the "Tables" page
- when the filter field is selected: opens the "Record Filters" page
There is also a link to the OpenCS tutorial in the help menu.
5 years ago
25a632c650
Add OpenMW commits up to 13 Apr 2020
...
# Conflicts:
# CMakeLists.txt
# README.md
# apps/openmw/engine.cpp
# apps/openmw/mwclass/creaturelevlist.cpp
# apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
613189d7d9
bump to 0.47 for new dev cycle
5 years ago
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream
...
add launchable type
5 years ago
3bd2c114a7
Merge pull request #2741 from akortunov/warnfix
...
Fix C5204 warnings by adding default virtual destructors
5 years ago
da7032caff
Two more that I missed
5 years ago
e6a6411b95
These files aren't in the repo anymore
5 years ago
e63325ebff
Support for camera rotation via gyroscope on Android (feature #5311 )
5 years ago
deac2abc0f
add launchable type; rename files to be conform to freedesktop.org and debian standards
5 years ago
fe75308fdb
Disable warning C5204 which come from Boost library
5 years ago
68c75f66eb
Improvements on combat
5 years ago
491ccf21c5
Merge branch '0.7.1-build-fixes' into 0.7.1
...
# Conflicts:
# components/CMakeLists.txt
5 years ago
2accdc4441
Split view into worldview and menu, for ease of layer management. Basic pose management.
5 years ago
61ef177d48
Build debug, debugging and debuglog for all targets
...
The server will require SDL2
5 years ago
090f13b334
Fix CMake files to allow build server only
5 years ago
2778775070
First commit. Wrote an osgviewer, achieved display.
5 years ago
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
05a8702b6e
Fix Boost 1.70+ detection
5 years ago
353e7d530a
Add OpenMW commits up to 18 Aug 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
ed05125f6a
Add OpenMW commits up to 2 Aug 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
5 years ago
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
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
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
1f3740225b
Purge unnecessary recast stuff
5 years ago
28e54c25ee
Add -DMYGUI_DONT_REPLACE_NULLPTR
6 years ago
9059971a69
Increase required MyGUI version to 3.2.2
6 years ago
df9a8cf957
bump from 11 to 14
6 years ago
6363cc8839
Relax CMake version requirements on macOS
6 years ago
bf144fb356
Merge pull request #2238 from Capostrophic/freetype
...
Include osgdb_freetype in builds with statically linked OSG
6 years ago
7a07984e2c
Include osgdb_freetype in builds with statically linked OSG
6 years ago
a979d24bf3
Mark OpenSceneGraph include directories as system
...
To avoid warnings spam when use custom build.
6 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
de2513653e
AppVeyor: build with Release configuration
7 years ago
759e6fb804
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
669d4d3d7e
Merge pull request #440 from OpenMW/master
...
Add OpenMW commits up to 27 May 2018
7 years ago
48e15dabc3
Try to generate PDB for release builds
7 years ago
44b2cf2b7f
Merge upstream.
7 years ago
6c7d73af7f
Bump c++ standard version to 14
7 years ago
9e5ddeac50
Merge pull request #408 from OpenMW/master
...
Add OpenMW commits up to 18 Apr 2018
7 years ago
789f552ad4
Delete old mygui_resource_plugin which is unlikely to be brought back in its current form because resources can't be accessed by MyGUI's editor if not using the Ogre resources system.
7 years ago
365f485e8d
Merge pull request #397 from OpenMW/master while resolving conflicts
...
Conflicts:
components/CMakeLists.txt
7 years ago
4890ecd357
remove native GLESv* support, as it never worked; make things less complicated as result, fixed lighting.glsl to work with gl2es thanks to ptitSeb
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
d3b623b5d3
http to https for supported urls ( #1625 )
...
* http to https for supported urls
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http tp https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* http to https
* some url fixes
* http to https
7 years ago
451d0de463
Remove dependency on osgAnimation that somehow snuck in
7 years ago
6ec893b618
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
14ef2fa791
Merge pull request #369 from OpenMW/master
...
Add OpenMW commits up to 9 Jan 2018
7 years ago
bd072b131b
Moving controller file out of the controllers subdirectory
7 years ago
3f7143556a
Providing different mappings depending on the version of SDL installed
7 years ago
f56a117bde
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
e4a1b6b5b8
Explicitly setting CMAKE_CXX_STANDARD to C++11
7 years ago
0e481a457e
Merge remote-tracking branch 'refs/remotes/upstream/master'
7 years ago
e7f20e7daf
Merge pull request #351 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# README.md
7 years ago
a4d8aef40d
Merge branch openmw-43 into master
...
Conflicts:
CMakeLists.txt
README.md
files/mygui/openmw_trade_window.layout
7 years ago
f2a6957e16
Merge pull request #331 from OpenMW/master while resolving conflicts
7 years ago
25432146f7
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
3d347730dc
Merge pull request #1524 from psi29a/cmake_31
...
standerdise on 3.1.0
7 years ago
282800b5b2
Create LICENSE ( #1532 )
...
* Create LICENSE
Let's add the license file so that GitHub officially registers it and displays it next to the project.
* move license files
* update licenses in cmakelists.txt
* fix link in README
7 years ago
d19839a666
standerdise on 3.1.0
7 years ago
2e6cf53fdd
Update CPack configuration for NSIS packages
...
Now grabs generated files from the configuration directory where they're
generated
7 years ago
0153b54c3f
increased version number
7 years ago
3a9e5e3a7b
Merge pull request #319 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwworld/worldimp.hpp
7 years ago
2a90dff388
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
9571cd8754
Switch defaultfilters to be handled by a binary-friendly version of the resource macro
7 years ago
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
147455626e
Merge OpenMW/master
7 years ago
ef7102899a
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
7 years ago
f8fe992dc0
Adjust CMake's run-time resource handling such that the Windows CI script does not have to copy these files
7 years ago
41ff3fee89
Merge pull request #310 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
7 years ago
dc127fbb93
Add a launch checkbox to the OpenMW installer
7 years ago
f703dbd1df
Merge pull request #283 from Johnnynator/tes3mp
7 years ago
bd541b1e5b
Merge pull request #287 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
7 years ago
76e8a0b768
Add changes I missed in a merge.
7 years ago
afbdc27a34
Move calls to cmake_minimum_required as early in the CMake process as possible.
7 years ago
David Cernat
Bret Curtis
Mads Buvik Sandvei
laikh
Andrei Kortunov
elsid
Frederic Chardon
Roman Siromakha
Hristos N. Triantafillou
Koncord
capostrophic
Grigory
Nikolay Kasyanov
AnyOldName3
Azdul
Koncord
Chris Djali
cc9cii
Capostrophic
Koncord
Marc Zinnschlag
Kyle Cooley
scrawl
Harald H
Thunderforge
Miloslav Číž
Alexander "Ace" Olofsson