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

2845 commits

Author SHA1 Message Date
Andrei Kortunov
2254256db9 Pause both audio and video playback when the game is minimized (feature #4944) 2020-04-04 22:54:51 +04:00
Andrei Kortunov
3d6fd2818f Support for per-type sound blockers 2020-04-04 22:54:51 +04:00
Andrei Kortunov
a68d9aed4c Fix issues, found by CoverityScan 2020-04-04 17:45:26 +04:00
Andrei Kortunov
26ac6839d4
Merge pull request #2755 from akortunov/guifixes
Do not disable a mouse cursor until it moved when you exit a GUI mode
2020-04-04 14:22:25 +04:00
Andrei Kortunov
d222435774 Do not disable a mouse cursor until it moved every time when you exit a GUI mode 2020-04-02 22:39:00 +04:00
Andrei Kortunov
2e7712a390 Fix C5204 warnings by adding default virtual destructors 2020-03-26 14:49:12 +04:00
Andrei Kortunov
3d20df883e
Merge pull request #2727 from akortunov/guifixes
Make slider control in the wait window to be a more intuitive
2020-03-21 10:11:20 +04:00
Andrei Kortunov
90508237b1 Make slider control in the wait window to be a more intuitive 2020-03-20 11:58:22 +04:00
fredzio
e1b5dd97b8 Add a filter in the alchemy window.
A button allow to switch between ingredient name and magic effect.
Switching reset the filter.
The default filter can be set in the layout file.

The player can show only ingredients whose either name or effect
match the filter
Only effect that are known to the player (via alchemy skill) are
taken into account
2020-03-20 06:35:57 +01:00
Andrei Kortunov
94df2114c1 Store fog of war as a PNG image instead of TGA (bug #5108) 2020-03-07 11:05:32 +04:00
Capostrophic
54334932d9 Move user string assignment to layout files 2020-03-02 02:36:16 +03:00
Capostrophic
4b17d5da43 Make search fields behave more consistently 2020-02-25 18:26:25 +03:00
Alexei Dobrohotov
3f64d98305 Merge branch 'inventorysearch' into 'master'
Item search in inventory redux

See merge request OpenMW/openmw!158
2020-02-24 18:14:40 +00:00
Frederic Chardon
78d58a344d Item search in inventory (feature #4831) 2020-02-24 18:14:40 +00:00
Capostrophic
cfa877b109 Make PCSkipEquip and OnPCEquip behavior vanilla-like (bug #4141) 2020-02-21 21:18:54 +03:00
elsid
650f429ff5
Add final modifier to fix warnings 2020-02-18 10:36:08 -08:00
Andrei Kortunov
84979fa8b7 Move VisMask to components 2020-02-16 16:03:35 +04:00
Alexei Dobrohotov
7a4caaf5bf
Merge pull request #2660 from akortunov/boost
Additional de-boosting
2020-01-09 22:14:32 +03:00
Andrei Kortunov
1cdd33b434 Implement additional stringops to avoid Boost functions 2020-01-09 19:40:22 +04:00
Andrei Kortunov
a42396254b Use ISO format to print datetime 2020-01-06 11:27:11 +04:00
Andrei Kortunov
af36b652aa Simplify datetime formatting 2020-01-04 10:45:11 +04:00
Andrei Kortunov
eec82f676a
Merge pull request #2602 from elsid/clang_tidy
Fix clang-tidy issues
2019-12-03 08:27:43 +04:00
Capostrophic
eed92c824e Make sure hand-to-hand shortcut is not saved 2019-11-20 19:57:21 +03:00
elsid
b55f5ab648
Avoid virtual call in WindowManager ctor
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: warning: Call to virtual function during construction [clang-analyzer-optin.cplusplus.VirtualCall]
        loadUserFonts();
        ^
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: This constructor of an object of type 'WindowManager' has not returned when the virtual method was called
/home/elsid/dev/openmw/apps/openmw/mwgui/windowmanagerimp.cpp:244:9: note: Call to virtual function during construction
2019-11-17 18:50:11 +01:00
Andrei Kortunov
6554130f6f
Merge pull request #2594 from Capostrophic/summonsummon
Minor summoned creature cleanup fixes
2019-11-17 10:47:07 +04:00
Andrei Kortunov
5561eb5415 Do not discard division reminder 2019-11-13 15:18:18 +04:00
Capostrophic
120b7dcd2f Clean up summoned creatures when corpses are disposed 2019-11-12 21:44:46 +03:00
Andrei Kortunov
6a625b1dac Scale magic items frames in the quick keys menu 2019-11-09 15:00:50 +04:00
Bret Curtis
0ec4e51922
Revert "Store raw data about fog of war instead of RGBA images" 2019-10-30 14:48:44 +01:00
Bret Curtis
36614dba2a
Merge pull request #2453 from akortunov/fog_compression
Store raw data about fog of war instead of RGBA images
2019-10-30 13:45:55 +01:00
Capostrophic
ee4fa93bd4 Rework prevent merchant equipping setting again 2019-10-28 01:58:23 +03:00
Andrei Kortunov
19e9ece291
Merge pull request #2551 from Capostrophic/onpcequip
Set OnPCEquip properly when a race can't equip an item (bug #5182)
2019-10-11 20:07:35 +04:00
Alexei Dobrohotov
b7a1e6561b
Merge pull request #2080 from akortunov/recharge
Recharge items outside of player inventory
2019-10-09 23:37:10 +03:00
Capostrophic
c718f89325 Set OnPCEquip properly when a race can't equip an item (bug #5182) 2019-10-07 23:38:22 +03:00
Andrei Kortunov
c51aba0b13 Recharge items outside of player's inventory (bug #4077) 2019-10-07 22:59:43 +04:00
Andrei Kortunov
f75f9cb337 Use localized faction name when using TFH 2019-10-07 12:14:22 +04:00
Andrei Kortunov
f0b73e0a27 Do not store owners for items in container stores (bug #1933) 2019-10-05 17:29:00 +04:00
Capostrophic
421a9d2e50 [Regression] Fix pickpocket crashes 2019-09-23 23:56:37 +03:00
Andrei Kortunov
b360deaec3 Store raw data about fog of war instead of RGBA images (bug #5108) 2019-09-22 19:59:12 +04:00
Andrei Kortunov
85bb4a76f6 Improve faction items handling (bug #5164) 2019-09-17 19:09:08 +04:00
Andrei Kortunov
c9deb1b325 Generate sCrimeMessageReport only once per frame (bug #5012) 2019-09-05 20:16:03 +04:00
James Stephens
7d3f6e1cd9 Altered process so that cost only appears on spell purchase window.
Added myself to authors
2019-09-02 17:18:56 +00:00
James Stephens
b33429001c Fixes the offset question mark in the alchemy tooltip when the effect is not known 2019-09-02 17:13:56 +00:00
James Stephens
1cd1bfca74 Fixes bug #4650 2019-09-02 16:49:29 +02:00
Andrei Kortunov
b6044d231a Handle death event manually before disposing a corpse if a death animation was not finished yet (feature #5146) 2019-08-27 22:42:41 +04:00
Andrei Kortunov
661d11c83e
Merge pull request #2465 from Capostrophic/duration
Human-readable light source duration (feature #5091)
2019-08-18 08:43:51 +04:00
ArgonianAccount
53facf7baa Class quiz fixes 2019-08-12 00:54:02 +12:00
capostrophic
26f59e47db Improve readability 2019-08-09 19:56:21 +03:00
capostrophic
a9c4b18d38 Make sure cast chance checks mana when necessary (bug #5112) 2019-08-09 19:27:25 +03:00
capostrophic
6928adcee1 Prevent front() and operator[] from causing undefined behavior 2019-08-04 14:47:33 +03:00
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