teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity
21,770 Commits
34 Branches
0 Tags
66 MiB
0.7.0
0.7.0-alpha
0.7.0-beta
master
0.8.0-dev
experimental-mono
sol2-server-rewrite
0.6.3
0.6.2
0.6.1-openmw-updates
new-script-api
0.6.1
experimental
coverity_scan
openmw-39
move
openmw-36
openmw-38
drop
openmw-37
sceneinput
c++11
test
replace
celladd
search
openmw-35
moveref
report
loadfix
openmw-33
deque
openmw-30
actorid
openmw-0.39.0
openmw-0.38.0
openmw-0.37.0
openmw-0.36.1
openmw-0.36.0
openmw-0.35.1
openmw-0.35.0
openmw-0.34.0
openmw-0.33.1
openmw-0.33.0
openmw-0.32.0
openmw-0.31.0
openmw-0.30.0
openmw-0.29.0
openmw-0.28.0
openmw-0.27.0
openmw-0.26.0
openmw-0.25.0
openmw-0.24.0
openmw-0.23.0
openmw-0.22.0
openmw-0.21.0
openmw-0.20.0
openmw-0.19.0
openmw-0.18.0
openmw-0.17.0
openmw-0.16.0
openmw-0.15.0
openmw-0.14.0
openmw-0.13.0
openmw-0.12.0
openmw-0.11.1
openmw-0.11.0
openmw-0.10.0
openmw-0.9.0
0.7.0-alpha
old_d_version
openmw-0.07_Bond_just_Bond
openmw-0.08
tes3mp-0.0.1b
tes3mp-0.0.1b.2
tes3mp-0.0.1c
tes3mp-0.2.0
tes3mp-0.3.0
tes3mp-0.4.0
tes3mp-0.4.1
tes3mp-0.5.0
tes3mp-0.5.1
tes3mp-0.6.0
tes3mp-0.6.1
tes3mp-0.6.2
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '6cb5ac6e63'
${ noResults }
Commit Graph

207 Commits (6cb5ac6e63fb9bf6b27e827a227161f6dbc82f0a)

Author SHA1 Message Date
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts 
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
 6 years ago
Andrei Kortunov c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
David Cernat 1e749938fb
Merge pull request #426 from OpenMW/master 
Add OpenMW commits up to 15 May 2018
 6 years ago
David Cernat 715012f087 [General] Implement sending of image data for map tiles in PlayerMap 6 years ago
Andrei Kortunov 4872edc5ed Prevent PlaySound overlapping 6 years ago
David Cernat ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts 
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
 6 years ago
David Cernat bb15ee9215 [Client] Make it possible to get ContainerWindow from elsewhere in code 6 years ago
Andrei Kortunov e0aa5e8e79 Prevent overlapping for journal and books scrolling 6 years ago
David Cernat db0e0d376e [Client] Use new code to set the console's Ptrs from server scripts 
Previously, reusing the console's object selection code made it so using the same Ptr twice in a row was akin to clicking on the same object twice in the console window, i.e. the object was deselected the second time around. Additionally, that same code was setting key focus to the hidden console window, preventing players from moving until they activated another window (such as their inventory or chat window).
 6 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 6 years ago
David Cernat 535fba0cb3 [Client] Finish drag and drops when arrested or teleported by server 7 years ago
David Cernat d06817a356
Merge pull request #347 from OpenMW/master 
Add OpenMW commits up to 25 Nov 2017
 7 years ago
David Cernat 6668b9ab42 [General] Implement ConsoleCommand packet 7 years ago
Andrei Kortunov 3571f7f413 Remove getEncoding() from WindowManager 7 years ago
Andrei Kortunov f0ca3eabd3 Merge from upstream master 7 years ago
Andrei Kortunov a83a43e376 Determine when need to use the Cyrillic journal index 7 years ago
David Cernat 50d5fffb7f [General] Add and implement PlayerQuickKeys packet 7 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 49a0922f1b Remove 'visibility mask' gui feature which did not end up being useful 7 years ago
scrawl 7c68ed04b2 Don't require modal windows to be removed in the same order they were added 7 years ago
scrawl fce9a14986 Hide the mouse cursor until it's used 7 years ago
scrawl 2ce79e07a4 Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways. 
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
 7 years ago
scrawl 36c192a1dd Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening 7 years ago
scrawl d78e822833 Add 'delay' argument for screen fading operations 7 years ago
scrawl d10985e481 Remove unneeded window pointers 7 years ago
scrawl f67dbc8aa0 Remove redundant update function 7 years ago
scrawl ba7ae2663f Use a generic container to delete windows 7 years ago
scrawl 5f440a29bd Remember key focus per GUI mode 
Among other things, this will remember the focused button in the container window, allowing quick looting of multiple containers.
 7 years ago
scrawl ad4b91131f toggleGui renamed to toggleHud, remove unused variable 7 years ago
scrawl 20766fb508 Associate open/close sounds with the GUI mode 7 years ago
scrawl 269094ba8d Restore the previous key focus widget when exiting modal dialog 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
scrawl 3820416277 Refactor the unholy mess that is WindowManager::updateVisible 
GUI modes are now defined in a general and extensible way. The next commits are going to take advantage of this.
 7 years ago
scrawl c11fe6788f Add basic keyboard navigation for the GUI 
(Shift)Tab cycles, arrow keys move to the next button in that direction, Enter/Space accepts.

Note: Unless MyGUI is hacked to bits, clicking on an empty space will annoyingly reset the key focus. Not sure how to deal with that yet.

The visual highlight for selected buttons requires MyGUI commit 632d007429d0bf0c7d7f6c5db4a08353a63dd839 or later to appear (to be released in 3.2.3).
 7 years ago
David Cernat bd541b1e5b Merge pull request #287 from OpenMW/master while resolving conflicts 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
 7 years ago
MiroslavR 1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) 7 years ago
David Cernat 4468e6ec4a Merge pull request #280 from OpenMW/master while resolving conflicts 
# Conflicts:
#	.gitignore
#	apps/openmw/mwmechanics/actors.hpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
 7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
David Cernat 500bff9911 Merge pull request #250 from OpenMW/master 
Add OpenMW commits up to 27 Jul 2017
 7 years ago
Julian d7aa2a882d improve dialogue window performance 7 years ago
David Cernat e3929df38a Merge pull request #239 from OpenMW/master 
Add OpenMW commits up to 14 Jul 2017
 7 years ago
David Cernat 708d3723eb [Client] Fix client script messagebox buttons that had always broken in tes3mp 7 years ago
Andrei Kortunov 54b4d93f79 Added a special function for GUI sounds playing 7 years ago
David Cernat 71313c5aa6 [General] Implement PlayerMap packet, part 1 7 years ago
Ewan Higgs 38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 7 years ago
Andrei Kortunov 2b3b6d558f Move updatePinnedWindows() function to private section 7 years ago
Andrei Kortunov f986e3fafa Remove unused code 7 years ago
Andrei Kortunov 6c1e3a0618 Merged from upstream master 7 years ago
scrawl 1ffb9e1bf3 Remove renderWorldMap() 7 years ago
Andrei Kortunov c3d49d5ca5 Fixed inventory crash and skipmenu launch 7 years ago