Commit graph

20247 commits

Author SHA1 Message Date
Koncord
6cb9c3c713 [General] Remove explicit specifier 2017-10-11 06:17:02 +08:00
Koncord
3839a2dcfd [Browser] Remove unused variables 2017-10-11 05:46:39 +08:00
Koncord
ed75563a94 [Browser] Do not show "Unreachable" servers when ping filter is enabled 2017-10-11 05:36:31 +08:00
Koncord
01a5196a92 [Browser] Mark few strings translatable 2017-10-10 13:11:36 +08:00
Koncord
15723adb9a [Browser] Make sort servers case insensitive 2017-10-10 13:11:36 +08:00
Koncord
57353cdfff [Browser] Mark unreachable servers as "Unreachable" instead 999 2017-10-10 13:11:36 +08:00
David Cernat
fe9a3088bd Merge pull request #312 from TES3MP/master
Add master commits up to 10 Oct 2017
2017-10-10 06:27:35 +03:00
David Cernat
ec2c964ae1 Merge pull request #311 from TES3MP/0.6.1
Add hotfix commit for 0.6.1 from 10 Oct 2017
2017-10-10 06:26:33 +03:00
David Cernat
f532ab241d [Server] Avoid duplicates of the same player in a cell's loaders 2017-10-10 05:48:56 +03:00
David Cernat
c35101cc36 [Client] Don't use message box call boolean for regular message boxes 2017-10-10 04:11:36 +03:00
David Cernat
4f112ba3d7 [Client] Use regular message boxes where expected to do so
This helps us move towards using the same terminology as OpenMW for GUI elements, leading to less confusion.
2017-10-10 04:05:36 +03:00
Koncord
5c79e7106f [Browser] Minor improvements 2017-10-10 07:17:41 +08:00
David Cernat
41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
2017-10-09 14:41:55 +03:00
scrawl
479f9535b4 Allow training window exit() 2017-10-08 20:38:20 +00:00
scrawl
9cde3e4408 Merge pull request #1495 from akortunov/regressions
Add showsInInventory() check to the ContainerItemModel
2017-10-08 14:09:59 +00:00
scrawl
75c8628613 Merge pull request #1496 from ace13/add-nsis-autolaunch
Add a checkbox for launching OpenMW in the Windows installer
2017-10-08 14:09:42 +00:00
Alexander "Ace" Olofsson
dc127fbb93 Add a launch checkbox to the OpenMW installer 2017-10-08 11:58:38 +02:00
Andrei Kortunov
ea3729790f Add showsInInventory() check to the ContainerItemModel 2017-10-08 09:20:07 +04:00
David Cernat
4845599bda Merge pull request #308 from TES3MP/master while resolving conflicts
# Conflicts:
#	apps/openmw-mp/main.cpp
2017-10-08 06:50:15 +03:00
David Cernat
182f8c1f06 [General] Print client version on startup 2017-10-08 06:17:53 +03:00
David Cernat
3d38da0e85 [Server] Put includes in a specific order 2017-10-08 05:17:14 +03:00
David Cernat
61b1a59814 [General] Move server's version printing method to Utils 2017-10-08 04:16:30 +03:00
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03:00
David Cernat
711c4d83da [Client] Fix build after recent OpenMW changes to GUI 2017-10-07 23:33:36 +03:00
David Cernat
3e8d7c8416 Merge pull request #306 from OpenMW/master
Add OpenMW commits up to 7 Oct 2017
2017-10-07 21:54:21 +03:00
Kyle Cooley
b14404e9cc Fix region colors 2017-10-06 20:05:06 -04:00
scrawl
7021d354c6 Merge pull request #1493 from akortunov/regressions
Regression fixes
2017-10-06 16:21:16 +00:00
David Cernat
7a38a0b223 Merge pull request #305 from TES3MP/master
Add master commits up to 6 Oct 2017
2017-10-06 19:19:49 +03:00
scrawl
2805781542 Fix a crash when exit() already hides the window (Fixes #4148) 2017-10-06 16:18:57 +00:00
Andrei Kortunov
ad27e0f945 Fix owned tooltip in the spellwindow 2017-10-06 11:38:27 +04:00
Andrei Kortunov
e2afd3690c Remove item by id from InventoryStore 2017-10-06 10:54:25 +04: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
842a42ee66 Fix non-top level Windows accepting key focus 2017-10-05 18:41:02 +02:00
scrawl
8c0790580a Add screen fading for exterior cell transitions 2017-10-05 18:41:02 +02:00
scrawl
cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 2017-10-05 18:35:09 +02:00
scrawl
d94235e3a7 Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard 2017-10-04 16:00:39 +00:00
scrawl
12510efab7 Fade screen out during loading screen (when travelling) 2017-10-04 16:00:38 +00:00
scrawl
a4737d8417 Use MyGUI frame events for ScreenFader 2017-10-04 16:00:38 +00:00
scrawl
e4f0f7157a Fix pinned windows not being updated 2017-10-04 16:00:37 +00:00
scrawl
49a0922f1b Remove 'visibility mask' gui feature which did not end up being useful 2017-10-04 16:00:37 +00:00
scrawl
7c68ed04b2 Don't require modal windows to be removed in the same order they were added 2017-10-04 16:00:37 +00:00
scrawl
b5c9977a7b Merge pull request #1489 from akortunov/guifixes
Use an "owned crosshair" feature for items in containers
2017-10-04 15:59:43 +00:00
David Cernat
13e7504348 [Documentation] Update information 2017-10-04 15:44:33 +03:00
Andrei Kortunov
1cb7ed5db1 Use owned tooltips for items in containers correctly 2017-10-04 12:13:45 +04:00
scrawl
433028e8d7 Fix GUI regressions 2017-10-03 22:07:56 +00:00
Nikolay Kasyanov
a795aa7685 Merge pull request #1490 from nikolaykasyanov/ci-dependency-update
[macOS, CI] Update dependencies
2017-10-03 21:46:16 +02:00
Nikolay Kasyanov
c598f1313c [macOS, CI] Update dependencies
The following changes are included:
- https://github.com/OpenMW/openmw-deps-mac/pull/37
- https://github.com/OpenMW/openmw-deps-mac/pull/38
2017-10-03 17:34:45 +02:00
Marc Zinnschlag
dd17f70068 Merge remote-tracking branch 'aesylwinn/landrecords' 2017-10-03 13:32:02 +02:00
scrawl
d7a5622485 Fix book window buttons overlap 2017-10-03 09:16:46 +00:00
Kyle Cooley
2f5449a68c Remove now unnecessary overrides. 2017-10-02 16:13:40 -04:00