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
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
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
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
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
7bb0a76df2
Fix tooltips showing when cursor isn't visible
2017-09-28 19:42:16 +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
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
scrawl
0deda69a27
Fix wrong skin for levelup attribute values
2017-09-27 22:04:36 +02:00
scrawl
e9d81fdf5a
Fix being able to escape interactive messageboxes
2017-09-27 22:00:20 +02:00
scrawl
db650df416
Fix 'blocking' messageboxes not handling key focus properly
2017-09-27 21:41:22 +02:00
scrawl
a0f5e32113
Fix 'new game' from the main menu not removing menu afterwards
2017-09-27 21:38:15 +02:00
scrawl
0ee57effcc
Make 'Delete game' button not accept keyfocus, to prevent accidents
2017-09-27 12:56:12 +00:00
scrawl
c7a82704c6
Fix key focus resets in SaveGameDialog
2017-09-27 12:56:11 +00:00
scrawl
3d2ad2d339
Include cleanup
2017-09-27 12:56:09 +00:00
scrawl
87311d86b5
Fix what looks like a copy/paste error
2017-09-27 12:56:08 +00:00
scrawl
7a3fbfb34a
Slightly improve journal window keyboard navigation
2017-09-27 12:56:05 +00:00
scrawl
05814c0929
Add key focus handling for WaitDialog
...
Default is 'until healed'. Up/Down arrows change the hour slider and implicitely change the button to 'Wait'.
2017-09-27 12:56:03 +00:00
scrawl
8964fc93d6
Fix dialogue window not being exited properly
2017-09-27 12:56:02 +00:00
scrawl
7a64098da3
Avoid rebuilding the dialogue topics pane unnecessarily
...
Also retaining key focus.
2017-09-27 12:56:02 +00:00
scrawl
22929e53fa
Don't ignore my own advice
...
Can't wait until MyGUI 3.2.2 is a build dependency, then we can use key focus events to handle the SDL text input.
2017-09-27 12:55:58 +00:00
scrawl
1714271a76
Improve KeyboardNavigation to better handle modal windows
...
It's no longer possible to cycle to widgets that aren't part of the current modal window.
The window manager will remember the focused widget of a modal window on a limited basis (it'll be discarded when a different modal window opens).
2017-09-27 12:55:58 +00:00
scrawl
41fe16013b
Select first widget if we can't find the current widget
2017-09-27 12:55:55 +00:00
scrawl
475ac46f3e
Workaround keyfocus issues in current versions of MyGUI
2017-09-27 12:55:54 +00:00
scrawl
010a7ea5b3
Fix tooltip widgets being set to accept key focus
2017-09-27 12:55:52 +00:00
scrawl
2514cc5cc8
Workaround key focus being reset in BookWindow when next/prev are hidden
2017-09-27 12:55:50 +00:00
scrawl
fce9a14986
Hide the mouse cursor until it's used
2017-09-27 12:55:48 +00:00
scrawl
9b91ea5d34
Exit drag-and-drop if dragged item is deleted ( Fixes #3097 )
2017-09-26 16:51:19 +02:00
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
2017-09-25 23:38:28 +02:00
scrawl
c5613e384e
Remove duplicate disposition code
2017-09-25 21:30:03 +02:00
scrawl
36c192a1dd
Undo the console portion of 84657271c7 because it results in the console forgetting its object on opening
2017-09-25 21:15:38 +02:00
scrawl
717e68fab2
Remove redundant resetHistory argument
2017-09-25 19:58:34 +02:00
scrawl
e14573fa8c
Add missing null check
2017-09-25 19:53:42 +02:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
f8ffd85146
Topic passed to keywordSelected() no longer has to be lower case
...
Remove redundant mDialogueMap
2017-09-25 19:03:38 +02:00
scrawl
b7752ec52d
Make TradeWindow not depend on DialogueWindow
2017-09-25 18:07:49 +02:00
scrawl
d78e822833
Add 'delay' argument for screen fading operations
2017-09-25 00:47:10 +02:00
scrawl
c035548f37
Make Tab work if selected widget is marked as not needing keyfocus
2017-09-25 00:47:09 +02:00
scrawl
94b538ac82
Fix crash due to not calling WindowModal::onClose()
2017-09-25 00:47:08 +02:00
scrawl
67dc4e019a
Make Enter on trade window price attempt the trade
2017-09-25 00:47:07 +02:00
scrawl
8ae7e4c958
Make Enter on a name edit accept the dialog
2017-09-25 00:47:07 +02:00
scrawl
843106fc61
Handle the wait progress bar as part of the GUI mode
2017-09-25 00:47:06 +02:00
scrawl
9ed1b16553
Extend code that detects whether a key was consumed by the GUI ( Fixes #4016 )
2017-09-25 00:47:05 +02:00
scrawl
0e57f1317b
Remove redundant setVisible(false)
2017-09-25 00:47:05 +02:00
scrawl
331192f2d6
Improve keyboard navigation of book/scroll windows
2017-09-25 00:47:04 +02:00
scrawl
d58ff4a736
Remove obsolete Container GUI keyboard handling
2017-09-24 19:08:16 +02:00
scrawl
c0d8bef82f
Call changeInputMode() from updateVisible()
2017-09-24 19:08:16 +02:00
scrawl
222defc6d8
Extend HUD::clear()
2017-09-24 19:08:16 +02:00
scrawl
f6c227b966
Reset screen faders in clear()
...
Fixes a black screen when loading a game while waiting/resting.
2017-09-24 19:08:15 +02:00
scrawl
d10985e481
Remove unneeded window pointers
2017-09-24 19:08:15 +02:00
scrawl
f67dbc8aa0
Remove redundant update function
2017-09-24 19:08:15 +02:00
scrawl
e7d2a8a4dc
Call clear() for every window
2017-09-24 19:08:15 +02:00
scrawl
c6c01870ec
Call onResChange for every window
2017-09-24 19:08:15 +02:00
scrawl
2b03bc0c56
Call WindowBase::onFrame() for every active window
2017-09-24 19:08:15 +02:00
scrawl
ba7ae2663f
Use a generic container to delete windows
2017-09-24 19:08:15 +02:00
scrawl
32f9c8058a
Remove redundant RestBed gui mode
2017-09-24 19:08:14 +02:00
scrawl
9ead331741
Fix pinned windows showing in other GUI modes
2017-09-24 19:08:14 +02:00
scrawl
65a707348c
Make Tab select the first widget if none is selected
2017-09-24 19:08:14 +02:00
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.
2017-09-24 19:08:14 +02:00
scrawl
35110fb2f8
Remove unused and slightly broken custom button titles in ConfirmationDialog
2017-09-24 19:08:14 +02:00
scrawl
ad4b91131f
toggleGui renamed to toggleHud, remove unused variable
2017-09-24 19:08:14 +02:00
scrawl
be19f51013
Adjust some more windows to be keyboard friendlier
2017-09-24 19:08:14 +02:00
scrawl
4fff2e2e34
Refactor exitCurrentGuiMode
2017-09-24 19:08:13 +02:00
scrawl
20766fb508
Associate open/close sounds with the GUI mode
2017-09-24 19:08:13 +02:00
scrawl
531e7ac586
Allow drag-and-drop to be cancelled (Esc or Inventory key)
2017-09-24 19:08:13 +02:00
scrawl
269094ba8d
Restore the previous key focus widget when exiting modal dialog
2017-09-24 19:08:13 +02:00
scrawl
bbafe1e456
Remove redundant player cell variable
2017-09-24 19:08:13 +02:00
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02:00
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.
2017-09-24 19:08:12 +02:00
scrawl
01391b7eed
Rename WindowBase's open/close to onOpen/onClose
2017-09-24 19:08:12 +02:00
scrawl
5482ad0482
Fix tab completion in console to not cycle key focus
2017-09-24 19:08:11 +02:00
scrawl
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
2017-09-24 19:08:11 +02:00
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).
2017-09-24 19:08:11 +02:00
scrawl
b22fedf4ae
Check 'sYes' in addition to 'sOk' for message box's default keyfocus
2017-09-24 19:08:11 +02:00
scrawl
0e648222b8
Merge pull request #1446 from akortunov/takeallfix
...
Do not allow to equip a replacement, when take all items from a dead corpse
2017-09-22 09:14:21 +00:00
Andrei Kortunov
4580024d76
Unequip all items from dead corpse when take all items (bug #4095 )
2017-09-22 12:32:47 +04:00
scrawl
f004622530
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 22:24:20 +00:00
scrawl
fa364726b8
Merge pull request #1468 from akortunov/itemsorting
...
Improve item sorting in inventory and containers
2017-09-20 22:22:56 +00:00
scrawl
7dec773ea9
Fix global map arrow/button not showing for a split second when the window is opened for the first time
2017-09-20 23:03:14 +02:00
Andrei Kortunov
771f58ce58
Remove unwanted warnings
2017-09-20 19:47:14 +04:00
Andrei Kortunov
9d826b2deb
Improve item sorting in inventory and containers
2017-09-20 11:57:00 +04:00
scrawl
26e3de1025
Merge pull request #1464 from akortunov/guifixes
...
Fixed padding of MessageBox buttons
2017-09-19 20:16:09 +00:00
Andrei Kortunov
2806a35a61
Fixed padding of MessageBox buttons
2017-09-18 23:09:38 +04:00
scrawl
c39c29722b
Merge pull request #1459 from akortunov/cyclingfix
...
Cycle only through weapons which player can equip
2017-09-17 13:17:41 +00:00
Andrei Kortunov
10a0136b4a
Cycle only through weapons which can be equipped by player (bug #4104 )
2017-09-17 17:14:50 +04:00
Andrei Kortunov
3fb3c4c20f
Add scrollbar to a birth effect lists (bug #4105 )
2017-09-17 14:06:01 +04:00
scrawl
5dd2e871c8
Merge pull request #1450 from kcat/master
...
Sound improvements
2017-09-16 15:59:13 +00:00
Chris Robinson
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
2017-09-15 02:36:59 -07:00
Bret Curtis
e517ad3f7b
add ktx support for splashscreens
2017-09-14 10:06:36 +02:00
Bret Curtis
dff0a766a8
adding 3 more extensions
2017-09-13 15:30:22 +02:00
Bret Curtis
b26887ef9b
add support for png and dds splashscreens to begin with.
2017-09-13 13:52:05 +02:00
scrawl
00ae9a01a1
Merge pull request #1445 from akortunov/guifixes
...
Allow to add levelup a description for levels > 20
2017-09-11 10:28:09 +00:00
Andrei Kortunov
7760e4514c
Allow to add levelup a description for levels > 20
2017-09-10 22:47:34 +04:00
MiroslavR
1e585ac71a
Log a warning in case of missing bookart instead of showing a pink rectangle ( Fixes #3826 )
2017-09-08 22:50:07 +02:00
Andrei Kortunov
ac2f20f983
Update a disposition bar when a dialogue widget is disabled, but visible
2017-09-08 19:42:06 +04:00
Andrei Kortunov
91dcd5bc6e
Do not allow to unequip weapon from inventory during attack
2017-08-31 13:28:09 +04:00
Andrei Kortunov
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
2017-08-31 12:36:54 +04:00
scrawl
8c6a8ca48d
Respect the framelimit in all cases ( Fixes #3531 )
...
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
2017-08-30 21:26:30 +00:00
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
2017-08-29 23:11:23 +00:00
Andrei Kortunov
73d5efabee
Display negative values on fatigue progress bar
2017-08-29 18:53:21 +04:00
Andrei Kortunov
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
2017-08-29 15:53:23 +04:00
scrawl
4fba157d3b
Implement releaseGLObjects for cached resources
2017-08-26 19:29:12 +00:00
Andrei Kortunov
0177fe6602
Display large entries in journal correctly
2017-08-22 23:26:06 +04:00
Andrei Kortunov
65d05ee1cd
Get only text from clipboard (bug #4025 )
2017-08-19 15:32:17 +04:00
Andrei Kortunov
e0bb9c089b
Revert commit 67d59bead5 (a better
...
implementation found)
2017-08-19 15:24:06 +04:00
Andrei Kortunov
7c80ddc9de
Owned crosshair improvements (bug #2789 )
2017-08-18 17:08:15 +04:00
Andrei Kortunov
67d59bead5
Get only text from input fields (bug #4025 )
2017-08-16 15:03:04 +04:00
Andrei Kortunov
ec64034160
Confiscate stolen item/gem when enchanting
2017-08-14 19:29:34 +04:00
Andrei Kortunov
f84eb68b3d
Confiscate an item when you try to sell it to its owner (bug #3944 )
2017-08-14 11:31:17 +04:00
scrawl
1bdcecc32e
Merge pull request #1390 from akortunov/referencecheck
...
Do not make target reference unavailable on cell change
2017-08-12 18:48:52 +00:00
scrawl
b6aaa2f2be
Merge pull request #1389 from akortunov/autosave
...
Create autosave when waiting
2017-08-12 16:50:30 +00:00
Andrei Kortunov
b3b7d6aa9f
Do not make target reference unavailable on cell change (bug #3898 )
2017-08-12 09:36:09 +04:00
Andrei Kortunov
c542ae6875
Create autosave when waiting (bug #1452 )
2017-08-12 09:06:31 +04:00
scrawl
0f983144a4
Merge pull request #1383 from akortunov/guifixes
...
Enable transparency for interactive messageboxes and tooltips in game mode
2017-08-10 21:55:24 +00:00
Andrei Kortunov
56f5a5dee3
Added transparency to 'owned' tooltip
2017-08-08 22:57:39 +04:00
Andrei Kortunov
4cc8afd25d
Add transparency for tooltips in game mode
2017-08-08 20:38:15 +04:00
Andrei Kortunov
6cb3c83248
Add transparency for interactive messageboxes in game mode
2017-08-08 20:36:50 +04:00
scrawl
cd4525cf25
Merge pull request #1372 from akortunov/guifixes
...
Journalbook layout fixes
2017-08-07 18:49:13 +00:00
Jake Westrip
63343b6241
Ensure jail does not decrease a skill past zero
2017-08-05 06:15:15 +10:00
Andrei Kortunov
56a30d7aec
Journalbook layout fixes
2017-08-03 20:27:14 +04:00
Andrei Kortunov
35beede065
Restock items after trade deal instead of trade window opening
2017-08-03 18:41:13 +04:00
Andrei Kortunov
487e72fd23
Play Up sounds instead of Down ones in trade window (bug #3982 )
2017-08-03 18:39:59 +04:00
scrawl
eac2e52841
Merge pull request #1329 from akortunov/priorityfix
...
Combat AI: make default spell priority calculation formula close to vanilla
2017-07-31 18:21:47 +00:00
scrawl
9ac409e61c
Merge pull request #1287 from akortunov/spellsorting
...
Spellbuying menu improvements
2017-07-31 09:43:47 +00:00
scrawl
43279c49b5
Go back to index when selecting 'cancel' on topics list
2017-07-30 23:51:44 +02:00
Andrei Kortunov
99b5f21a46
Add missing journal sounds (bug #3974 )
2017-07-29 19:41:46 +04:00
Andrei Kortunov
6ab36c0539
Spellbuying menu improvements
2017-07-27 13:20:18 +04:00
Julian
d7aa2a882d
improve dialogue window performance
2017-07-26 18:58:27 +02:00
Andrei Kortunov
3ba0a336b7
Move spell magicka cost calculation to standalone function
2017-07-24 21:11:59 +04:00
scrawl
c9f8a220dc
Update the tooltip when the focusObject is set
2017-07-20 20:59:36 +02:00
scrawl
0e2e23e9f8
Remove tooltip object as part of WindowManager::clear
2017-07-20 20:59:09 +02:00
Andrei Kortunov
2b22d10ebc
Spellview fixes
2017-07-16 13:14:19 +04:00
Andrei Kortunov
9179a019df
Quick keys menu fixes
2017-07-16 13:11:34 +04:00
Andrei Kortunov
5be1c81913
Fixed Close button handler in EditEffectDialog ( fixes #3956 )
2017-07-15 14:03:36 +04:00
Andrei Kortunov
54b4d93f79
Added a special function for GUI sounds playing
2017-07-10 15:48:00 +04:00
Allofich
42402976e3
Fixes for building in MSVC
2017-06-13 19:38:12 +09:00
scrawl
6d90f5a9a5
Merge pull request #1312 from akortunov/guifixes
...
Split greeting from topic response
2017-06-12 23:19:45 +02:00
Bret Curtis
dbf149f9b2
gcd is not available in msvc until 2017.3 P2, back to boost::math::gcd for now
2017-06-10 00:51:19 +02:00
Bret Curtis
c781d1f8ed
purge unnecessary imports
...
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
add fstream back
2017-06-09 19:08:53 +02:00
Bret Curtis
d799954ca0
replace and purge boost::math::gcd and other non-used headers
2017-06-09 19:08:53 +02:00
Bret Curtis
154d7cffa2
replace and purge boost::function
2017-06-09 19:08:53 +02:00
