c90a9ab132
Merge branch '0.8.1' of https://github.com/TES3MP/TES3MP into 0.8.1-vr
...
# Conflicts:
# apps/openmw/mwworld/projectilemanager.cpp
3 years ago
a7eeba03a1
[General] Synchronize origin and orientation for non-magical projectiles
3 years ago
ba833551bd
Enable per-view mapping of water textures
3 years ago
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
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
0567dc1fd4
Add OpenMW 0.47 commits up to 25 Jul 2021
3 years ago
8530bc5cf5
Merge branch 'fix_debugbatch_colors' into 'master'
...
Fix black objects in object paging debug view
See merge request OpenMW/openmw!1011
(cherry picked from commit 5287c9627c92b77c25581dbb9ac9d0b0dc4c9698)
389b8300 fix black objects with OP batch debug due to unitialized uniform
4 years ago
a21da63464
Merge branch 'FixLODIssueWithObjectPaging' into 'master'
...
LOD issue with object paging
See merge request OpenMW/openmw!1007
(cherry picked from commit 5688b7b4d8df93fbf28307d2259c57f8d878eeb8)
269cd310 Use same world coordinates to compute distances
4 years ago
62f0237376
Add OpenMW commits up to 17 Jun 2021
4 years ago
7fa67ff675
Use same distance for all lod instances of a chunk
4 years ago
1f0cb09933
Add OpenMW commits up to 1 Jun 2021
...
# Conflicts:
# .travis.yml
# README.md
4 years ago
16ea254fc1
Fix compilation error for openmw target
4 years ago
abee6ca841
Fix #109 also fixes lack of motion controller interaction during main menu and load game.
4 years ago
d906ec773a
Fix hangup on savegame after manual screenshots.
4 years ago
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
4 years ago
d1aaa74193
Rewrite of tracking logic.
4 years ago
d11a6bd92c
Share state
4 years ago
ae66afb219
Merge branch 'less_verbose' into 'master'
...
Make the code less verbose.
See merge request OpenMW/openmw!874
4 years ago
c2e4eda825
Merge branch '6013-fix' into 'master'
...
Retain draw callback
Closes #6013 and #5967
See merge request OpenMW/openmw!875
4 years ago
f3e17e7c52
Don't redundantly call notify on every frame.
4 years ago
62c7adc87b
Merge branch 'no_at_boundaries' into 'master'
...
Don't use at() instead [] when length is checked/known
See merge request OpenMW/openmw!866
4 years ago
5b9a2b73b0
Retain final draw callback as a member variable in ScreenshotManager, and do not call setFinalDrawCallback after init.
4 years ago
c55db790f3
Make the code less verbose / more readable using for range loop and
...
structured binding.
No functional changes.
4 years ago
3d61d7ec9a
Merge branch 'optimize_initial_load' into 'master'
...
Optimize engine initial loading time
See merge request OpenMW/openmw!867
4 years ago
7deb6a6ffd
Use const references when possible in for loops
...
No need for useless copies.
4 years ago
6248dc72cb
Convert to lower case only when needed
4 years ago
f2188d2533
Reduce temporary allocations on ESM loading
...
By moving objects instead of copying when possible.
4 years ago
690d85d0e9
Don't use at() instead [] when length is checked/known
4 years ago
49a744b65a
Make groundcover to use rendering distance in units instead of cells
4 years ago
132fedf290
Analyze only used LOD levels in ObjectPaging
4 years ago
a939cb6692
Skip hidden nodes for ObjectPaging
4 years ago
9b017ef04d
Merge branch 'internal_includes_openmw' into 'master'
...
Clean up some internal includes of the openmw component
See merge request OpenMW/openmw!796
4 years ago
a3f304107b
Add OpenMW commits up to 2 May 2021
...
# Conflicts:
# components/CMakeLists.txt
4 years ago
998cc97a4f
And done!
4 years ago
f4e36f4be5
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
6d351b2bdd
Fix MSVC 4706 warnings
4 years ago
faad18b7f9
Merge pull request #3072 from akortunov/warnfix
...
Fix node masks signed/unsigned mismatch
4 years ago
b7b85bb713
Disable controllers for found sheath meshes (bug #5975 )
4 years ago
2d869ca9ff
Fix node masks signed/unsigned mismatch
4 years ago
d10399e083
Cast double constant to float explicitely
4 years ago
7d5c5f8a24
Do not assign negative values to unsigned variables
4 years ago
9647b670e4
Do not declare unused variables
4 years ago
ce3ed28403
Control stomping via settings.
4 years ago
744d3f2ebc
Only apply tracking data to player's thrown weapons, not NPCs'.
4 years ago
d0883f9a0d
Merge branch 'light_settings_tweak' into 'master'
...
Lighting patch
Closes #5957 and #5959
See merge request OpenMW/openmw!752
4 years ago
16856d45c5
Lighting Patch
...
Fixes build errors with older OSG builds and some issues with 'shared' layout.
Bring back ambient in inventory through lightmodel instead of sun ambient, mirrors scene ambient/sunlight relationship.
Forces shaders when certain lighting methods are enabled and finalize settings.
Correctly override sun for localmap.
4 years ago
33b8233887
Validate GUI scaling and place it to the launcher
4 years ago
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
4 years ago
531a6e1979
Code review fixes, remove implicit GLSL casts
4 years ago
582f7b52cf
Merge remote-tracking branch 'upstream/master' into why_are_the_christmas_lights_still_up
4 years ago
David Cernat
Mads Sandvei
psi29a
CedricMocquillon
Mads Buvik Sandvei
AnyOldName3
Frederic Chardon
jvoisin
elsid
Andrei Kortunov
AnyOldName3
glassmancody.info