1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-24 03:23:52 +00:00
Commit graph

2849 commits

Author SHA1 Message Date
Mads Buvik Sandvei
01add8023e derp fix 2020-11-28 00:25:34 +01:00
Mads Buvik Sandvei
04711180bd Continue use of ifdef pragmas until i feel like cleaning up build rules 2020-11-27 23:08:08 +01:00
Mads Buvik Sandvei
259330ab14 Drop MyGUI 3.4 requirement. Manage layer and widget focus manually. 2020-11-27 21:47:20 +01:00
Mads Buvik Sandvei
49e76fa077 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-11-27 00:36:10 +01:00
jefetienne
bc6f46465f Add to changelog, authors. Move variable declaration inside block 2020-11-19 10:34:15 -05:00
jefetienne
2413de38b5 Extend spell/item search to search by magic effect name 2020-11-19 10:34:15 -05:00
Mads Buvik Sandvei
490d9e0086 Check if onOpen/onClose reversed visibility change before forwarding it to the VR GUI Manager. 2020-11-15 16:30:15 +01:00
Mads Buvik Sandvei
3e581571f4 QWERTY implementation of a virtual keyboard. 2020-11-14 19:20:36 +01:00
Alexei Dobrohotov
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
Use emplace_back instead of push_back
2020-11-01 01:58:56 +03:00
Mads Buvik Sandvei
c1e6b05555 Wrote a meta menu for accessibility on VR controllers with few keys. 2020-10-27 20:45:41 +01:00
Alexei Dobrohotov
9763995892 Fix regression #5666 2020-10-27 18:08:14 +03:00
Bret Curtis
5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 2020-10-22 23:57:53 +02:00
Mads Buvik Sandvei
4f8f0cc8ac Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-10-22 20:39:53 +02:00
Alexei Dobrohotov
f1b7cd5404 Don't reset temporarily hidden container window 2020-10-22 02:12:31 +03:00
Mads Buvik Sandvei
4c4fc0c69a Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera. 2020-10-21 21:34:47 +02:00
Bret Curtis
7d16b6f26c
Merge pull request #2992 from akortunov/service_refusal
Add support for service-specific refusals
2020-10-21 00:29:19 +02:00
Bret Curtis
82431b752d removed unnessary bits that cmake should be doing for us; replace Misc::gcd with std::gcd 2020-10-20 23:38:05 +02:00
Andrei Kortunov
6c591c190b Add support for service-specific refusals (feature #5580) 2020-10-20 18:58:26 +04:00
Andrei Kortunov
065ed5138e Use emplace_back instead of push_back 2020-10-18 10:27:35 +04:00
Bret Curtis
8050882baf
Merge pull request #3015 from akortunov/overrides
Mark overrided methods as overrides
2020-10-17 13:32:08 +02:00
AnyOldName3
df178ed97c Merge branch 'container-regressions' into 'master'
Fix container regressions

See merge request OpenMW/openmw!346

(cherry picked from commit b0aee6f83d4cddb0116284b197913f9687dd9cee)

95e7a22d fix container regressions
2020-10-16 22:55:10 +00:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
Assumeru
72549651e0
Rework container resolution (#3006)
* Rework container resolution

* add optional argument to getCount

* remove now-redundant changes

* undo worldimp changes

* move save-fixing code to InventoryState

* replace Rng instances with Seeds
2020-10-13 17:46:32 +02:00
Alexei Dobrohotov
39678c74bf Add many more godmode checks to harmful magic (bug #5633) 2020-10-09 20:36:51 +03:00
Charles Calhoun
14aacb81c5 Fix follower aggression when traveling. Summoning still has problems but less intrusive than current implementation. 2020-10-03 20:05:17 +00:00
Kyle Shrader
845049a166 Prevent empty right page of journal having invisible topics (Fixes #5588) 2020-10-03 10:55:44 +00:00
Alexei Dobrohotov
f2af957647 Reset enchant effects displayed range when they are constant (bug #5603) 2020-09-25 02:13:57 +03:00
Andrei Kortunov
753ca91556 Set a minimum 1gp cost for services (regression #5600) 2020-09-08 17:04:31 +04:00
Andrei Kortunov
67eace1028 Use struct instead of tuple 2020-08-29 11:24:08 +04:00
Andrei Kortunov
924f634bda Support for multiple summons with same ID in the single spell 2020-08-28 21:14:54 +04:00
Frederic Chardon
12ee42c6f3 Update mLastTopic before executing scripts. In case the script contains ClearInfoActor it erase not the correct topic.
Other correction not linked with the bug:
- reset mActorKnownTopicsFlag at the same time as mActorKnownTopics
- don't call updateTopics in addResponse, it is already handled by the response
callback
2020-07-28 20:50:49 +00:00
Mads Buvik Sandvei
c9e761eb88 Merge remote-tracking branch 'remotes/origin/master' into openxr_vr 2020-07-21 13:58:52 +02:00
Mads Buvik Sandvei
b7bda3544b MyGUI version guard. 2020-07-16 12:31:57 +02:00
Bret Curtis
a5da59e840
Merge pull request #2967 from Capostrophic/casesensitivity
Fix search filter unicode character case sensitivity
2020-07-12 22:41:24 +02:00
Capostrophic
65ac0c86b8 Fix search filter unicode character case sensitivity 2020-07-12 19:05:47 +03:00
Andrei Kortunov
7f936e4cde
Merge pull request #2961 from akortunov/move
Do not use outdated references when moving objects to new cells
2020-07-12 12:11:22 +04:00
Andrei Kortunov
da791590ac Update HUD icons during mechanics update again to avoid crashes 2020-07-11 20:40:00 +04:00
Andrei Kortunov
db8f0ad6fd Do not use outdated references when moving objects to new cells (bug #5387) 2020-07-11 17:24:20 +04:00
CedricMocquillon
096e25b29a Make the getSkillForTraining a member method of TrainingWindow class.
The implementation is based now on the member of the class
mTrainingSkillBasedOnBaseSkill instead of local static
2020-07-07 11:13:35 +02:00
CedricMocquillon
1aa4f6bf96 The number of skills points a trainer can teach is based either on its base
values or on its modified ones depending on the new setting 'trainers training
 skills based on base skill' value
2020-07-06 20:30:14 +02:00
CedricMocquillon
281cef9769 The 3 skill selected by a trainer are based on its 3 best skills.
The skills are sorted either on their base value or on their modified one
depending on the new setting 'trainers training skills based on base skill'
2020-07-06 20:28:08 +02:00
Mads Buvik Sandvei
e9ed1948f1 fix unused warning 2020-07-05 11:32:20 +02:00
Bret Curtis
0c2fea8254
Merge pull request #2932 from elsid/replace_open_threads
Replace OpenThreads by std types
2020-07-04 13:11:23 +02:00
Andrei Kortunov
9ec61c14d2 Mark some methods as overrides to avoid warnings 2020-07-04 12:00:30 +04:00
Andrei Kortunov
d1b5f17390 Remove redundant virtual qualifier 2020-07-04 10:17:39 +04:00
Andrei Kortunov
27f1a3376c Add a separate stats watcher for GUI 2020-07-01 15:55:44 +04:00
Mads Buvik Sandvei
461258cb4b Reverted renaming of video player's gui layer 2020-06-28 13:01:58 +02:00
Mads Buvik Sandvei
58d73e14e6 Merge branch 'master' of https://gitlab.com/madsbuvi/openmw.git into openxr_vr
# Conflicts:
#	apps/openmw/mwbase/environment.cpp
#	apps/openmw/mwbase/environment.hpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwgui/windowmanagerimp.cpp
#	apps/openmw/mwinput/inputmanagerimp.hpp
#	apps/openmw/mwrender/animation.cpp
#	apps/openmw/mwrender/camera.cpp
#	apps/openmw/mwrender/camera.hpp
#	apps/openmw/mwrender/renderingmanager.cpp
#	apps/openmw/mwrender/renderingmanager.hpp
2020-06-28 11:59:07 +02:00
Andrei Kortunov
d0fe15b095 Use meaningful names instead of mSkill1 and mSkill2 2020-06-26 11:47:59 +04:00
elsid
40ad87bc4d
Replace OpenThreads by std types 2020-06-25 22:16:09 +02:00