Commit Graph

752 Commits (341ca691fc8a465a81b48d7953fc800a887b46fd)

Author SHA1 Message Date
David Cernat a032c8d399 Add TES3MP 0.8.0 commits up to 28 Apr 2022
# Conflicts:
#	apps/openmw/mwclass/creature.cpp
#	apps/openmw/mwclass/npc.cpp
3 years ago
David Cernat 8bb22f1b73 [Client] Make client window use TES3MP title and icon 3 years ago
David Cernat 6875c3422f [Client] Make player inventory items recharge by themselves again
This fixes 4476609872.
3 years ago
David Cernat 4476609872 [Client] Don't unilaterally recharge world items on clients 3 years ago
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
3 years ago
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
3 years ago
David Cernat 1f0cb09933 Add OpenMW commits up to 1 Jun 2021
# Conflicts:
#   .travis.yml
#   README.md
4 years ago
madsbuvi abee6ca841 Fix #109 also fixes lack of motion controller interaction during main menu and load game. 4 years ago
elsid 375372981c
Stop osg viewer threading before destructing engine
To avoid rendering while engine parts are destructing.
4 years ago
David Cernat 7a6dfc61ec Add OpenMW commits up to 21 May 2021
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwscript/interpretercontext.cpp
#   components/CMakeLists.txt
4 years ago
AnyOldName3 09f39b29f0 Load defaults.bin instead of settings-default.cfg. Do not decode yet. 4 years ago
AnyOldName3 92325976e9 Update documentation to refer to defaults.bin 4 years ago
madsbuvi 6baf9a5d3a Callback manager 4 years ago
madsbuvi d598923421 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 4 years ago
madsbuvi 2923174f9a Added a list of setting overrides 4 years ago
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
4 years ago
elsid 8ab5fd9b40
Fix frame rate limit
Measure time at the computation end but before sleep. This allows to adjust
sleep interval for the next frame in case sleep is not precise due to syscall
overhead or too low timer resolution.

Remove old frame limiting mechanism.
4 years ago
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
4 years ago
madsbuvi 6c9df35725 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 4 years ago
Bret Curtis b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
Grass instancing
4 years ago
Frederic Chardon 7cd7fa2f08 Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
a valid file.
4 years ago
Andrei Kortunov f40e227686 Remove redundant formatting changes 4 years ago
Andrei Kortunov 14cf0ce1dc Implement instanced groundcover 4 years ago
madsbuvi 018e790ec0 Unite all viewer traversals. 4 years ago
psi29a 654238fd18 Merge branch 'no_bonus_points' into 'master'
Show mesh origin

Closes #5771

See merge request OpenMW/openmw!507
4 years ago
madsbuvi 81064043f7 Bad order of setting cull flags was masking out the sky. 4 years ago
Mads Buvik Sandvei a2d8a0b61a engine.cpp typos 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
madsbuvi a9cea565f9 Proper handling of cull flags 4 years ago
madsbuvi 2b43e59c09 Fixing crashes 4 years ago
unknown 3bf641d3ce Show mesh origin 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 74806e4893 Better use of osg stereo, avoids redundant synchronization. 4 years ago
Mads Buvik Sandvei 1b193deeac Misc new stereo integration fixes. 4 years ago
Mads Buvik Sandvei 4c9278522e Misc practical fixes from integrating with vr. Reordered construction. Added more callbacks. 4 years ago
Mads Buvik Sandvei d03f55bc2d Basic functions in place. Still bad handling of GUI 4 years ago
Mads Buvik Sandvei 76fc1a8f84 Stereo now initializes before anything is drawn. Added option to add initial/pre/post draw callbacks to stereo. 4 years ago
Mads Buvik Sandvei d3d81a98e5 Make VRGUI use shaders 4 years ago
Mads Buvik Sandvei b98b4db4c1 Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch 4 years ago
Mads Buvik Sandvei c974e1dde3 Merge remote tracking branch multiview_test_branch 4 years ago
Mads Buvik Sandvei 5beb0bc799 Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into multiview_test_branch 4 years ago
Evil Eye e62fff5f2e Add a setting to disable graphical herbalism 4 years ago
Mads Buvik Sandvei c870749c39 Merge remote-tracking branch 'remotes/origin/master' into multiview_test_branch 4 years ago
Mads Buvik Sandvei 85033bb647 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 4 years ago
Mads Buvik Sandvei e42dada208 Load interaction profile suggestions from xml instead of hardcoding them. 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
Andrei Kortunov 8084a336b5 Replace zeroes and nulls by nullptrs 4 years ago
Mads Buvik Sandvei 49e76fa077 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 4 years ago
Frederic Chardon 9aba55a21a Add the async physics worker to the profiler overlay. 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