madsbuvi
|
6c9df35725
|
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
|
2021-02-01 15:09:00 +01:00 |
|
Andrei Kortunov
|
8e5f26c109
|
Code cleanup
|
2021-01-09 14:41:10 +04:00 |
|
Mads Buvik Sandvei
|
4f8f0cc8ac
|
Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr
|
2020-10-22 20:39:53 +02:00 |
|
Andrei Kortunov
|
8ca3c3b123
|
Mark overrided methods by override keyword
|
2020-10-16 22:18:54 +04:00 |
|
Mads Buvik Sandvei
|
e9ed1948f1
|
fix unused warning
|
2020-07-05 11:32:20 +02:00 |
|
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
|
2020-06-28 11:59:07 +02:00 |
|
Andrei Kortunov
|
d1a3cc98ff
|
Get rid of ECLD and dependencies
|
2020-06-17 13:09:16 +04:00 |
|
Mads Buvik Sandvei
|
6f9c405afd
|
Tentatively completed VR GUI
|
2020-05-12 22:13:01 +02:00 |
|
Mads Buvik Sandvei
|
57e48cfc03
|
Separate rendering of window menus. It's still awkward. Needs polishing.
|
2020-05-01 21:37:01 +02:00 |
|
Mads Buvik Sandvei
|
31f5b76394
|
Drop items at location
|
2020-03-10 22:39:11 +01:00 |
|
Capostrophic
|
ee4fa93bd4
|
Rework prevent merchant equipping setting again
|
2019-10-28 01:58:23 +03:00 |
|
Andrei Kortunov
|
f0b73e0a27
|
Do not store owners for items in container stores (bug #1933)
|
2019-10-05 17:29:00 +04:00 |
|
Andrei Kortunov
|
1ce370e7fa
|
Make console to do not hide other GUI windows (bug #1515)
|
2019-05-29 17:10:57 +04:00 |
|
Andrei Kortunov
|
3032b177a1
|
Remove redundant includes
|
2019-02-23 08:02:12 +04:00 |
|
Andrei Kortunov
|
ad9412a117
|
Remove some redundant checks
|
2019-02-17 14:29:36 +04:00 |
|
Andrei Kortunov
|
8580a58ba0
|
Optimize HUD update (do not do unnecessary work)
|
2019-01-25 21:15:29 +04:00 |
|
Andrei Kortunov
|
e06f0b797a
|
Replace all NULLs to nullptr
|
2018-10-09 10:21:12 +04:00 |
|
Capostrophic
|
7ef6fa9f61
|
Remove deprecated GMST get* functions
|
2018-08-29 18:38:12 +03:00 |
|
Andrei Kortunov
|
441463327c
|
Validate map size
|
2018-06-25 09:57:40 +04:00 |
|
scrawl
|
03554b2f4b
|
Fix some style issues flagged by cppcheck
|
2017-10-15 17:06:58 +02:00 |
|
scrawl
|
36c192a1dd
|
Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening
|
2017-09-25 21:15:38 +02:00 |
|
scrawl
|
222defc6d8
|
Extend HUD::clear()
|
2017-09-24 19:08:16 +02:00 |
|
scrawl
|
f67dbc8aa0
|
Remove redundant update function
|
2017-09-24 19:08:15 +02:00 |
|
scrawl
|
ba7ae2663f
|
Use a generic container to delete windows
|
2017-09-24 19:08:15 +02:00 |
|
scrawl
|
84657271c7
|
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
|
2017-09-24 19:08:12 +02:00 |
|
Andrei Kortunov
|
73d5efabee
|
Display negative values on fatigue progress bar
|
2017-08-29 18:53:21 +04:00 |
|
Andrei Kortunov
|
987677db75
|
Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes
|
2017-04-30 22:39:05 +04:00 |
|
Andrei Kortunov
|
b89fdcfd27
|
Vanilla style drowning widget (partially fixes bug #3801).
|
2017-03-24 09:41:18 +04:00 |
|
scrawl
|
a556475fae
|
Explicitely set the user data type to avoid const/non-const mismatch
|
2017-03-13 02:48:23 +01:00 |
|
scrawl
|
7d647088ab
|
Make the local map cell distance configurable
|
2016-02-05 01:19:45 +01:00 |
|
scrawl
|
ef20962fc5
|
Disable fog of war rendering on the HUD map by default
|
2016-01-11 22:58:08 +01:00 |
|
scrawl
|
db7b80b503
|
Revert "Accept a ConstPtr in ItemPtr tooltips"
This reverts commit 41c8ec56e0 .
Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
|
2015-12-19 22:52:35 +01:00 |
|
scrawl
|
41c8ec56e0
|
Accept a ConstPtr in ItemPtr tooltips
|
2015-12-19 16:37:26 +01:00 |
|
scrawl
|
1b1d9a7a9c
|
Fixed another tooltip
|
2015-11-21 02:05:27 +01:00 |
|
scrawl
|
13c7235b6b
|
Remove old FPS setting code
|
2015-11-07 00:13:13 +01:00 |
|
dteviot
|
77a1d947cc
|
extracted MWMechanics::getPlayer()
|
2015-08-21 21:12:39 +12:00 |
|
Marc Zinnschlag
|
d2cd151f77
|
Merge remote-tracking branch 'kunesj/master'
|
2015-07-20 09:45:14 +02:00 |
|
Jiří Kuneš
|
cbc44b33ba
|
define crosshair owned colour in openmw_hud_box.skin.xml
|
2015-07-18 21:29:38 +02:00 |
|
scrawl
|
77f1387da8
|
Include cleanup
|
2015-07-18 20:36:28 +02:00 |
|
Jiří Kuneš
|
66edae9b93
|
change collor of crosshair
|
2015-07-17 17:29:00 +02:00 |
|
scrawl
|
f3cbe7b9da
|
Hide FPS widget since it currently doesn't work, use F3 instead
|
2015-06-07 19:38:59 +02:00 |
|
scrawl
|
4bb3cbf0fb
|
Remove last remains of Ogre
|
2015-06-03 23:04:35 +02:00 |
|
scrawl
|
7bacb9418d
|
Various math code ported to osg
|
2015-06-03 19:41:19 +02:00 |
|
scrawl
|
8e0a988289
|
Icon fix
|
2015-06-01 01:32:02 +02:00 |
|
scrawl
|
3dcb167066
|
Map rendering
|
2015-05-26 16:40:44 +02:00 |
|
scrawl
|
e1f4a7f647
|
Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwgui/mainmenu.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwinput/inputmanagerimp.cpp
apps/openmw/mwrender/animation.cpp
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/npcanimation.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/sky.cpp
components/nif/nifkey.hpp
components/nif/nifstream.hpp
components/nifbullet/bulletnifloader.cpp
components/nifogre/ogrenifloader.hpp
libs/openengine/bullet/physic.cpp
libs/openengine/gui/manager.cpp
|
2015-05-04 02:41:50 +02:00 |
|
scrawl
|
8817f44d63
|
Remove advanced FPS counter (obsoleted by the OSG stats viewer)
|
2015-05-02 17:48:24 +02:00 |
|
scrawl
|
82c4d01b37
|
Add back resource handling workarounds to the gui code
|
2015-05-01 18:37:24 +02:00 |
|
Rohit Nirmal
|
997347b01e
|
Silence -Wreorder warnings.
|
2015-04-28 18:48:02 -05:00 |
|
scrawl
|
4e69e7cc0f
|
OpenMW compiles and runs w/o render window
|
2015-04-01 17:02:15 +02:00 |
|