mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 00:49:54 +00:00
Code Issues Releases Wiki Activity
24807 commits 38 branches 54 tags 122 MiB
Commit graph

2845 commits

Author SHA1 Message Date
capostrophic
2affb8ed63 Human-readable light source duration (feature #5091) 2019-07-31 21:37:20 +03:00
Alexei Dobrohotov
1a2f51ef6f
Merge pull request #2415 from Assumeru/unix-console 
Unix console hotkeys
 2019-07-31 21:34:09 +03:00
Artem Nykolenko
d996b565a5 Improve character window resizing (bug #4276) 2019-07-17 00:44:36 -04:00
Evil Eye
cb4664b31b Remove arrow key behaviour as it's in MyGUI now 2019-07-03 22:38:07 +02:00
Evil Eye
405c556ce9 Merge branch 'master' of https://github.com/OpenMW/openmw into unix-console 2019-07-03 21:58:06 +02:00
Andrei Kortunov
a62b6910ba
Merge pull request #2411 from Capostrophic/fader 
Make sure fade operations properly end (bug #4639)
 2019-06-10 08:58:26 +04:00
Capostrophic
56539fee4f Partially revert "Get rid of redundant setKeyFocusWidget() method" 2019-06-09 02:12:44 +03:00
Evil Eye
67fb19c2b9 fix deletion when not at end of line and implement ^LEFT and ^RIGHT 2019-06-07 18:41:35 +02:00
Evil Eye
4aca8240e5 implement ^W and ^U in the console 2019-06-06 22:09:54 +02:00
Capostrophic
596dbbe70b Make sure fade operations properly end (bug #4639) 2019-06-06 12:25:01 +03:00
Andrei Kortunov
34fe896f4e
Merge pull request #2400 from Capostrophic/colorcode 
Escape number signs in cell/region names (bug #5047)
 2019-06-02 08:06:40 +04:00
Andrei Kortunov
1ce370e7fa Make console to do not hide other GUI windows (bug #1515) 2019-05-29 17:10:57 +04:00
Capostrophic
9a19af5b33 Escape number signs in cell/region names (bug #5047) 2019-05-28 23:02:30 +03:00
Andrei Kortunov
fae5843347 Setup the ICO settings only once instead of every loading (bug #5025) 2019-05-24 08:04:20 +04:00
Alexei Dobrohotov
7c46102f0c
Merge pull request #2389 from akortunov/fmt 
Introduce a custom format() function
 2019-05-21 21:45:52 +03:00
Andrei Kortunov
e679190f31 Introduce a custom format() function to get rid of boost::format() and hackish replace() 2019-05-20 09:20:01 +04:00
Alexei Dobrohotov
0ee73d89f0
Correct selling prices of creature merchants 2019-05-19 23:43:40 +03:00
Andrei Kortunov
faf940546b Get rid of redundant setKeyFocusWidget() method 2019-05-17 19:09:40 +04:00
Andrei Kortunov
675be20a0f Get rid of redundant ControllerRepeatClick class 2019-05-17 10:49:00 +04:00
Andrei Kortunov
ac8fa54e6e Get rid of redundant MWScroll class 2019-05-17 10:23:34 +04:00
Capostrophic
3f73766304 Make enchanting make more sense (bug #5038) 2019-05-15 18:40:52 +03:00
Capostrophic
272df29a12 Exit waiting at the correct time when the player is in air 2019-05-14 20:38:41 +03:00
Capostrophic
485ed903c4 Enchanting window stays open after a failed attempt (feature #5034) 2019-05-14 17:16:37 +03:00
Andrei Kortunov
a79955352f Revert MR !103 and !105 since they cause issues with dialogue window 2019-05-14 14:22:54 +04:00
Andrei Kortunov
27737d4258 Fix an exception during reload when container windows is active. 
It is a regression in the animated containers feature.
 2019-05-13 17:59:32 +04:00
Alexei Dobrohotov
d37cb871d6
Fix last-minute typo 2019-05-13 09:50:32 +03:00
Andrei Kortunov
ef4042703d
Merge pull request #2373 from Capostrophic/barter 
Make offered price caps barter-specific (bug #5028)
 2019-05-11 15:05:41 +04:00
Alexei Dobrohotov
216f908a07
Merge pull request #2286 from akortunov/map 
Do not re-render maps for all active cells during cell transitions
 2019-05-11 02:30:38 +03:00
Phillip A
c4d5203e14 Fix MR !103 breaking of dialogue with actors with no greetings 2019-05-09 23:28:43 +00:00
Capostrophic
9d191055bf Make offered price caps barter-specific (bug #5028) 2019-05-09 21:19:10 +03:00
Frederic Chardon
6619150b23 Do not show magnitude for ingredients 2019-05-06 23:48:13 +00:00
Phillip Andrews
a481d2dc1a Make sure pointers are set before GUI windows are brought up 
This most noticiably fixes an issue when resting in a bed while levitating.
 2019-05-06 14:53:20 -05:00
Capostrophic
cb9d16cf5f Support negative effect magnitude in spell/ingredient/potion tooltips 2019-05-05 21:27:48 +03:00
Capostrophic
3add9765c3 Fix spell deletion for character without a birthsign 2019-05-04 21:51:36 +03:00
Alexei Dobrohotov
15142a608d
Merge pull request #2344 from xyzz/delete-spell 
Add a button to delete spells from spellwindow
 2019-05-04 21:05:12 +03:00
Alexei Dobrohotov
acae586765
Merge pull request #2365 from akortunov/guifixes 
Refactor Settings::Manager::apply()
 2019-05-04 21:01:15 +03:00
Andrei Kortunov
4f42fe5595 Refactor Settings::Manager::apply() 2019-05-04 21:38:36 +04:00
Alexei Dobrohotov
1bfe0e43af
Merge pull request #2360 from akortunov/guifixes 
Do not track resolution settings changes in the InputManager
 2019-05-04 20:23:03 +03:00
Alexei Dobrohotov
632e7b973b
Merge pull request #2349 from akortunov/pinning 
Allow to maximize windows via Shift + Double Click
 2019-05-04 20:21:30 +03:00
Andrei Kortunov
4513c5516c Increase the viewing distance cap in the slider when the Distant Terrain is enabled 2019-05-03 10:23:10 +04:00
Andrei Kortunov
0cd8d4b842 Do not track resolution settings changes in the InputManager (bug #4902) 2019-05-02 19:00:47 +04:00
Andrei Kortunov
c5ac580e74 Allow to maximize windows via Shift + Double Click (feature #3999) 2019-05-01 20:15:11 +04:00
Alexei Dobrohotov
5e405ca679
Merge pull request #2347 from akortunov/pinning 
Make pinnable windows hiding persistent
 2019-04-25 20:15:05 +03:00
Andrei Kortunov
8e48493264 Make pinnable windows hiding persistent (feature #4994) 2019-04-25 21:05:43 +04:00
Ilya Zhuravlev
e057ea171f spell window: don't manually recalculate edit box width every update 2019-04-25 09:13:32 -04:00
Ilya Zhuravlev
e1ce15efb5 spellwindow: do onWindowResize in ctor after dimensions are set 2019-04-25 08:51:57 -04:00
Ilya Zhuravlev
26ac7412a0 Spell window: dynamically resize the edit box, change delete button caption 2019-04-25 08:46:11 -04:00
Ilya Zhuravlev
2ee0b1287b spellmodel: add a break to getSelectedIndex 2019-04-25 06:14:12 -04:00
Ilya Zhuravlev
6c96b5653b Add a button to delete spells from spellwindow 2019-04-24 19:22:47 -04:00
Capostrophic
c7ac06b960 Always account for every follower travelling 2019-04-24 16:21:12 +03:00
Andrei Kortunov
9059971a69 Increase required MyGUI version to 3.2.2 2019-04-22 20:52:18 +04:00
Andrei Kortunov
09686d684e Update background texture if a new one is empty (regression #4986) 2019-04-20 11:40:42 +04:00
Andrei Kortunov
31ddb0a482 Allow to calculate UI skin size based on texture resolution (feature #4968) 2019-04-10 10:34:07 +04:00
Bret Curtis
7808cbbfe8
Merge pull request #2292 from akortunov/fallback 
Make fallback map static to simplify constructors
 2019-04-07 17:43:59 +02:00
Capostrophic
7202f45771 Only allow resting in air when a bed is used 2019-04-04 17:22:24 +03:00
bzzt
ed4ce4609b Do not re-render maps for all active cells during cell transitions 2019-03-30 09:10:48 +04:00
Andrei Kortunov
a302ec9c65 Make fallback map static to simplify constructors 2019-03-29 15:30:49 +04:00
Bret Curtis
886c77bced
Merge pull request #2145 from akortunov/rest 
Update jail state once instead of for every single hour
 2019-03-27 13:14:22 +01:00
Capostrophic
93f78aad60 Avoid menu button texture vertical cutoff 2019-03-24 22:55:27 +03:00
bzzt
231e629e66 Store map widgets and textures in one vector instead of 4 different ones 2019-03-23 07:46:41 +04:00
bzzt
c2176945bd Do not use the delayed map cells update 2019-03-22 18:58:34 +04:00
Bret Curtis
e2ed90e67b
Merge pull request #2262 from akortunov/guifixes 
[Regression] Fix missing \n characters on the active effects tooltips
 2019-03-18 08:59:31 +01:00
Andrei Kortunov
80e0fbdd88 Fix missing \n characters on the active effects tooltips 2019-03-18 08:47:46 +04:00
Capostrophic
168e758921 Correct look and behavior of some setting sliders 2019-03-17 06:44:42 +03:00
Capostrophic
578beb6305 Use selected object local variables in console (feature #3893) 2019-03-10 17:09:54 +03:00
Vladimir Panteleev
9d5fc7954f
DRY skill widget updates in stats window 
The skill widgets were configured in two places: initial creation, and
updates. The former was redundant, and duplicated the functionality of
the latter.

To fix this redundancy, replace the duplicate code with a call to
setValue.
 2019-03-05 22:52:30 +00:00
Capostrophic
2f38e4fbb3 Fix enchanted item icon update 2019-03-02 20:01:42 +03:00
Bret Curtis
79fca2e7c6
Merge pull request #2095 from akortunov/reflections 
Add more settings to water reflections
 2019-03-02 15:37:06 +01:00
Bret Curtis
f6127a30c0
Merge pull request #2199 from akortunov/guifixes 
Use C++11-style loops in the GUI instead of iterators
 2019-03-02 15:36:54 +01:00
Andrei Kortunov
bf5f68a4d8 Replace boost GCD to the homebrew implementation 2019-03-02 17:32:05 +04:00
Andrei Kortunov
9398117ea7 Allow to do not reflect terrain 2019-03-02 14:26:14 +04:00
Andrei Kortunov
00ab552184 Add more settings to water reflections in exteriors (feature #4859) 2019-03-02 14:26:14 +04:00
Andrei Kortunov
8df8bd3f37 Use C++11-style loops in the GUI instead of iterators 2019-03-02 13:27:59 +04:00
Bret Curtis
735bcf17c2 Merge branch 'boost-gcd-deprecation' into 'master' 
Fix boost deprecation warning

See merge request OpenMW/openmw!66
 2019-02-26 18:02:01 +00:00
AnyOldName3
cd4303da23 Add preprocessor check to determine which common_factor header to use. 2019-02-26 17:03:07 +00:00
Capostrophic
216e1ab16f Always include <memory> for smart pointers in MWGui 2019-02-25 18:50:51 +03:00
Capostrophic
8ecd0b82a4 Replace Boost format and replace_all where possible 2019-02-24 03:20:20 +03:00
Bret Curtis
d4564a9be7
Merge pull request #2180 from akortunov/includes 
Remove redundant includes
 2019-02-24 01:14:16 +01:00
Andrei Kortunov
fcdb0c16bf Update jail state once instead of for every single hour 2019-02-23 09:17:06 +04:00
Andrei Kortunov
3032b177a1 Remove redundant includes 2019-02-23 08:02:12 +04:00
Capostrophic
58788de7c4 Get rid of Boost.Array 2019-02-22 23:16:34 +03:00
Bret Curtis
212f097b3c
Merge pull request #2172 from akortunov/pvs_fix 
Fix some issues, found by PVS-Studio
 2019-02-22 15:01:37 +01:00
Bret Curtis
55fc04e462
Merge pull request #2175 from Capostrophic/includes 
Include cleanup
 2019-02-22 14:56:20 +01:00
Capostrophic
c03ed4cd50 Include cleanup 2019-02-19 18:40:33 +03:00
Andrei Kortunov
9de0c9045a Fix API usage errors 2019-02-17 14:29:39 +04:00
Andrei Kortunov
dc6ef15571 Simplify loop in the addSkills() 2019-02-17 14:29:39 +04:00
Andrei Kortunov
ad9412a117 Remove some redundant checks 2019-02-17 14:29:36 +04:00
Andrei Kortunov
18a59df050 Throw exceptions by value instead of reference 2019-02-17 10:24:25 +04:00
AnyOldName3
89d4d3be08 Fix boost deprecation warning 2019-02-13 14:49:36 +00:00
Capostrophic
e9c6c11418 Fix hiding three-tab (Cyrillic) topic index 2019-02-08 10:53:50 +03:00
Andrei Kortunov
8580a58ba0 Optimize HUD update (do not do unnecessary work) 2019-01-25 21:15:29 +04:00
Andrei Kortunov
0937f02598 Get rid of unnecessary string streams 2019-01-07 21:08:16 +04:00
Ilya Zhuravlev
1bdec2399f Make sure CopyFramebufferToTextureCallback is only called once and not every frame 2018-12-25 11:56:24 -05:00
Ilya Zhuravlev
8e7c01b561 loadingscreen: Fix UaF in loading screen. 
When the CopyFramebufferToTextureCallback callback is called, in its operator() it resets setInitialDrawCallback by providing a NULL pointer.
However, this causes the callback to get deleted. In turn, the "this" pointer is invalidated.
When execution returns to DrawCallback::run, it accesses a _nestedCallback member of deleted "this" which is UB.
 2018-12-24 14:18:26 -05:00
Andrei Kortunov
a53333c3d5 Native animated containers support (feature #4730) 2018-12-13 23:11:16 +04:00
Bret Curtis
a21792657a
Merge pull request #2034 from akortunov/guifixes 
Improve GUI cleanup
 2018-11-15 07:31:57 +01:00
Andrei Kortunov
5e071e3eb0 Add a missing check if mPtr is empty (bug #4715) 2018-11-13 10:32:23 +04:00
Andrei Kortunov
71f1a53090 Improve tooltips cleanup (bug #4714) 2018-11-13 10:00:12 +04:00
Andrei Kortunov
d2613e35a2 Fix some Clang 7 warnings 2018-11-09 19:42:59 +04:00
Bret Curtis
3cd59d4a89
Merge pull request #1993 from akortunov/loadingbar 
Center progress bar when there are active messageboxes
 2018-10-28 14:43:33 +01:00
Andrei Kortunov
6e05853478 Center progress bar when there are active messageboxes (bug #4691) 2018-10-28 14:40:48 +04:00
Marc Zinnschlag
9dd0d641bc Merged pull request #1931 2018-10-28 11:02:33 +01:00
Capostrophic
19ce1abcdf Fix selected weapon HUD durability percentage 2018-10-26 12:53:15 +03:00
Andrei Kortunov
e7de6b974a Optimize actors processing 
1. Do not update physics and animations for actors outside processing range (bug #4647)
2. Do not render such actors
3. Add transparency to actors near processing border, so they will not pop up suddenly
 2018-10-25 22:52:59 +04:00
Capostrophic
c3e8d536cd Implement getNormalizedEnchantmentCharge() method and use it 2018-10-25 16:16:07 +03:00
Capostrophic
54bd7b2dcf Implement getItemNormalizedHealth() method and use it 2018-10-25 15:45:31 +03:00
Capostrophic
67de61e1fb Avoid item condition and charge zero divisions 2018-10-24 19:06:55 +03:00
Marc Zinnschlag
b30e309532 Merged pull request #1967 2018-10-13 11:15:45 +02:00
Andrei Kortunov
dad0b78901 Avoid overflow when handling output characters (bug #4676) 2018-10-12 20:41:03 +04:00
Capostrophic
47b1b0ac39 Re-fix water reflections while making a no-GUI screenshot 2018-10-10 22:44:26 +03:00
Marc Zinnschlag
2d87d1d9d2 Merged pull request #1959 2018-10-10 15:05:29 +02:00
Andrei Kortunov
e06f0b797a Replace all NULLs to nullptr 2018-10-09 10:21:12 +04:00
Capostrophic
09aecb955c getSkill usage cleanup (bug #4671) 2018-10-08 17:06:30 +03:00
Capostrophic
674e33170b Fix quick key system regressions (bug #4662) 2018-09-30 21:16:02 +03:00
Marc Zinnschlag
0e06a25f21 Merged pull request #1935 2018-09-25 12:11:20 +02:00
Sergey Fukanchik
44bcd9b25f Fix tab characters 2018-09-23 02:46:29 +03:00
Sergey Fukanchik
c50ee22772 Wrap up World::canRest() implementation by moving enemiesNearby() from InputManager::rest() to World::canRest(). 2018-09-23 01:52:56 +03:00
Andrei Kortunov
b3fd173e00 Check if current weapon has health at all in HUD (bug #4648) 2018-09-22 06:51:56 +04:00
Marc Zinnschlag
7be9f2ca45 Merged pull request #1891 2018-09-21 11:38:19 +02:00
Andrei Kortunov
bdd9eba2b8 Use C++ limits instead of C ones 2018-09-20 16:02:26 +04:00
Andrei Kortunov
276b7830a9 Mass potion creation (feature #4642) 2018-09-20 15:45:14 +04:00
Marc Zinnschlag
82d37dda20 Merged pull request #1927 2018-09-20 13:31:41 +02:00
Andrei Kortunov
6d0e6ab012 Use book font by default in the text formatter 2018-09-17 22:24:21 +04:00
Andrei Kortunov
dda02bd696 Do not use book fonts for dialogue window 2018-09-17 19:56:36 +04:00
Andrei Kortunov
70ed8fd1a9 Use constants instead of widely used magic numbers (task #4645) 2018-09-17 19:22:50 +04:00
Marc Zinnschlag
06b2a23e74 Merged pull request #1768 2018-09-17 12:10:21 +02:00
Bret Curtis
6035636e29
Merge pull request #1915 from akortunov/enterfix 
Disable repeating for Accept GUI action
 2018-09-14 15:17:47 +02:00
Marc Zinnschlag
252ed9bd4b Merged pull request #1914 2018-09-13 11:53:21 +02:00
Capostrophic
664c630ac0 Don't make sTo strings static references 2018-09-12 16:36:03 +03:00
Andrei Kortunov
e300a16b24 Use field for columns count instead of out integer 2018-09-12 14:31:01 +04:00
Andrei Kortunov
7a986f38da Support for user-defined TrueType fonts 2018-09-12 14:31:01 +04:00
Andrei Kortunov
c9c0230d2a Scale journal fonts separately from common ones 2018-09-12 14:31:01 +04:00
Andrei Kortunov
f89393fd62 Validate 'ttf resolution' option value 2018-09-12 14:31:01 +04:00
Andrei Kortunov
adbaeb7cca Improve GUI scaling (bug #3288) 2018-09-12 14:31:01 +04:00
Marc Zinnschlag
6100e34051 Merged pull request #1912 2018-09-12 12:04:49 +02:00
Andrei Kortunov
9918212a1e Set focus to Close button when opening the container window (bug #4333) 2018-09-11 11:22:26 +04:00
Andrei Kortunov
c2c24a76a4 Handle MyGUI exceptions inside destructors 2018-09-11 11:11:27 +04:00
Andrei Kortunov
269ef7a559 Disable repeating for ENTER key in GUI 2018-09-10 12:55:00 +04:00
Andrei Kortunov
33a66b778f Disable repeating for Accept action in keyboard navigation (bug #4260) 2018-09-09 23:10:09 +04:00
Capostrophic
702868255a Use sTo GMST in spellmaking menu (feature #4636) 2018-09-09 13:56:58 +03:00
Marc Zinnschlag
ef72024e2c Merged pull request #1902 2018-09-01 11:01:05 +02:00
Capostrophic
b673cdf70e Grant Enchant experience even if recharging fails (bug #4622) 2018-08-30 23:52:33 +03:00
Capostrophic
7ef6fa9f61 Remove deprecated GMST get* functions 2018-08-29 18:38:12 +03:00
Marc Zinnschlag
21d414187f Merged pull request #1896 2018-08-29 12:05:50 +02:00
Andrei Kortunov
8fa6c6f726 Update pinned windows in-game (bug #4560) 2018-08-27 09:44:04 +04:00
Sophie Kirschner
a1e076a37e Merge branch 'master' into pineapple/fix-video-incomplete-type-2 
Resolve merge issues related to CHANGELOG.md

* master:
  Optimize skinning (task #4605)
  Update changelog
  Update some comments
  Set the OpenAL source offset after setting the buffer
  Make Move and MoveWorld console commands move actors standing on moving object (bug #2274)
  Adding Changelog entry
  Allow messageboxes arguments to have newline characters (bug #3836)
  Check for impact immediately when launch a projectile (bug #3059)
  Fix gold count calculation in pickupObject (bug #4604)
  Correct special case soundgen comparisons
  Move "land" check earlier
  Fixes #3681
  Play landing sound manually and ignore land soundgen textkeys (bug #2256)
  Make some more optimizations to actor processing loops
  Fix freeze in getActorsSidingWith
  Addiong missing "to" word
  Adding common problems that were previous on the site FAQ
  Treat <> and << operators as < and  >< and >> as > in scripts
  stage1: priorities for event music and other minor improvements to the music system

# Conflicts:
#	CHANGELOG.md
 2018-08-26 12:05:02 +03:00
Sophie Kirschner
dd01c4d224 Fix: 'sizeof' to an incomplete type 'Video::VideoPlayer' 
Alternate solution to same problem reported in https://github.com/OpenMW/openmw/pull/1888
 2018-08-25 11:53:43 +03:00
Capostrophic
3f76f1d3ed Fix gold count calculation in pickupObject (bug #4604) 2018-08-22 22:35:22 +03:00
Marc Zinnschlag
088463ebe6 Merged pull request #1868 2018-08-17 09:37:49 +02:00
Capostrophic
372697489b Fix Equip command infinite loop (bug #3072) 2018-08-17 02:52:18 +03:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
Andrei Kortunov
9dfd775bf2 Implement GetPCTraveling console command 2018-08-13 08:30:50 +04:00
Marc Zinnschlag
fe19d8ff35 Merged pull request #1857 2018-08-09 13:52:51 +02:00
Andrei Kortunov
6202b4eca9 Do not touch GUI modes when taking screenshots (bug #4528) 2018-08-08 22:10:53 +04:00
Capostrophic
e9e9c0dd6b Fix guild guide fast travelling to exteriors time 2018-08-08 12:46:36 +03:00
Capostrophic
bcd9cc4baa Check the actor cell instead of the destination cell in fast travel price logic 2018-08-08 02:07:48 +03:00
Marc Zinnschlag
b75b5d139a Merged pull request #1845 2018-08-05 12:28:38 +02:00
Capostrophic
7087bad580 Use special behavior for all topics with reserved names (bug #4557) 2018-08-05 12:39:53 +03:00
Andrei Kortunov
b0f2e00e7f Make forcegreeting a non-op for non-actor objects (bug #4553) 2018-08-05 09:31:45 +04:00
Marc Zinnschlag
452a706047 Merged pull request #1837 2018-08-04 10:26:44 +02:00
Andrei Kortunov
eeffe2e557 Check if item model exists inside drag and drop functions 2018-08-03 16:42:43 +04:00
Marc Zinnschlag
eb5f558f6f Merged pull request #1839 2018-08-03 12:53:55 +02:00
Capostrophic
3ac030d75a
Handle explicit calls before handling quotes 2018-08-02 09:49:53 +03:00
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