1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:19:55 +00:00
Commit graph

2832 commits

Author SHA1 Message Date
Capostrophic
fa6c205e5d Make tab autocompletion work with explicit reference calls 2018-08-02 03:24:31 +03:00
Andrei Kortunov
12144de8ed Initialize missing variables 2018-08-01 20:18:37 +04:00
Andrei Kortunov
c0bed0fde2 Handle case when index < 0 2018-08-01 20:17:59 +04:00
Andrei Kortunov
a08048da4e Avoid dereference after null check 2018-08-01 19:30:30 +04:00
Capostrophic
ab29f9e13f Add permanent barter disposition change option (feature #3103) 2018-08-01 17:31:35 +03:00
Andrei Kortunov
0f2c3ecb17 Rescale player avatar (bug #4539) 2018-07-30 17:41:43 +04:00
Capostrophic
9c8e284ead Fix quick key activation delay code (regression #4536) 2018-07-29 12:52:29 +03:00
Capostrophic
cac2bc768e
Fix NPC "can't teach more" message (bug #4494) 2018-07-25 12:34:33 +03:00
Andrei Kortunov
edd5769022 Show magic items count in spells window (feature #4509) 2018-07-16 14:11:03 +04:00
Marc Zinnschlag
ee759effce Merged pull request #1798 2018-07-11 10:06:30 +02:00
Andrei Kortunov
c77c50e92b Make Equip console command to bypass most of restrictions (bug #4460) 2018-07-11 00:06:21 +04:00
terrabyte25
48296a7452
Update trainingwindow.cpp 2018-07-09 23:13:52 +04:00
Capostrophic
bded697f07
Make Goodbye block using hyperlinks 2018-07-06 19:38:36 +03:00
Thunderforge
7cbc4eeb49 Adding missing override keywords
Prevents compiler warnings such as this:

```
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:65:22: warning: 'onOpen' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
        virtual void onOpen();
                     ^
/Users/Will/CLionProjects/OpenMW/apps/openmw/mwgui/windowbase.hpp:38:22: note: overridden virtual function is here
        virtual void onOpen() {}
                     ^
```
2018-07-01 19:17:50 -05:00
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...
2018-07-01 13:46:23 +10:00
Finbar Crago
09c9bd34c3 cleanup more unnecessary struct keywords... 2018-06-30 12:43:50 +10:00
Finbar Crago
596be205c1 cleanup unnecessary struct keywords... 2018-06-29 23:43:51 +10:00
Finbar Crago
2722ca50fb fix QuickKeysMenu crash on reopening window after item drop + pickup [see: !11#note_85086570] 2018-06-29 23:32:05 +10:00
Finbar Crago
ed71656ea6 fix updateActivatedQuickKey() crash
keyboard numbers don't start at zero...
2018-06-29 01:58:57 +10:00
Finbar Crago
24d5fb09da fix crash on simultaneous key presses 2018-06-28 22:55:02 +10:00
Finbar Crago
80a3f0a0d4 switch mSelectedIndex/mActivatedIndex int to mSelected/mActivated keyData pointers 2018-06-28 17:02:25 +10:00
Finbar Crago
335e2c5897 add keyData struct + general cleanup 2018-06-28 13:27:08 +10:00
Finbar Crago
cac6d59140 Merge branch 'master' into fix_quickkey_segfalt 2018-06-27 12:58:43 +10:00
Finbar Crago
43c9fd4cec check MWWorld::Ptr != NULL for MWGui ItemPtr tooltips 2018-06-26 13:41:53 +10:00
Finbar Crago
186ec8c50f rm ContainerStore/refItem 2018-06-26 13:35:04 +10:00
Marc Zinnschlag
705b2dca0e Merged pull request #1777 2018-06-25 11:58:12 +02:00
Finbar Crago
46c6abcf54 add string vectors for name/id in QuickKeysMenu for item lookups 2018-06-25 16:02:28 +10:00
Andrei Kortunov
441463327c Validate map size 2018-06-25 09:57:40 +04:00
Capostrophic
35b0546737 Consider <p> tag when discarding post-EOL tag text (regression #4473) 2018-06-23 14:27:40 +03:00
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...)
2018-06-23 17:51:32 +10:00
Miloslav Číž
d629c30fdb
Merge branch 'master' into screenshot360 2018-06-13 21:16:28 +02:00
Andrei Kortunov
61c968d550 Ignore broken items when search for replacement (bug #4453) 2018-06-13 18:39:02 +04:00
Capostrophic
1c8a20a54a Set ok button focus in settings window by default (fixes #4368) 2018-06-12 19:45:43 +03:00
Bret Curtis
7310e3c8c2
Merge pull request #1748 from akortunov/bookfix
Do not show any book text after last <BR> tag
2018-06-11 17:08:26 +02:00
Andrei Kortunov
66a46ff03c Do not show any book text after last <BR> tag. 2018-06-11 11:22:56 +04:00
Capostrophic
d43766d3c9 Make WakeUpPC interrupt waiting if it was supposed to be (fixes #3629) 2018-06-10 18:42:18 +03:00
Capostrophic
1a354f88ac Make choices trigger goodbye if Goodbye is used (fixes #3897) 2018-06-07 22:09:55 +03:00
Capostrophic
191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 2018-06-03 10:22:20 +03:00
Andrei Kortunov
1abff5365b Capitalize enchanted items names again in spells window 2018-05-24 13:03:47 +04:00
Andrei Kortunov
afae398b5c Use utf8 lowercase function for journal index to avoid code duplication 2018-05-24 12:53:06 +04:00
Andrei Kortunov
b5374029e5 Implement case-insensitive search in spell window 2018-05-24 12:39:00 +04:00
Andrei Kortunov
9ac752ea70 Implement filtering in the spells window 2018-05-24 10:48:46 +04:00
Bret Curtis
c75d774356
Merge pull request #1692 from akortunov/playsound
Prevent PlaySound overlapping
2018-05-15 19:03:01 +02:00
David Cernat
32d71de2f5 Update MapWindow every frame, not just when it's open (bug #4279) 2018-05-09 07:33:45 +03:00
Andrei Kortunov
4872edc5ed Prevent PlaySound overlapping 2018-05-01 16:24:32 +04:00
scrawl
5d1b40c5ea
Merge pull request #1678 2018-04-19 12:18:24 +00:00
Capostrophic
8617d0603b Display a message if a spell the player tries to use via a quick key is missing (fixes #4391) 2018-04-18 19:10:46 +03:00
tri4ng1e
d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
tri4ng1e
d4d1703bcf
Some PVS-Studio and cppcheck fixes
cppcheck:
[apps/esmtool/record.cpp:697]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1126]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/esmtool/record.cpp:1138]: (performance) Prefer prefix ++/-- operators for non-primitive types.
[apps/niftest/niftest.cpp:36]: (performance) Function parameter 'filename' should be passed by reference.
[apps/niftest/niftest.cpp:41]: (performance) Function parameter 'filename' should be passed by reference.
[apps/opencs/model/prefs/boolsetting.cpp:25]: (warning) Possible leak in public function. The pointer 'mWidget' is not deallocated before it is allocated.
[apps/opencs/model/prefs/shortcuteventhandler.cpp:52]: (warning) Return value of std::remove() ignored. Elements remain in container.
[apps/openmw/mwstate/quicksavemanager.cpp:5]: (performance) Variable 'mSaveName' is assigned in constructor body. Consider performing initialization in initialization list.

PVS-Studio:
apps/opencs/model/filter/parser.cpp  582  warn  V560 A part of conditional expression is always true: allowPredefined.
apps/opencs/view/world/referencecreator.cpp  67  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/world/referencecreator.cpp  74  warn  V547 Expression '!errors.empty()' is always false.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !completed.
apps/opencs/view/doc/loader.cpp  170  warn  V560 A part of conditional expression is always true: !error.empty().
apps/opencs/model/tools/pathgridcheck.cpp  32  err  V517 The use of 'if (A) {...} else if (A) {...}' pattern was detected. There is a probability of logical error presence. Check lines: 32, 34.
apps/opencs/model/world/refidadapterimp.cpp  1376  err  V547 Expression 'subColIndex < 3' is always true.

apps/openmw/mwgui/widgets.hpp  318  warn  V703 It is odd that the 'mEnableRepeat' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:318, MyGUI_ScrollBar.h:179.
apps/openmw/mwgui/widgets.hpp  319  warn  V703 It is odd that the 'mRepeatTriggerTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:319, MyGUI_ScrollBar.h:180.
apps/openmw/mwgui/widgets.hpp  320  warn  V703 It is odd that the 'mRepeatStepTime' field in derived class 'MWScrollBar' overwrites field in base class 'ScrollBar'. Check lines: widgets.hpp:320, MyGUI_ScrollBar.h:181
apps/openmw/mwmechanics/actors.cpp  1425  warn  V547 Expression '!detected' is always true.
apps/openmw/mwmechanics/character.cpp  2155  err  V547 Expression 'mode == 0' is always true.
apps/openmw/mwmechanics/character.cpp  1192  warn  V592 The expression was enclosed by parentheses twice: ((expression)). One pair of parentheses is unnecessary or misprint is present.
apps/openmw/mwmechanics/character.cpp  521  warn  V560 A part of conditional expression is always true: (idle == mIdleState).
apps/openmw/mwmechanics/pathfinding.cpp  317  err  V547 Expression 'mPath.size() >= 2' is always true.
apps/openmw/mwscript/interpretercontext.cpp  409  warn  V560 A part of conditional expression is always false: rank > 9.
apps/openmw/mwgui/windowbase.cpp  28  warn  V560 A part of conditional expression is always true: !visible.
apps/openmw/mwgui/journalwindow.cpp  561  warn  V547 Expression '!mAllQuests' is always false.
apps/openmw/mwgui/referenceinterface.cpp  18  warn  V571 Recurring check. The '!mPtr.isEmpty()' condition was already verified in line 16.
apps/openmw/mwworld/scene.cpp  463  warn  V547 Expression 'adjustPlayerPos' is always true.
apps/openmw/mwworld/worldimp.cpp  409  err  V766 An item with the same key '"sCompanionShare"' has already been added.
apps/openmw/mwworld/cellstore.cpp  691  warn  V519 The 'state.mWaterLevel' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 689, 691.
apps/openmw/mwworld/weather.cpp  1125  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1123, 1125.
apps/openmw/mwworld/weather.cpp  1137  warn  V519 The 'mResult.mParticleEffect' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 1135, 1137.

apps/wizard/unshield/unshieldworker.cpp  475  warn  V728 An excessive check can be simplified. The '(A && B) || (!A && !B)' expression is equivalent to the 'bool(A) == bool(B)' expression.
apps/wizard/installationpage.cpp  163  warn  V735 Possibly an incorrect HTML. The "</p" closing tag was encountered, while the "</span" tag was expected.

components/fontloader/fontloader.cpp  427  err  V547 Expression 'i == 1' is always true.
components/nifosg/nifloader.cpp  282  warn  V519 The 'created' variable is assigned values twice successively. Perhaps this is a mistake. Check lines: 278, 282.
components/esm/loadregn.cpp  119  err  V586 The 'clear' function is called twice for deallocation of the same resource. Check lines: 112, 119.
components/esm/cellref.cpp  178  warn  V581 The conditional expressions of the 'if' statements situated alongside each other are identical. Check lines: 175, 178.
components/esmterrain/storage.cpp  235  warn  V560 A part of conditional expression is always true: colStart == 0.
components/esmterrain/storage.cpp  237  warn  V560 A part of conditional expression is always true: rowStart == 0.
2018-04-18 12:36:10 +00:00
Andrei Kortunov
174b3d2249 Reset an inventory filter after reload or a new game start (bug #4392) 2018-04-13 09:19:49 +04:00
scrawl
35300c04cd
Merge pull request #1671 2018-04-09 20:23:35 +00:00
Capostrophic
cddc0914c8 Option to charge for all companions travelling (fixes #4064) 2018-04-09 19:19:50 +03:00
scrawl
edb57306b6
Merge pull request #1628 2018-03-16 23:25:29 +00:00
elsid
a26483ab26 Fix memory leak
There is no delete for TextFormat objects in PageDisplay destructor.
2018-03-13 21:32:59 +03:00
Andrei Kortunov
e0aa5e8e79 Prevent overlapping for journal and books scrolling 2018-03-11 16:19:37 +04:00
scrawl
e81faf5f2f
Add an option to disable GUI keyboard navigation (Bug #4333) 2018-03-08 23:39:35 +00:00
scrawl
870c658500
Remove missing souls, remove some runaway exceptions (Fixes #4111) 2018-03-08 23:38:04 +00:00
scrawl
bf78c18296
Merge pull request #1624 2018-03-07 18:12:32 +00:00
Capostrophic
3b922d810a Don't use floating point arithmetics for formatted count (Bug #4346) 2018-03-07 15:36:10 +03:00
Capostrophic
60a663ef58 Account for all possible count values in getCountString (Bug #4346) 2018-03-06 16:50:38 +03:00
Miloslav Číž
db6107f12f
Merge branch 'master' into screenshot360 2018-02-25 11:25:19 +01:00
Capostrophic
089666dd68
Round up displayed encumbrance 2018-02-24 15:13:14 +03:00
scrawl
123f7b83d5
Make the CompositeMapRenderer use available time and add related setting 2018-02-13 00:40:41 +00:00
scrawl
2caaa48b91
Workaround to make sure message box remains on top (Fixes #4298) 2018-01-14 00:27:53 +00:00
Andrei Kortunov
29b2308b2c Do not display cyrillic soft/hard signs in the journal index 2017-12-04 22:42:17 +04:00
scrawl
ff1226c96b
Merge pull request #1575 2017-12-03 22:22:29 +00:00
Andrei Kortunov
8decd35607 Fixes crash on quickload from the container menu (bug #4239) 2017-12-03 21:49:13 +04:00
scrawl
47a5229eed
Merge pull request #1564 2017-11-29 22:10:36 +00:00
Grigorii Latyshev
2abb1a2ec2 Added checkMagicka parameter 2017-11-28 23:35:54 +01:00
Grigorii Latyshev
ce32462358 Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*) 2017-11-26 13:58:04 +01:00
scrawl
88ec6179ff
Merge pull request #1566 from akortunov/guifixes
Set default values for class and birthsign select menus
2017-11-25 22:58:40 +00:00
Andrei Kortunov
55db3c2712 Set default values for class and birthsign select menus (bug #4226) 2017-11-25 11:35:29 +04:00
Grigorii Latyshev
32096ae0cc Fix displayed spell success chance in God Mode 2017-11-25 01:47:18 +01:00
scrawl
665ca5b2d5
Merge pull request #1558 from akortunov/rusjournal
Cyrillic journal index (bug #2485)
2017-11-24 23:17:28 +00:00
scrawl
8226c8dc92
Merge pull request #1560 from akortunov/guifixes
Fix the Topics button position if the Tribunal is not installed
2017-11-24 23:16:33 +00:00
Grigorii Latyshev
a7c953b318 Display 0 chance for spell if player does not have enought magic energy 2017-11-24 15:06:07 +01:00
Andrei Kortunov
94c0e3ed10 Move toUpper() from StringUtils to the JournalViewModel 2017-11-23 19:37:45 +04:00
Andrei Kortunov
4f190bf7f4 Do not show carriage return characters (bug #3696) 2017-11-23 14:58:20 +04:00
Andrei Kortunov
4d384889af Fix the Topics button position if the Tribunal is not installed 2017-11-23 10:14:45 +04:00
Andrei Kortunov
86a17b1e3e Get rid of the redundant Utf8Stream when during journal index creation 2017-11-22 09:06:54 +04:00
Andrei Kortunov
3571f7f413 Remove getEncoding() from WindowManager 2017-11-22 08:32:38 +04:00
Andrei Kortunov
5f41f7c48d Clean code up a bit 2017-11-21 13:03:38 +04:00
Andrei Kortunov
ba91cd658b Convert topic name to Unicode 2017-11-21 12:31:23 +04:00
Andrei Kortunov
f0ca3eabd3 Merge from upstream master 2017-11-21 09:39:54 +04:00
Andrei Kortunov
a83a43e376 Determine when need to use the Cyrillic journal index 2017-11-21 09:32:35 +04:00
scrawl
719255c5c6
Merge pull request #1557 from akortunov/journalfix
[Feedback needed] Handle 128px Tx_menubook_topics textures
2017-11-20 23:07:18 +00:00
Andrei Kortunov
ce5bdd6361 Split the JournalBooks::createTopicIndexBook() 2017-11-20 22:25:53 +04:00
Andrei Kortunov
a391990f2a Provide multibyte toLower() and single chars comparator 2017-11-20 21:30:46 +04:00
Andrei Kortunov
4dcaf040e6 A Russian journal index 2017-11-20 19:37:24 +04:00
Andrei Kortunov
60d0c83cca Handle 128px Tx_menubook_topics textures 2017-11-20 17:39:28 +04:00
Miloslav Číž
ea2bbce68a Fix memory leak in WindowManager 2017-11-18 19:27:09 +01:00
Miloslav Číž
3ae5310567 use loading screen to freeze the screen 2017-11-16 22:08:33 +01:00
scrawl
7c5d2a1ac4 Update dialogue topics list after result script is run
Regression from 0.42.
2017-11-15 17:20:06 +00:00
scrawl
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
2017-11-11 22:12:07 +00:00
Andrei Kortunov
03f129b53c remove redundant allowedToInsertItems() function from ItemModel 2017-11-11 11:58:22 +04:00
Andrei Kortunov
99517d83ea Bound items detection refactoring 2017-11-11 11:58:22 +04:00
Andrei Kortunov
a02124f884 Handle item owners during pickpocketing 2017-11-11 11:58:18 +04:00
Andrei Kortunov
3694b6ec90 Move onClose() check to item models 2017-11-10 10:58:43 +04:00
Andrei Kortunov
ac33ff9482 Move onDropItem() check to item models 2017-11-10 10:58:43 +04:00
Andrei Kortunov
3604b73d60 Move onTakeItem() to item models 2017-11-10 10:58:40 +04:00
scrawl
e42bd71081 Add missing WaitDialog::clear() (Fixes #4196) 2017-11-08 00:24:04 +00:00
scrawl
e6303c578c
Merge pull request #1530 from rexelion/curseitemfix
Trigger OnActivate when item is picked up through the inventory (Issue #3726)
2017-11-05 15:35:39 +00:00
rexelion
8c2cc0f42f break invisibility first 2017-11-04 00:44:16 +00:00
rexelion
bcbfa5fe1e prevent activation, leave the rest to the script 2017-11-04 00:38:33 +00:00
rexelion
a9e5e19482 OnActivate is triggered when the item is picked up 2017-10-31 22:33:26 +00:00
rexelion
e8743f3f79 check the presence of OnActivate using the SuppressActivate flag instead of looking for keywords 2017-10-30 21:16:25 +00:00
Miloslav Číž
3c65bdaf14 weapon cycle fix 2017-10-30 18:05:45 +01:00
rexelion
4e6f53d6f1 item added to the player and OnActivate is triggered when the inventory is closed 2017-10-29 11:45:17 +00:00
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)
2017-10-23 23:33:06 +00:00
scrawl
2a0b2c4e24 Hide modal window before deleting it (Fixes #4168) 2017-10-23 23:33:05 +00:00
scrawl
8b19a8b7f6 Merge pull request #1513 from lukago/feature4082b
Feature #4082: use many ingredients/potions instantly
2017-10-22 20:51:14 +00:00
lukago
b6cb3b445c use getIndex to handle other windows, nullsafe fixes 2017-10-21 23:34:57 +02:00
Andrei Kortunov
eaff7e30aa Fix a 'Good Beast' companion window 2017-10-21 16:56:21 +04:00
lukago
a3225364ff refactor, use dragItem method 2017-10-19 17:43:27 +02:00
lukago
43f94a8890 simplify drag and drop on avatar for potions and ingredients 2017-10-19 16:50:04 +02:00
scrawl
03554b2f4b Fix some style issues flagged by cppcheck 2017-10-15 17:06:58 +02:00
scrawl
624046c558 Fix unused event handler 2017-10-15 17:06:58 +02:00
scrawl
548af6dbfb Fix jail screen fading 2017-10-14 14:03:16 +00: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
Andrei Kortunov
ea3729790f Add showsInInventory() check to the ContainerItemModel 2017-10-08 09:20:07 +04:00
scrawl
7021d354c6 Merge pull request #1493 from akortunov/regressions
Regression fixes
2017-10-06 16:21:16 +00: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
scrawl
842a42ee66 Fix non-top level Windows accepting key focus 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
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
Bret Curtis
d48b829b45 replace and purge boost::lexical_cast 2017-06-09 19:08:53 +02:00
Bret Curtis
98752a9702 replace boost::bind 2017-06-09 19:08:53 +02:00
Bret Curtis
b7c27e5e96 remove boost/tuple 2017-06-09 19:08:53 +02:00
Bret Curtis
d97aa9152b remove more unused imports, including boost headers 2017-06-09 19:08:53 +02:00
Bret Curtis
d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 2017-06-09 19:08:53 +02:00
Bret Curtis
c8b67221d7 use nullptr instead of NULL 2017-06-09 16:49:25 +02:00
Ewan Higgs
38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 2017-06-09 16:49:25 +02:00
Andrei Kortunov
4bb9622c21 Handle greetings differently from responses 2017-06-08 22:40:31 +04:00
scrawl
59eb0aba7d Merge pull request #1310 from akortunov/guifixes
Removed empty space before dialogue entry (bug #3892)
2017-06-07 21:55:45 +02:00
Andrei Kortunov
c2962ced90 Removed empty space before dialogue entry (bug #3892) 2017-06-04 23:20:43 +04:00
Andrei Kortunov
f4a187a9c2 Move a setting to show enchanting success chance from GUI to Game section 2017-06-03 23:03:24 +04:00
Andrei Kortunov
9a1ba1e559 Show success chance when self-enchanting (Feature #3492) 2017-06-03 14:39:15 +04:00
scrawl
9fd0d54a35 Merge pull request #1289 from akortunov/newrepair
Improved repair and recharge widgets
2017-05-31 22:47:38 +02:00
Andrei Kortunov
10d4cb15ad Improved repair widget 2017-05-31 19:11:49 +04:00
Andrei Kortunov
1164c3f16e Improved recharge widget 2017-05-31 19:11:49 +04:00
scrawl
2638327593 Merge pull request #1303 from akortunov/guifixes
Character generation layout fixes
2017-05-31 15:25:41 +02:00
scrawl
a1661af864 Merge pull request #1301 from akortunov/tooltips
Tooltips layout fixes
2017-05-29 00:13:34 +02:00
Andrei Kortunov
4f41c44cd6 Swap enchant type when clean selected soulgem widget (fixes #3878) 2017-05-20 18:30:11 +04:00
Andrei Kortunov
1520a4d7db Levelup menu layout fixes 2017-05-01 20:48:39 +04:00
Andrei Kortunov
26ec467df0 Tooltips: faction, magic effects layout fixes 2017-05-01 10:00:51 +04:00
Andrei Kortunov
987677db75 Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes 2017-04-30 22:39:05 +04:00
Andrei Kortunov
6331cc6ab9 Tooltips: level, race, class, specialization layout fixes 2017-04-30 19:45:36 +04:00
scrawl
9f1527b7da Merge pull request #1272 from akortunov/guifixes
Service menus layout fixes
2017-04-30 12:27:21 +02:00
Andrei Kortunov
c2706ac3e7 Merchant repair and travel window scroll fix 2017-04-23 09:15:25 +04:00
scrawl
8fbf9dc597 Merge pull request #1253 from akortunov/pinned
Remember "pinned" windows across game restarts
2017-04-21 18:44:47 +02:00
Andrei Kortunov
2b3b6d558f Move updatePinnedWindows() function to private section 2017-04-21 19:37:09 +04:00
Andrei Kortunov
f986e3fafa Remove unused code 2017-04-21 18:39:01 +04:00
scrawl
fc56fc0b81 Merge pull request #1265 from akortunov/develop
Use "sLevel" GMST instead of hardcoded text in load game menu
2017-04-21 15:30:15 +02:00
Andrei Kortunov
e717d046f2 Escaped class name string 2017-04-21 17:21:57 +04:00
scrawl
1956602aa2 Merge pull request #1262 from Allofich/warnings
Fix more warnings
2017-04-21 14:34:36 +02:00
Andrei Kortunov
f67ec9c9ce Use sLevel GMST instead of hardcoded text in load game menu 2017-04-21 09:40:25 +04:00
Andrei Kortunov
6c1e3a0618 Merged from upstream master 2017-04-21 08:48:22 +04:00
Allofich
ff3cb18d4f Fix shadowing warnings 2017-04-21 11:06:18 +09:00
scrawl
1ffb9e1bf3 Remove renderWorldMap() 2017-04-21 00:50:22 +02:00
Andrei Kortunov
90d90b6d81 Fixed dynamic stats tooltips in review menu 2017-04-20 17:24:34 +04:00
Andrei Kortunov
39682d616c Merge branch 'master' of https://github.com/OpenMW/openmw into guifixes 2017-04-20 17:20:20 +04:00
Andrei Kortunov
f0f1df3a96 Properly clear inventory 2017-04-19 20:54:09 +04:00
scrawl
30081393a6 Add InventoryWindow::clear() as part of world cleanup 2017-04-19 18:28:49 +02:00
scrawl
f90e5081f9 Merge pull request #1257 from akortunov/chargen
Chargen menus fixes
2017-04-18 22:23:30 +02:00
Andrei Kortunov
aac78d29a4 Service menus layout fixes 2017-04-16 20:30:20 +04:00
Andrei Kortunov
c93cf822c7 Reviewmenu: read name, race, class and birthsign from player stats (fixes bug #2628) 2017-04-14 23:21:20 +04:00
Andrei Kortunov
fb0c4700a4 Save a proto gender in racemenu 2017-04-14 23:19:48 +04:00
scrawl
f63b1e81cd Merge pull request #1228 from akortunov/master
Options to show hidden weapon parameters
2017-04-14 20:01:08 +02:00
scrawl
8d8f293a65 Merge pull request #1246 from akortunov/develop
Menu improvements
2017-04-12 23:57:00 +02:00
Andrei Kortunov
c3d49d5ca5 Fixed inventory crash and skipmenu launch 2017-04-12 22:57:32 +04:00
Andrei Kortunov
72a16dc78b Merge branch 'master' into pinned since added PR #1250 2017-04-12 13:17:06 +04:00
Andrei Kortunov
506cc47c9d Add option to show reach and attack speed for melee weapons 2017-04-12 09:12:25 +04:00
scrawl
993860a4b1 Merge pull request #1250 from resilar/mapbutton
Hide WorldButton when in game mode
2017-04-11 21:34:53 +02:00
Andrei Kortunov
95ce7637f3 Adds persisted pin (feature #2834, bug #2489) 2017-04-10 10:18:00 +04:00
def
785b3c3d01 Hide WorldButton when in game mode 2017-04-03 09:40:12 +03:00
Andrei Kortunov
31bd70f334 Added missed recharge and repair sounds 2017-04-02 23:19:43 +04:00
Andrei Kortunov
df5a43363a Confirmation dialogs size fix 2017-03-30 17:05:56 +04:00
Andrei Kortunov
edadcb338c Savegame dialog improvements 2017-03-27 23:10:57 +04:00
Andrei Kortunov
7d09a5d644 Progress bars vertical alignment 2017-03-27 13:33:28 +04:00
scrawl
373bd78cf3 Merge pull request #1233 from akortunov/guifixes
Vanilla style drowning widget
2017-03-24 18:10:11 +01:00
Andrei Kortunov
b89fdcfd27 Vanilla style drowning widget (partially fixes bug #3801). 2017-03-24 09:41:18 +04:00
Andrei Kortunov
1a47b9727b Changed tooltip maximum width (bug #3800) 2017-03-23 14:31:01 +04:00
Andrei Kortunov
eb81ab5b24 Disables weapon and spells cycling in GUI mode (bugs #2409, #2483, #2645) 2017-03-15 17:07:25 +04:00
scrawl
5eff286c71 Use separate node mask and parent for CompositeMapRenderer to allow the loading screen to pre compile composite maps. 2017-03-14 19:27:55 +01:00
MiroslavR
a8517c34eb Code style 2017-03-13 13:57:05 +01:00
scrawl
a556475fae Explicitely set the user data type to avoid const/non-const mismatch 2017-03-13 02:48:23 +01:00
scrawl
5de5be77f3 Fix Ptr/ConstPtr userdata mismatch (Bug #3784) 2017-03-13 02:48:23 +01:00
Mitchell Schwitzer
421b92ae05 fix styling & add missing lines regarding max proficency 2017-03-12 17:24:43 -07:00
Mitchell Schwitzer
f31e5ba85e fix display maximum proficency reached 2017-03-12 17:02:07 -07:00
Mitchell Schwitzer
7960d5a9a7 fix skill progress bar v2
both widgets display their own progess indicator. it was being set for
value (when you hovered over the level of your skill, eg the "5" in
"Acrobatics    5"), but not for the name.

this fixes that, but the progress information is being stored/displayed
by two different widgets for one skill
2017-03-12 16:52:29 -07:00
scrawl
29556a1802 More consistent wording of errors/warnings
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.

An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.

The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.

Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e Merge pull request #1209 from dhustkoder/master
Added ConstContainerStoreIterator (Task #3092)
2017-03-02 18:36:21 +01:00
Rafael Moura
18a4b64f1a Porting more ContainerStoreIterator usage to const version #2 2017-02-27 21:50:10 +00:00
Rafael Moura
9963601484 Porting code to ConstContainerStoreIterator #1 2017-02-19 15:18:35 +00:00
scrawl
57b585570a Preload magic effect visuals of the player's selected weapon/spell 2017-02-15 21:01:25 +01:00