Commit Graph

99 Commits (8c7e06293fbe6d0ed1dd7dd0f424b9f1b6f92162)

Author SHA1 Message Date
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
Andrei Kortunov c0bed0fde2 Handle case when index < 0 7 years ago
Capostrophic 9c8e284ead Fix quick key activation delay code (regression #4536) 7 years ago
David Cernat 7775780ad7 [Cllient] Update multiplayer code for handling quick keys 7 years ago
David Cernat a236ffc4be Merge pull request #456 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	README.md
#	apps/openmw/mwgui/quickkeysmenu.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwmechanics/combat.cpp
7 years ago
Finbar Crago 5d9035c6b2 [Fixes #4482] Missing HandToHand on key quick key 0 (introduced in MR !11 for issue #4480)
because apparently i can't count to ten...
7 years ago
Finbar Crago 596be205c1 cleanup unnecessary struct keywords... 7 years ago
Finbar Crago 2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 7 years ago
Finbar Crago ed71656ea6 fix updateActivatedQuickKey() crash
keyboard numbers don't start at zero...
7 years ago
Finbar Crago 24d5fb09da fix crash on simultaneous key presses 7 years ago
Finbar Crago 80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 7 years ago
Finbar Crago 335e2c5897 add keyData struct + general cleanup 7 years ago
Finbar Crago 186ec8c50f rm ContainerStore/refItem 7 years ago
Finbar Crago 46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 7 years ago
Finbar Crago da4c55d5ad prevent segfalt in QuickKeysMenu when item has been removed from player inventory
added a MWWorld::ContainerStore to hold item copies which are then used to find
real items with findReplacement().

(storing the RefId could be a better solution but would probably leave tooltips broken...)
7 years ago
Andrei Kortunov 61c968d550 Ignore broken items when search for replacement (bug #4453) 7 years ago
David Cernat 02eef933fd
Merge pull request #411 from OpenMW/master
Add OpenMW commits up to 19 Apr 2018
7 years ago
Capostrophic 8617d0603b Display a message if a spell the player tries to use via a quick key is missing (fixes #4391) 7 years ago
David Cernat 74765b3ace [General] Implement selected spell sync as part of PlayerMiscellaneous 7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat 50d5fffb7f [General] Add and implement PlayerQuickKeys packet 7 years ago
scrawl 4fff2e2e34 Refactor exitCurrentGuiMode 7 years ago
scrawl 01391b7eed Rename WindowBase's open/close to onOpen/onClose 7 years ago
Andrei Kortunov 6f22d819c5 Do not allow to switch weapon to probe or lockpick during attack 7 years ago
Andrei Kortunov fb45995a41 Do not allow player to change weapon/spell during attack or spellcasting (bug #2445) 7 years ago
Andrei Kortunov 9179a019df Quick keys menu fixes 8 years ago
scrawl a556475fae Explicitely set the user data type to avoid const/non-const mismatch 8 years ago
Rafael Moura 18a4b64f1a Porting more ContainerStoreIterator usage to const version #2 8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
scrawl db7b80b503 Revert "Accept a ConstPtr in ItemPtr tooltips"
This reverts commit 41c8ec56e0.

Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
9 years ago
scrawl 41c8ec56e0 Accept a ConstPtr in ItemPtr tooltips 9 years ago
scrawl fd48c1d6f4 Make the Equip script function "use" items (drink potion, use alchemy, etc) 9 years ago
Marc Zinnschlag a52b947efe Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3' 9 years ago
scrawl 52d8bc555c Add missing checks to see if spell still exists when loading a savegame (Bug #2883) 10 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
scrawl 77f1387da8 Include cleanup 10 years ago
Alexander "Ace" Olofsson 3655ef16af Explicitly instantiate ESM::StatState 10 years ago
scrawl e66e9916db Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp
10 years ago
Stanislav Bas c40987338d Scrollbars don't save their positions between openings 10 years ago
scrawl 8e0a988289 Icon fix 10 years ago
scrawl 6555ee8d80 Minor include cleanup 10 years ago
scrawl 82c4d01b37 Add back resource handling workarounds to the gui code 10 years ago
scrawl 1699759d12 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/view/render/cell.cpp
10 years ago
dteviot 6b6bed520d removed redundant calls. 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl f603a68144 Allow binding Hand To Hand in quick keys menu (Fixes #2024) 10 years ago
scrawl c883a73d30 Several warning fixes 10 years ago
scrawl 728b842e72 Use MyGUI::utility in favor of boost lexical_cast 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
Alexander "Ace" Olofsson 462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 10 years ago