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
2020-11-01 23:17:59 +02:00
Andrei Kortunov
8ca3c3b123
Mark overrided methods by override keyword
2020-10-16 22:18:54 +04:00
David Cernat
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
2020-06-22 20:50:55 +03:00
Andrei Kortunov
d1a3cc98ff
Get rid of ECLD and dependencies
2020-06-17 13:09:16 +04:00
David Cernat
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
2019-08-22 11:42:02 +03:00
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
2019-08-21 23:54:39 +03:00
David Cernat
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
2019-08-21 19:04:04 +03:00
bzzt
ed4ce4609b
Do not re-render maps for all active cells during cell transitions
2019-03-30 09:10:48 +04:00
bzzt
231e629e66
Store map widgets and textures in one vector instead of 4 different ones
2019-03-23 07:46:41 +04:00
bzzt
c2176945bd
Do not use the delayed map cells update
2019-03-22 18:58:34 +04:00
Capostrophic
216e1ab16f
Always include <memory> for smart pointers in MWGui
2019-02-25 18:50:51 +03:00
David Cernat
715012f087
[General] Implement sending of image data for map tiles in PlayerMap
2018-05-08 05:57:04 +03:00
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
2017-10-06 04:10:04 +03:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
01391b7eed
Rename WindowBase's open/close to onOpen/onClose
2017-09-24 19:08:12 +02:00
David Cernat
ad4b1d05bb
[Client] Add comments for GUI additions made by tes3mp
2017-07-03 05:06:07 +03:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
David Cernat
c6cd0a2953
Merge pull request #196 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2017-04-13 07:07:49 +03:00
def
785b3c3d01
Hide WorldButton when in game mode
2017-04-03 09:40:12 +03:00
David Cernat
2ed9ae5739
Merge pull request #149 from OpenMW/master
...
Add OpenMW commits up to 14 Feb 2017
2017-02-14 10:27:53 +02:00
scrawl
72c6b11cf8
Move global map render to the worker thread
2017-02-14 07:58:16 +01:00
David Cernat
14bac1e533
Make player markers appear on inventory map
2016-10-09 13:41:00 +03:00
Koncord
2e81034e53
Started work on the map markers
2016-10-07 13:17:44 +08:00
MiroslavR
ddbfe0c944
Fix disabled door markers appearing on the map ( Fixes #3348 )
2016-08-12 03:14:36 +02:00
scrawl
7d647088ab
Make the local map cell distance configurable
2016-02-05 01:19:45 +01:00
scrawl
bd655c20fd
Refactor local map updates
...
We don't need the delay any more because the rendering itself is part of the normal rendering traversal - so it's delayed anyway.
Don't request maps that we're not actually using (i.e. with cell grid sizes higher than the default 3, we were rendering more maps than the map window could show).
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
ca4e859f61
Remove unused argument
2016-01-11 22:58:01 +01:00
scrawl
e8c9d3ea2a
Fix cell names on world map not always being translated ( Fixes #2832 )
2015-08-13 17:08:21 +02:00
scrawl
6e493500c9
Show custom map markers on the tooltip of the world map marker ( Fixes #2711 )
2015-07-18 00:14:11 +02:00
scrawl
41bed4c7d9
Use multimap to speed up custom map marker code
2015-07-17 20:49:10 +02:00
scrawl
bf9c62fa42
Fix for some coverity scan defects
2015-07-02 20:46:34 +02:00
scrawl
7a1408cfed
Restore display of global map overlay, no exploration yet
2015-05-28 18:49:24 +02:00
scrawl
72d0a69132
Fix global map markers not being cleared on a new game
2015-05-28 18:44:34 +02:00
scrawl
c811ac6afe
Port fog of war
...
Not optimized yet, need to work on fog texture's DataVariance.
2015-05-28 03:50:49 +02:00
scrawl
3dcb167066
Map rendering
2015-05-26 16:40:44 +02:00
scrawl
75ace9f8b5
Global map base layer
2015-05-16 14:48:20 +02:00
scrawl
4e69e7cc0f
OpenMW compiles and runs w/o render window
2015-04-01 17:02:15 +02:00
scrawl
7542fb5cd9
Show map notes on door marker leading to the cell with the note ( Fixes #2284 )
2015-01-31 22:40:41 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
f9cf31fcd5
ESSImport: convert custom map markers, not working for interiors yet
2015-01-19 09:29:21 +01:00
scrawl
5d7dcafa53
Make local map widget size configurable
2014-12-24 15:45:14 +01:00
scrawl
7d36a202a8
Implement cell loading threshold ( Fixes #1874 )
...
The cell loading threshold (default: 1024 units) prevents exterior cell loading until the player has travelled part-way into the next cell. This gets rid of excessive cell loadings when walking along an exterior cell border.
Lower the maximum allowed view distance in options menu to accomodate. Change setting name so that old settings files are upgraded.
2014-10-02 16:50:10 +02:00
scrawl
790e0150b1
Fix global map markers being duplicated when cell is visited again
2014-09-26 16:51:48 +02:00
scrawl
18be152ab1
Allow dragging map even when a marker is hovered
2014-09-26 14:27:52 +02:00
Marc Zinnschlag
9b7f61b4ba
Merge remote-tracking branch 'scrawl/myguiplugin'
2014-09-14 10:45:26 +02:00
Marc Zinnschlag
94a7e38194
Merge remote-tracking branch 'ragora/fixglobalcompassorient'
2014-09-13 15:55:06 +02:00
scrawl
2c58a879ec
Fix minor exploit when map window is shown with transparency
2014-09-13 07:59:29 +02:00
