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
Kyle Cooley
137ea872d3
Hide base land textures.
2017-10-02 15:56:22 -04:00
scrawl
b24fd77ea2
Merge pull request #1488 from akortunov/equipfix
...
AI: Autoequip armor when bound armor spell expires
2017-10-01 16:06:26 +00:00
scrawl
302e3c8b3d
Merge pull request #1486 from akortunov/pickpocketfix
...
Fix some issues with pickpocketing (bug #4131 )
2017-10-01 16:05:38 +00:00
Andrei Kortunov
21b6bd176f
AI: Autoequip armor when bound armor spell expires
2017-10-01 17:11:30 +04:00
Andrei Kortunov
c5fcb9684e
Improve owned crosshair feature behaviour
2017-09-30 21:29:02 +04:00
Andrei Kortunov
b8fd530ee1
Do not speak with unconscious creatures
2017-09-30 21:20:38 +04:00
Andrei Kortunov
f26206b630
Make unconscious actors do not speak and do not track targets
2017-09-30 20:55:42 +04:00
Andrei Kortunov
3ebb18ce18
Make unconscious actors do not report about crimes
2017-09-30 20:35:29 +04:00
Andrei Kortunov
34895157f9
Consider taking items from unconscious NPC as a theft
2017-09-30 20:22:26 +04:00
Andrei Kortunov
04452b0949
Use a pickpocket crime instead of theft when pickpocketing was failed
2017-09-30 20:11:53 +04:00
scrawl
3c62a8c5c2
Fix console selected object persisting on a new game
2017-09-30 15:40:47 +00:00
scrawl
097b9d90bc
Fix travel service not showing
2017-09-30 15:40:47 +00:00
Kyle Cooley
dfcbee3ab1
Ignore case when comparing textures, also add new textures to lookup map.
2017-09-30 00:04:52 -04:00
scrawl
77ddaa869b
Merge pull request #1484 from drummyfish/master
...
fix rain ripple bug
2017-09-29 22:53:48 +00:00
scrawl
841990fcdb
Merge pull request #1485 from akortunov/master
...
Fix a failed assert in the getCell() check during a new game start
2017-09-29 22:53:10 +00:00
Andrei Kortunov
03daf2b9e3
Fix a failed assert in the getCell() check during a new game start
2017-09-29 22:28:09 +04:00
Miloslav Číž
4999c667b6
fix rain ripple bug
2017-09-29 19:56:16 +02:00
scrawl
5b10e3128e
Use first resolution in fullscreen if current is not supported ( Fixes #4113 )
2017-09-29 14:58:25 +00:00
scrawl
64e27c032b
Merge pull request #1481 from scrawl/keyfocus
...
WindowManager overhaul & improved keyboard support
2017-09-28 22:34:05 +00:00
scrawl
05348ab7ed
Merge pull request #1483 from drummyfish/master
...
water shader improvements plus rain ripple effect (#452 )
2017-09-28 22:31:13 +00:00
Miloslav Číž
64793a55dc
get rid of buggy shader trick
2017-09-28 20:44:43 +02:00
scrawl
7bb0a76df2
Fix tooltips showing when cursor isn't visible
2017-09-28 19:42:16 +02:00
Miloslav Číž
c9c6326d87
fix non-refraction water rain ripples
2017-09-28 19:23:37 +02:00
Miloslav Číž
8416feaf5b
link rain water ripple effect to actual rain
2017-09-28 19:04:31 +02:00
scrawl
14c9e858c8
Check to make sure button is enabled
2017-09-28 17:00:07 +00:00
scrawl
6ec66fa95f
Restore keyfocus to goodbye when selecting a topic
2017-09-28 16:57:55 +00:00
David Cernat
44fb7518ee
Merge pull request #300 from OpenMW/master
...
Add OpenMW commits up to 28 Sep 2017
2017-09-28 11:09:14 +03:00
scrawl
e5d1fd022f
Merge pull request #1479 from akortunov/physics
...
Make physics framerate configurable
2017-09-27 22:31:00 +00:00
scrawl
1ad6cf90c6
Merge pull request #1482 from akortunov/ownerfix
...
Inherit owner, if an item is in container (regression #4128 )
2017-09-27 21:08:54 +00:00
scrawl
0ae009eb21
Hide message box before deleting it
...
Fixes a crash when closing the game window during the 'plugin mismatch' dialog. Modal windows have to be hidden before they are deleted to prevent a dangling pointer in WindowManager.
2017-09-27 22:19:42 +02:00
scrawl
d53e7f8a3c
Remove redundant code
...
Already worked around in WindowBase::setVisible
2017-09-27 22:07:49 +02:00