1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-29 21:44:04 +00:00
Commit graph

28659 commits

Author SHA1 Message Date
Mads Buvik Sandvei
ef017285fb Update .gitlab-ci.yml to target openmw_vr instead of openmw. Needs a better solution that can actually be merged someday. 2020-07-31 14:13:34 +00:00
Bret Curtis
1b3f5d4f0d
Merge pull request #2981 from akortunov/refactoring
Use more C++11 in the scripting system code
2020-07-30 21:48:09 +02:00
unknown
073a7f2b2d Comments to explain the arcane workings of Morrowind 2020-07-30 21:39:04 +02:00
Andrei Kortunov
9f349e8d91 Use more C++11 in the scripting system code 2020-07-30 20:57:25 +04:00
Andrei Kortunov
cd4d3389a4
Merge pull request #2978 from Capostrophic/transform
Don't encapsulate NIF transformation changes
2020-07-29 22:00:16 +04:00
Capostrophic
3d31d21bc2 Don't encapsulate NIF transformation changes
Currently that causes issues
2020-07-29 20:46:36 +03:00
unknown
b39f35d805 inherit variables 2020-07-29 18:43:56 +02:00
Bret Curtis
72b63ed140
Merge pull request #2954 from Assumeru/basespells
Mutate base records when adding/removing spells
2020-07-29 09:18:55 +02:00
psi29a
3cb69e8fa5 Merge branch 'clearinfoactor' into 'master'
Properly handle ClearInfoActor (#5548)

Closes #5548

See merge request OpenMW/openmw!274
2020-07-28 20:50:49 +00: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
unknown
e27858cfab these were supposed to be included 2020-07-28 18:24:09 +02:00
Evil Eye
6ad20ec9c7 Mutate base records when adding/removing spells 2020-07-28 08:33:28 +02:00
Bret Curtis
ae1af0e103
Merge pull request #2972 from Assumeru/non-unique-additem
Mutate base record when calling add/remove item on non-unique actors
2020-07-27 23:33:10 +02:00
David Cernat
4560267298 [General] Track the client scripts that Object packets originate from 2020-07-27 09:17:22 +02:00
Bret Curtis
e0655841e1
Merge pull request #2962 from Capostrophic/nifcleanup
More NIF-related cleanup
2020-07-27 01:28:39 +02:00
Bret Curtis
d197e2887b
Merge pull request #2977 from Capostrophic/simplewater
Make a horrible simple water hack less horrible
2020-07-27 01:26:44 +02:00
Bret Curtis
82a45eb6ae
Merge pull request #2976 from Capostrophic/unconscious
Add option to always allow stealing from KO'd actors (feature #5545)
2020-07-27 01:22:51 +02:00
psi29a
9aff51ed75 Merge branch 'launcher_add_spacer' into 'master'
Add vertical spacers to files/ui/graphicspage.ui

See merge request OpenMW/openmw!269
2020-07-26 23:20:37 +00:00
Petr Mikheev
65c92b6488 Add alignment="Qt::AlignTop" to files/ui/graphicspage.ui 2020-07-27 00:24:15 +02:00
Capostrophic
03f0bd3df6 Make a horrible simple water hack less horrible 2020-07-27 00:32:24 +03:00
Bret Curtis
a74f7bbcbe
Merge pull request #2975 from Capostrophic/pickpocket
Fix pickpocketing sneaking stance check
2020-07-26 23:01:03 +02:00
Bret Curtis
b0c4336577 update DejaVuFontLicense entry 2020-07-26 22:53:46 +02:00
David Cernat
2cb16e778c [General] Use clearer method name for tracking InterpreterContext type 2020-07-26 20:03:33 +02:00
Mads Buvik Sandvei
f39643964c Merge branch 'openxr_vr' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-07-26 18:00:50 +02:00
David Cernat
63480a0012 [Client] Use DetourNavigator for local actors, working around c1ebd9474b 2020-07-26 17:58:59 +02:00
Mads Buvik Sandvei
911271f156 shareable shadow maps 2020-07-26 17:56:46 +02:00
Mads Buvik Sandvei
d8bc5e7b26 Merge remote-tracking branch 'remotes/origin/shared_shadow_maps' into openxr_vr 2020-07-26 17:37:47 +02:00
Mads Buvik Sandvei
0970424f65 Sharing shadow maps without any redundant rendering. 2020-07-26 17:34:37 +02:00
Mads Buvik Sandvei
e0bc56dcf7 Single pass shadow update 2020-07-26 13:12:36 +02:00
Mads Buvik Sandvei
a15188d3bc Wait on a separate thread 2020-07-26 13:12:05 +02:00
Capostrophic
9c930e38fa Add option to always allow stealing from KO'd actors (feature #5545) 2020-07-26 13:10:44 +03:00
Bret Curtis
aa094b568e
Merge pull request #2974 from Capostrophic/documentation
Update documentation
2020-07-26 12:05:13 +02:00
Bret Curtis
584fcd4716 Merge branch 'master' of github.com:OpenMW/openmw 2020-07-26 11:54:51 +02:00
Capostrophic
cc6e4ad215 Fix pickpocketing sneaking stance check 2020-07-26 12:20:17 +03:00
Evil Eye
040a92c373 implement additem/removeitem for non-unique actors 2020-07-26 11:07:18 +02:00
David Cernat
57734c172b [Client] Retain AiPursue for guards ignoring player because of dialogue
In OpenMW, guards starting combat with the player cause other guards with an AiPursue package to also join the combat in MechanicsManager::startCombat(). Previously, however, TES3MP was discarding AiPursue packages for the guards who hadn't started the arrest dialogue with the player by returning the wrong boolean in AiPursue::execute(), leading to just one-on-one combat with the arresting guard.
2020-07-26 11:06:11 +02:00
Capostrophic
c4eb50d17f Update documentation
Document distant fog
Make colored topic functionality documentation clearer
Update the status of screenshot format tweakability
2020-07-26 11:56:52 +03:00
Capostrophic
46825e8a4d Move NIF record index back to a separate user object
This makes sure it's never erroneously optimized out. NodeIndexHolders don't need to be cloned as their record index is never supposed to be changed.
2020-07-26 09:57:43 +03:00
Capostrophic
f93655e803 Encapsulate NIF transform changes in NifOsg::MatrixTransform 2020-07-26 09:57:43 +03:00
Capostrophic
ad87289d59 Fix NifOsg::MatrixTransform constructor inheritance 2020-07-26 09:57:43 +03:00
Capostrophic
cc791af0f5 Serialization fixes
Make sure NifOsg::MatrixTransform serialization behaves as intended
Add a dummy serializer for NifOsg::UVController
2020-07-26 09:57:43 +03:00
Capostrophic
3b55d657e5 CopyRigVisitor: Log the number of parents in multiple parents error 2020-07-26 09:57:43 +03:00
Capostrophic
a61267f57d Replace NodeUserData with a custom transform node 2020-07-26 09:57:43 +03:00
Capostrophic
4c9cefefdd Get rid of NifOsg::CollisionSwitch 2020-07-26 09:57:43 +03:00
psi29a
899966f0d3 Merge branch 'Launcher-CodePatch-Tab' into 'master'
Add a new tab in the launcher app to handle code patch options.  #5519

See merge request OpenMW/openmw!258
2020-07-26 00:05:55 +00:00
Bret Curtis
224923d6c8 update appdata license and dejavufont license file 2020-07-26 01:56:55 +02:00
David Cernat
71b00da289 Update AUTHORS with project leader history & special mention for scrawl 2020-07-25 21:33:52 +03:00
David Cernat
ff10aa816b Add OpenMW commits up to 25 Jul 2020
# Conflicts:
#   .travis.yml
2020-07-25 19:44:01 +02:00
CedricMocquillon
1ff2256bc1 Update changelog 2020-07-25 17:42:31 +02:00
CedricMocquillon
1f4f10c723 Add a tab level in advanced settings 2020-07-25 17:42:31 +02:00