Commit Graph

116 Commits (3b2098382b1d6e59983e150fad17c65f3cdb8123)

Author SHA1 Message Date
uramer 3b2098382b update player map markers when client changes cell 5 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
6 years ago
Andrei Kortunov 441463327c Validate map size 6 years ago
David Cernat 715012f087 [General] Implement sending of image data for map tiles in PlayerMap 6 years ago
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
7 years ago
scrawl 35110fb2f8 Remove unused and slightly broken custom button titles in ConfirmationDialog 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 01391b7eed Rename WindowBase's open/close to onOpen/onClose 7 years ago
David Cernat 73e7aa838d Merge pull request #296 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
scrawl f004622530 Fix global map arrow/button not showing for a split second when the window is opened for the first time 7 years ago
scrawl 7dec773ea9 Fix global map arrow/button not showing for a split second when the window is opened for the first time 7 years ago
David Cernat ad4b1d05bb [Client] Add comments for GUI additions made by tes3mp 7 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
7 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 7 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
7 years ago
David Cernat c6cd0a2953 Merge pull request #196 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
Andrei Kortunov c3d49d5ca5 Fixed inventory crash and skipmenu launch 7 years ago
Andrei Kortunov 72a16dc78b Merge branch 'master' into pinned since added PR #1250 7 years ago
Andrei Kortunov 95ce7637f3 Adds persisted pin (feature #2834, bug #2489) 7 years ago
def 785b3c3d01 Hide WorldButton when in game mode 7 years ago
David Cernat 2ed9ae5739 Merge pull request #149 from OpenMW/master
Add OpenMW commits up to 14 Feb 2017
7 years ago
scrawl 72c6b11cf8 Move global map render to the worker thread 7 years ago
Koncord 536715cf46 Cleanup tes3mp headers 8 years ago
David Cernat 3a733eb122 Make tes3mp includes consistent 8 years ago
Stanislav Zhukov 81dfd21d9a Merge pull request #76 from TES3MP/tes3mp-minimap
Show dedicated players on minimap
8 years ago
Koncord b704519078 Show dedicated players on minimap 8 years ago
Koncord 2e81034e53 Started work on the map markers 8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
MiroslavR ddbfe0c944 Fix disabled door markers appearing on the map (Fixes #3348) 8 years ago
scrawl b9b73d7b12 Replace "sys::default" with ESM::CellId::sDefaultWorldspace 8 years ago
scrawl 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.
8 years ago
scrawl 8e5398d85b Add missing initializations 8 years ago
scrawl 7d647088ab Make the local map cell distance configurable 8 years ago
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).
8 years ago
scrawl ef20962fc5 Disable fog of war rendering on the HUD map by default 8 years ago
scrawl ca4e859f61 Remove unused argument 8 years ago
scrawl 0f347eccbf Flip the origin of global map texture
Now it's consistent with the overlay texture.
9 years ago
scrawl e8c9d3ea2a Fix cell names on world map not always being translated (Fixes #2832) 9 years ago
scrawl 1156668843 Render certain map markers on top of the player arrow (Fixes #2559) 9 years ago
scrawl 77f1387da8 Include cleanup 9 years ago
scrawl 6e493500c9 Show custom map markers on the tooltip of the world map marker (Fixes #2711) 9 years ago
scrawl 41bed4c7d9 Use multimap to speed up custom map marker code 9 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 9 years ago
scrawl e23775e338 Fix -Woverloaded-virtual clang warnings 9 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 9 years ago
scrawl 6d3528af70 Port global map exploration 9 years ago
scrawl 7a1408cfed Restore display of global map overlay, no exploration yet 9 years ago
scrawl 72d0a69132 Fix global map markers not being cleared on a new game 9 years ago
scrawl c811ac6afe Port fog of war
Not optimized yet, need to work on fog texture's DataVariance.
9 years ago
scrawl 3dcb167066 Map rendering 9 years ago