madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
Gleb Mazovetskiy
3d334dae75
Fix MYGUI/OSG_STATIC and BUILD_SHARED_LIBS
4 years ago
Gleb Mazovetskiy
daf080ff19
cmake: Move MYGUI/OSG_STATIC default to top-level
...
Makes it clear that the USE_SYSTEM variables affect the defaults of
STATIC variables.
4 years ago
Gleb Mazovetskiy
26814b2386
CMakeLists.txt: Restore policies as we unbumped cmake version
4 years ago
Gleb Mazovetskiy
98564b0aae
cmake: move cmake_minimum_required bump to extern/CMakeLists.txt
4 years ago
Gleb Mazovetskiy
a06f598442
cmake: Move USED_OSG_(COMPONENTS|PLUGINS) before add_subdirectory(extern)
4 years ago
Gleb Mazovetskiy
8737453498
cmake: Compiler-specific whole-archive macro
4 years ago
Gleb Mazovetskiy
93fe84aea8
cmake: Move USED_OSG_(COMPONENTS|PLUGINS) from extern to top-level
4 years ago
Gleb Mazovetskiy
99ba45a308
Optional static builds of OSG, MyGUI, Bullet
4 years ago
madsbuvi
24d90ec54d
OSG version check
4 years ago
Gleb Mazovetskiy
24d8412c0c
cmake: Fix missing OPENGL_INCLUDE_DIR
...
OPENGL_INCLUDE_DIR wasn't being included.
It is usually just /usr/include but if it was custom the build failed.
4 years ago
madsbuvi
eb4f393568
Include new osg dependency
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
Mads Buvik Sandvei
823bda139a
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
4 years ago
Mads Buvik Sandvei
637c76f438
Update CMakeLists.txt
4 years ago
Mads Buvik Sandvei
a2a462f416
Update CMakeLists.txt to disable MSVC warning 4866
4 years ago
Mads Buvik Sandvei
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
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
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
4 years ago
Nelsson Huotari
6e77ad1f6a
OSG-Collada animation support
4 years ago
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
4 years ago
Bret Curtis
4032b754e4
set minimal boost version; remove #ifdef boost version checks
4 years ago
Mads Buvik Sandvei
4f8f0cc8ac
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
4 years ago
Bret Curtis
449e7ce86f
C++17; make it count
4 years ago
Bret Curtis
82431b752d
removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd
4 years ago
psi29a
c62546fb12
make it count
4 years ago
psi29a
c86094e4db
Bump to C++17
4 years ago
Bret Curtis
7954dccb44
lz4 prep work; get linux and windows ready
4 years ago
psi29a
b222872446
Android build on gitlab
4 years ago
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides
...
Mark overrided methods as overrides
4 years ago
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
Chris Djali
590635906b
Fix MSVC 2017
...
Resolves the regression introduced with Async Physics
4 years ago
David Cernat
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
4 years ago
tess
38e567a7e4
match opening and closing if args
4 years ago
tessa
02861fa8e3
fix cmake warning
4 years ago
AnyOldName3
683cf8cad5
Remove incorrect spaces from filename
4 years ago
fredzio
e2a603f6e8
Remove blank space
4 years ago
David Cernat
0eedf8fd9f
Add OpenMW commits up to 30 Sep 2020
...
# Conflicts:
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/summoning.cpp
# components/CMakeLists.txt
4 years ago
fredzio
ae38b3d9b2
Put the install logic in one place for all platforms
4 years ago
AnyOldName3
be5fd6fd03
Exclude directories correctly
...
We don't need `/*` as we don't want the directory itself, not just its
contents. We also need to list possible other directories explicitly as
there's currently no way to skip directories without matches.
It would be much nicer if CMake was tracking the DLLs we needed for us.
4 years ago
AnyOldName3
8dd820ba48
Exclude deps
4 years ago
AnyOldName3
d0ddf488db
Install PDBs when appropriate
4 years ago
AnyOldName3
db0f7c607f
Make Windows install target slightly less breakable
4 years ago
fredzio
87290cf6d1
Add support for multi configurations generators on unix
...
Since version 3.17 cmake supports the Ninja Multi-Config
No change for Xcode, VS and Ninja "single config"
4 years ago
AnyOldName3
643db61dfb
Make warnings more informative.
4 years ago
AnyOldName3
1dcea961c6
Only enable LTO for release
...
This is how it was for the original implementation
4 years ago
Eli2
257a6b4629
Use cmake method to enable interprocedural optimizations
4 years ago
David Cernat
80af0ce6a7
Add OpenMW commits up to 29 Aug 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
4 years ago
AnyOldName3
9d083ae8de
Merge branch 'small_fixes' into 'master'
...
move project/cmake to top; set OpenGL_GL_PREFERENCE to LEGACY since we use GL2...
See merge request OpenMW/openmw!266
4 years ago
David Cernat
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
Bret Curtis
b0c4336577
update DejaVuFontLicense entry
4 years ago
Mads Buvik Sandvei
40e9b970b9
cmake versioning
5 years ago
Mads Buvik Sandvei
cdb8505f1d
Use FetchContent feature of CMake to include openxr dependency instead of the old way.
5 years ago
Mads Buvik Sandvei
c9e761eb88
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
5 years ago
Mads Buvik Sandvei
2a4bdfedc1
Add CI option for VR build in before script.
...
Slight cmake refactoring.
5 years ago
Bret Curtis
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
Mads Buvik Sandvei
658b5033e6
OpenXR build and distribution (windows)
5 years ago
David Cernat
39e429c9eb
Add OpenMW commits up to 11 Jul 2020
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
5 years ago
Bret Curtis
f47d2bb8af
make sure we use case-sensative BULLET_ prefix
5 years ago
Mads Buvik Sandvei
76e6862c82
Revert formatting errors based on diff.
5 years ago
Mads Buvik Sandvei
51fc105bfd
No longer relevant
5 years ago
David Cernat
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
Mads Buvik Sandvei
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
David Cernat
1fcef8fd62
[General] Use lower version requirement for Qt 5
5 years ago
Bret Curtis
16ca9e2fbd
put back INSTALL platforms
5 years ago
David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
Bret Curtis
61a5c6125d
#5480 : Drop Qt4 support and require Qt 5.12 or later.
5 years ago
David Cernat
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
David Cernat
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
laikh
d6e4fbe085
Fix mingw Windows build
5 years ago
Mads Buvik Sandvei
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
Andrei Kortunov
add42830d9
Add a flag to use double-precision functions from Bullet
5 years ago
elsid
fa861f5d8e
Revert remove of platforms install
5 years ago
elsid
e095f6b306
Remove install for not existing file
5 years ago
elsid
99cd99bc3b
Remove unused BUILD_MYGUI_PLUGIN option
5 years ago
David Cernat
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
Frederic Chardon
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
David Cernat
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
Bret Curtis
613189d7d9
bump to 0.47 for new dev cycle
5 years ago
Bret Curtis
b243ee6f74
Merge pull request #2744 from OpenMW/debian_appstream
...
add launchable type
5 years ago
Roman Siromakha
3bd2c114a7
Merge pull request #2741 from akortunov/warnfix
...
Fix C5204 warnings by adding default virtual destructors
5 years ago
Hristos N. Triantafillou
da7032caff
Two more that I missed
5 years ago
Hristos N. Triantafillou
e6a6411b95
These files aren't in the repo anymore
5 years ago
Andrei Kortunov
e63325ebff
Support for camera rotation via gyroscope on Android (feature #5311 )
5 years ago
Bret Curtis
deac2abc0f
add launchable type; rename files to be conform to freedesktop.org and debian standards
5 years ago
Andrei Kortunov
fe75308fdb
Disable warning C5204 which come from Boost library
5 years ago
Mads Buvik Sandvei
68c75f66eb
Improvements on combat
5 years ago
David Cernat
491ccf21c5
Merge branch '0.7.1-build-fixes' into 0.7.1
...
# Conflicts:
# components/CMakeLists.txt
5 years ago
Mads Buvik Sandvei
2accdc4441
Split view into worldview and menu, for ease of layer management. Basic pose management.
5 years ago
Koncord
61ef177d48
Build debug, debugging and debuglog for all targets
...
The server will require SDL2
5 years ago
Koncord
090f13b334
Fix CMake files to allow build server only
5 years ago
Mads Buvik Sandvei
2778775070
First commit. Wrote an osgviewer, achieved display.
5 years ago
David Cernat
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
Andrei Kortunov
05a8702b6e
Fix Boost 1.70+ detection
5 years ago
David Cernat
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
David Cernat
ed05125f6a
Add OpenMW commits up to 2 Aug 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
5 years ago
David Cernat
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
David Cernat
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
David Cernat
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