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
963e1b8b3f
Fix MSVC's C4244 warnings
4 years ago
64fa314dcd
MyGUI const getter macro
4 years ago
1bee59c2b1
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
4 years ago
ba74fbf30e
Fix MyGUI log
...
Also actually print an error to the regular log when the MyGUI log can't
be opened so we notice if we kill it again in under five years.
4 years ago
d52ae28b7a
Fix linking on MacOS
4 years ago
cb2cbb4181
Convert blending factors properly for the character preview
4 years ago
4495b67d77
MyGUI HEAD compatibility
...
Makes OpenMW compatible with the current MyGUI HEAD at:
f93d4fb614#5806
4 years ago
1b193deeac
Misc new stereo integration fixes.
4 years ago
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
4 years ago
b710fa5a75
Another attempt at fixing the pipelines via mygui3.2 compatibility. This time by injecting inheritance of layers to inject the setPick function.
4 years ago
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
4 years ago
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
4 years ago
4f8f0cc8ac
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
4 years ago
d7fadc933f
Fix override warning with MyGUI 3.4
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
90dd416d00
Minor cleanup
5 years ago
6474d703ae
GUI fixes. Animation fixes, i now understand movement accumulation better and was able to clean up some of the hacks with a better result. Lockpicks and probes now work. Haptics. Ready to be playtested.
5 years ago
6f9c405afd
Tentatively completed VR GUI
5 years ago
57e48cfc03
Separate rendering of window menus. It's still awkward. Needs polishing.
5 years ago
14bb0f0208
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
6296f9f124
change gui render order based on vr vs non-vr
5 years ago
2ae7255fac
Pointing beam to visualize what the player is pointing at
5 years ago
5b24c5f3ce
Render menu to quad
5 years ago
650f429ff5
Add final modifier to fix warnings
5 years ago
3032b177a1
Remove redundant includes
6 years ago
d2613e35a2
Fix some Clang 7 warnings
6 years ago
ad36834671
Fix some compiler warnings
6 years ago
e06f0b797a
Replace all NULLs to nullptr
6 years ago
1452684d9e
Use new logging system for components
6 years ago
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
8 years ago
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
a759ef5d2e
Leave the MyGUI::PixelFormat as Unknown when loading from file as its not required.
8 years ago
8fc7942d64
Refactor osgMyGUI::OSGTexture to store width/height inside the object
8 years ago
ac61535d2c
optimize OSGVertexBuffer by double buffering the vertex array instead of recreating it on every modification
8 years ago
641005b317
Remove Camera's children before removing the Camera
...
Should work around OSG race condition ( http://forum.openscenegraph.org/viewtopic.php?t=16077 )
8 years ago
cb8daaaee1
Do not query the texture's image in osgMyGUI::OSGTexture
...
Doing so could result in a race condition if the draw thread is about to delete the image (UnRefImageDataAfterApply enabled)
9 years ago
5f34fb0c41
Remove call to MYGUI_DBG_BREAK which was removed in mygui-git
9 years ago
0dbf44b414
Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency
9 years ago
f898bf493f
Don't use Geodes
9 years ago
9e53e12c70
More renaming of TextureManager -> ImageManager
9 years ago
f99f403dda
Rename TextureManager to ImageManager
9 years ago
e8662bea31
Change the way that image origin is converted to OpenGL's lower-left convention
...
Flip the texture coordinates instead of flipping textures.
This simplifies the TextureManager (no need to worry if the caller wants flipping or not), should make it easier to generalize & multithread it.
9 years ago
e2ee1d5689
Use separate textures for the MyGUI RenderManager
...
This means we can more reliably set the filter parameters.
I believe this commit creates a regression where non-DDS GUI textures would display upside down, which will be addressed by further refactoring in the next commits.
9 years ago
daa94cc50e
Fix cppcheck warnings
9 years ago
37158df339
Update scalinglayer.cpp
...
MSVC Explicitly requires <algorithm> for std::min and/or max
9 years ago
79b3f1e6a8
Small cleanup
9 years ago
59aee04ddb
Implement ScalingLayer, for layouting of widgets in screen-relative coordinates
9 years ago
57b9eafa0f
osgMyGUI: implement AdditiveLayer
9 years ago
David Cernat
Andrei Kortunov
madsbuvi
AnyOldName3
AnyOldName3
Gleb Mazovetskiy
Mads Buvik Sandvei
Bret Curtis
elsid
Ewan Higgs
scrawl
Alexander "Ace" Olofsson