Commit Graph

2754 Commits (ffi-server-rewrite)

Author SHA1 Message Date
scrawl 665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
Cyrillic journal index (bug #2485)
7 years ago
scrawl 8226c8dc92
Merge pull request #1560 from akortunov/guifixes
Fix the Topics button position if the Tribunal is not installed
7 years ago
Grigorii Latyshev a7c953b318 Display 0 chance for spell if player does not have enought magic energy 7 years ago
David Cernat 2373be9735
Merge pull request #345 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
Andrei Kortunov 94c0e3ed10 Move toUpper() from StringUtils to the JournalViewModel 7 years ago
Andrei Kortunov 4f190bf7f4 Do not show carriage return characters (bug #3696) 7 years ago
Andrei Kortunov 4d384889af Fix the Topics button position if the Tribunal is not installed 7 years ago
David Cernat 656453725b
Merge pull request #343 from OpenMW/master
Add OpenMW commits up to 23 Nov 2017
7 years ago
David Cernat 6668b9ab42 [General] Implement ConsoleCommand packet 7 years ago
Andrei Kortunov 86a17b1e3e Get rid of the redundant Utf8Stream when during journal index creation 7 years ago
Andrei Kortunov 3571f7f413 Remove getEncoding() from WindowManager 7 years ago
Andrei Kortunov 5f41f7c48d Clean code up a bit 7 years ago
Andrei Kortunov ba91cd658b Convert topic name to Unicode 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
scrawl 719255c5c6
Merge pull request #1557 from akortunov/journalfix
[Feedback needed] Handle 128px Tx_menubook_topics textures
7 years ago
Andrei Kortunov ce5bdd6361 Split the JournalBooks::createTopicIndexBook() 7 years ago
Andrei Kortunov a391990f2a Provide multibyte toLower() and single chars comparator 7 years ago
Andrei Kortunov 4dcaf040e6 A Russian journal index 7 years ago
Andrei Kortunov 60d0c83cca Handle 128px Tx_menubook_topics textures 7 years ago
Miloslav Číž ea2bbce68a Fix memory leak in WindowManager 7 years ago
Miloslav Číž 3ae5310567 use loading screen to freeze the screen 7 years ago
David Cernat 5aff515d3f
Merge pull request #337 from OpenMW/master
Add OpenMW commits up to 15 Nov 2017
7 years ago
scrawl 7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
scrawl 98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
7 years ago
Andrei Kortunov 03f129b53c remove redundant allowedToInsertItems() function from ItemModel 7 years ago
Andrei Kortunov 99517d83ea Bound items detection refactoring 7 years ago
Andrei Kortunov a02124f884 Handle item owners during pickpocketing 7 years ago
Andrei Kortunov 3694b6ec90 Move onClose() check to item models 7 years ago
Andrei Kortunov ac33ff9482 Move onDropItem() check to item models 7 years ago
Andrei Kortunov 3604b73d60 Move onTakeItem() to item models 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
scrawl e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 7 years ago
scrawl e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
Trigger OnActivate when item is picked up through the inventory (Issue #3726)
7 years ago
rexelion 8c2cc0f42f break invisibility first 7 years ago
rexelion bcbfa5fe1e prevent activation, leave the rest to the script 7 years ago
rexelion a9e5e19482 OnActivate is triggered when the item is picked up 7 years ago
David Cernat a31d43965f
Merge pull request #328 from OpenMW/master
Add OpenMW commits up to 31 Oct 2017
7 years ago
rexelion e8743f3f79 check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords 7 years ago
Miloslav Číž 3c65bdaf14 weapon cycle fix 7 years ago
rexelion 4e6f53d6f1 item added to the player and OnActivate is triggered when the inventory is closed 7 years ago
David Cernat 50d5fffb7f [General] Add and implement PlayerQuickKeys packet 7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master
Add OpenMW commits up to 24 Oct 2017
7 years ago
scrawl e564dd842e Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response (Fixes #4166)
Don't delete Link objects prematurely (Fixes #4171)
7 years ago
scrawl 2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 7 years ago
David Cernat 360cf2ead7 Merge pull request #321 from OpenMW/master
Add OpenMW commits up to 22 Oct 2017
7 years ago
scrawl 8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b
Feature #4082: use many ingredients/potions instantly
7 years ago
David Cernat 3a9e5e3a7b Merge pull request #319 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwworld/worldimp.hpp
7 years ago
lukago b6cb3b445c use getIndex to handle other windows, nullsafe fixes 7 years ago
Andrei Kortunov eaff7e30aa Fix a 'Good Beast' companion window 7 years ago
lukago a3225364ff refactor, use dragItem method 7 years ago
lukago 43f94a8890 simplify drag and drop on avatar for potions and ingredients 7 years ago
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
scrawl 03554b2f4b Fix some style issues flagged by cppcheck 7 years ago
scrawl 624046c558 Fix unused event handler 7 years ago
scrawl 548af6dbfb Fix jail screen fading 7 years ago
David Cernat 41ff3fee89 Merge pull request #310 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
7 years ago
scrawl 479f9535b4 Allow training window exit() 7 years ago
scrawl 9cde3e4408 Merge pull request #1495 from akortunov/regressions
Add showsInInventory() check to the ContainerItemModel
7 years ago
Andrei Kortunov ea3729790f Add showsInInventory() check to the ContainerItemModel 7 years ago
David Cernat 711c4d83da [Client] Fix build after recent OpenMW changes to GUI 7 years ago
David Cernat 3e8d7c8416 Merge pull request #306 from OpenMW/master
Add OpenMW commits up to 7 Oct 2017
7 years ago
scrawl 7021d354c6 Merge pull request #1493 from akortunov/regressions
Regression fixes
7 years ago
scrawl 2805781542 Fix a crash when exit() already hides the window (Fixes #4148) 7 years ago
Andrei Kortunov ad27e0f945 Fix owned tooltip in the spellwindow 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 842a42ee66 Fix non-top level Windows accepting key focus 7 years ago
scrawl cd437f094d Fix exiting savegamedialog with 'esc' when no game is running 7 years ago
scrawl d94235e3a7 Update the saves list/preview image when character selection changes to make it more convenient to flip through characters with the keyboard 7 years ago
scrawl 12510efab7 Fade screen out during loading screen (when travelling) 7 years ago
scrawl a4737d8417 Use MyGUI frame events for ScreenFader 7 years ago
scrawl e4f0f7157a Fix pinned windows not being updated 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 b5c9977a7b Merge pull request #1489 from akortunov/guifixes
Use an "owned crosshair" feature for items in containers
7 years ago
Andrei Kortunov 1cb7ed5db1 Use owned tooltips for items in containers correctly 7 years ago
scrawl 433028e8d7 Fix GUI regressions 7 years ago
scrawl 302e3c8b3d Merge pull request #1486 from akortunov/pickpocketfix
Fix some issues with pickpocketing (bug #4131)
7 years ago
Andrei Kortunov 34895157f9 Consider taking items from unconscious NPC as a theft 7 years ago
Andrei Kortunov 04452b0949 Use a pickpocket crime instead of theft when pickpocketing was failed 7 years ago
scrawl 3c62a8c5c2 Fix console selected object persisting on a new game 7 years ago
scrawl 097b9d90bc Fix travel service not showing 7 years ago
scrawl 5b10e3128e Use first resolution in fullscreen if current is not supported (Fixes #4113) 7 years ago
scrawl 64e27c032b Merge pull request #1481 from scrawl/keyfocus
WindowManager overhaul & improved keyboard support
7 years ago
scrawl 7bb0a76df2 Fix tooltips showing when cursor isn't visible 7 years ago
scrawl 14c9e858c8 Check to make sure button is enabled 7 years ago
scrawl 6ec66fa95f Restore keyfocus to goodbye when selecting a topic 7 years ago
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.
7 years ago
scrawl d53e7f8a3c Remove redundant code
Already worked around in WindowBase::setVisible
7 years ago
scrawl 0deda69a27 Fix wrong skin for levelup attribute values 7 years ago
scrawl e9d81fdf5a Fix being able to escape interactive messageboxes 7 years ago
scrawl db650df416 Fix 'blocking' messageboxes not handling key focus properly 7 years ago
scrawl a0f5e32113 Fix 'new game' from the main menu not removing menu afterwards 7 years ago
scrawl 0ee57effcc Make 'Delete game' button not accept keyfocus, to prevent accidents 7 years ago
scrawl c7a82704c6 Fix key focus resets in SaveGameDialog 7 years ago
scrawl 3d2ad2d339 Include cleanup 7 years ago
scrawl 87311d86b5 Fix what looks like a copy/paste error 7 years ago
scrawl 7a3fbfb34a Slightly improve journal window keyboard navigation 7 years ago
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'.
7 years ago
scrawl 8964fc93d6 Fix dialogue window not being exited properly 7 years ago
scrawl 7a64098da3 Avoid rebuilding the dialogue topics pane unnecessarily
Also retaining key focus.
7 years ago
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.
7 years ago
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).
7 years ago
scrawl 41fe16013b Select first widget if we can't find the current widget 7 years ago
scrawl 475ac46f3e Workaround keyfocus issues in current versions of MyGUI 7 years ago
scrawl 010a7ea5b3 Fix tooltip widgets being set to accept key focus 7 years ago
scrawl 2514cc5cc8 Workaround key focus being reset in BookWindow when next/prev are hidden 7 years ago
scrawl fce9a14986 Hide the mouse cursor until it's used 7 years ago
scrawl 9b91ea5d34 Exit drag-and-drop if dragged item is deleted (Fixes #3097) 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 c5613e384e Remove duplicate disposition code 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 717e68fab2 Remove redundant resetHistory argument 7 years ago
scrawl e14573fa8c Add missing null check 7 years ago
scrawl 19e07fad30 Remove redundant Services enum 7 years ago
scrawl f8ffd85146 Topic passed to keywordSelected() no longer has to be lower case
Remove redundant mDialogueMap
7 years ago
scrawl b7752ec52d Make TradeWindow not depend on DialogueWindow 7 years ago
scrawl d78e822833 Add 'delay' argument for screen fading operations 7 years ago
scrawl c035548f37 Make Tab work if selected widget is marked as not needing keyfocus 7 years ago
scrawl 94b538ac82 Fix crash due to not calling WindowModal::onClose() 7 years ago
scrawl 67dc4e019a Make Enter on trade window price attempt the trade 7 years ago
scrawl 8ae7e4c958 Make Enter on a name edit accept the dialog 7 years ago
scrawl 843106fc61 Handle the wait progress bar as part of the GUI mode 7 years ago
scrawl 9ed1b16553 Extend code that detects whether a key was consumed by the GUI (Fixes #4016) 7 years ago
scrawl 0e57f1317b Remove redundant setVisible(false) 7 years ago
scrawl 331192f2d6 Improve keyboard navigation of book/scroll windows 7 years ago
scrawl d58ff4a736 Remove obsolete Container GUI keyboard handling 7 years ago
scrawl c0d8bef82f Call changeInputMode() from updateVisible() 7 years ago
scrawl 222defc6d8 Extend HUD::clear() 7 years ago
scrawl f6c227b966 Reset screen faders in clear()
Fixes a black screen when loading a game while waiting/resting.
7 years ago
scrawl d10985e481 Remove unneeded window pointers 7 years ago
scrawl f67dbc8aa0 Remove redundant update function 7 years ago
scrawl e7d2a8a4dc Call clear() for every window 7 years ago
scrawl c6c01870ec Call onResChange for every window 7 years ago
scrawl 2b03bc0c56 Call WindowBase::onFrame() for every active window 7 years ago
scrawl ba7ae2663f Use a generic container to delete windows 7 years ago
scrawl 32f9c8058a Remove redundant RestBed gui mode 7 years ago
scrawl 9ead331741 Fix pinned windows showing in other GUI modes 7 years ago
scrawl 65a707348c Make Tab select the first widget if none is selected 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 35110fb2f8 Remove unused and slightly broken custom button titles in ConfirmationDialog 7 years ago
scrawl ad4b91131f toggleGui renamed to toggleHud, remove unused variable 7 years ago
scrawl be19f51013 Adjust some more windows to be keyboard friendlier 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 20766fb508 Associate open/close sounds with the GUI mode 7 years ago
scrawl 531e7ac586 Allow drag-and-drop to be cancelled (Esc or Inventory key) 7 years ago
scrawl 269094ba8d Restore the previous key focus widget when exiting modal dialog 7 years ago
scrawl bbafe1e456 Remove redundant player cell variable 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 01391b7eed Rename WindowBase's open/close to onOpen/onClose 7 years ago
scrawl 5482ad0482 Fix tab completion in console to not cycle key focus 7 years ago
scrawl c203a0774a Adjust some layouts to take better advantage of keyboard navigation 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
scrawl b22fedf4ae Check 'sYes' in addition to 'sOk' for message box's default keyfocus 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 0e648222b8 Merge pull request #1446 from akortunov/takeallfix
Do not allow to equip a replacement, when take all items from a dead corpse
7 years ago
Andrei Kortunov 4580024d76 Unequip all items from dead corpse when take all items (bug #4095) 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 fa364726b8 Merge pull request #1468 from akortunov/itemsorting
Improve item sorting in inventory and containers
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
Andrei Kortunov 771f58ce58 Remove unwanted warnings 7 years ago
David Cernat 7f0ea7d01f Merge pull request #294 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/character.cpp
7 years ago
Andrei Kortunov 9d826b2deb Improve item sorting in inventory and containers 7 years ago
scrawl 26e3de1025 Merge pull request #1464 from akortunov/guifixes
Fixed padding of MessageBox buttons
7 years ago
David Cernat 4d4eb1bb9f Merge pull request #292 from OpenMW/master
Add OpenMW commits up to 18 Sep 2017
7 years ago
Andrei Kortunov 2806a35a61 Fixed padding of MessageBox buttons 7 years ago
scrawl c39c29722b Merge pull request #1459 from akortunov/cyclingfix
Cycle only through weapons which player can equip
7 years ago
Andrei Kortunov 10a0136b4a Cycle only through weapons which can be equipped by player (bug #4104) 7 years ago
Andrei Kortunov 3fb3c4c20f Add scrollbar to a birth effect lists (bug #4105) 7 years ago
David Cernat 960b91a53c Merge pull request #290 from OpenMW/master
Add OpenMW commits up to 17 Sep 2017
7 years ago
scrawl 5dd2e871c8 Merge pull request #1450 from kcat/master
Sound improvements
7 years ago
Chris Robinson 780e82480d Make the PlayMode and PlayType enums scoped
Also shorten them by putting them in the MWSound namespace
7 years ago
David Cernat c98e6dc833 Merge pull request #288 from OpenMW/master
Add OpenMW commits up to 14 Sep 2017
7 years ago
Bret Curtis e517ad3f7b add ktx support for splashscreens 7 years ago
Bret Curtis dff0a766a8 adding 3 more extensions 7 years ago
Bret Curtis b26887ef9b add support for png and dds splashscreens to begin with. 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
scrawl 00ae9a01a1 Merge pull request #1445 from akortunov/guifixes
Allow to add levelup a description for levels > 20
7 years ago
Andrei Kortunov 7760e4514c Allow to add levelup a description for levels > 20 7 years ago
MiroslavR 1e585ac71a Log a warning in case of missing bookart instead of showing a pink rectangle (Fixes #3826) 7 years ago
Andrei Kortunov ac2f20f983 Update a disposition bar when a dialogue widget is disabled, but visible 7 years ago
David Cernat b64f379949 Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwmechanics/actors.hpp
7 years ago
David Cernat ccb15cc09e [Client] When players die, make guards willing to arrest them again 7 years ago
David Cernat 3fc1bdecb3 [Client] Shorten player names to 31 characters after they are inputted 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 91dcd5bc6e Do not allow to unequip weapon from inventory during attack 7 years ago
Andrei Kortunov 6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 7 years ago
scrawl 8c6a8ca48d Respect the framelimit in all cases (Fixes #3531)
Affects loading screen, videos & modal dialogs. Also skips rendering if window is minimized.
7 years ago
scrawl dc53573de4 Merge pull request #1405 from akortunov/stancechangefixes
Do not allow player to change weapon/spell during attack or spellcast
7 years ago
Andrei Kortunov 73d5efabee Display negative values on fatigue progress bar 7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
scrawl 4fba157d3b Implement releaseGLObjects for cached resources 7 years ago
Andrei Kortunov 0177fe6602 Display large entries in journal correctly 7 years ago
Andrei Kortunov 65d05ee1cd Get only text from clipboard (bug #4025) 7 years ago
Andrei Kortunov e0bb9c089b Revert commit 67d59bead5 (a better
implementation found)
7 years ago
Andrei Kortunov 7c80ddc9de Owned crosshair improvements (bug #2789) 7 years ago
Andrei Kortunov 67d59bead5 Get only text from input fields (bug #4025) 7 years ago
Andrei Kortunov ec64034160 Confiscate stolen item/gem when enchanting 7 years ago