Commit Graph

2649 Commits (ffi-server-rewrite)

Author SHA1 Message Date
Andrei Kortunov 427be928d0 Do not update animation state for dead actors 7 years ago
Andrei Kortunov 977a27ecb7 Do not clear corpses until end of death animation (bug #4307) 7 years ago
Andrei Kortunov a42c663fd7 Do not interrupt scripted animations by death animation (bug #4286) 7 years ago
Andrei Kortunov d0619cfb35 Play death animation for non-persisting actors with 0 health (bug #4291) 7 years ago
Andrei Kortunov 6099735c60 Early out only when scripted animation is playing 7 years ago
Andrei Kortunov e234dd2a36 Do not interrupt scripted animations 7 years ago
Andrei Kortunov 9fd2d57b86 Move previous items to player 7 years ago
Andrei Kortunov f977c6876f Bound items: store item ID instead of pointer 7 years ago
Andrei Kortunov 4de9d9fa77 Split adjustBoundItem() 7 years ago
Andrei Kortunov d1b1cb748d Reequip previous item only if the expired bound item was equipped 7 years ago
Andrei Kortunov 9b72a6ac69 Use the MWWorld::Ptr() instead of string ID 7 years ago
Andrei Kortunov 0375bedab2 Equip previous item after a bound item expires (bug #2326) 7 years ago
Andrei Kortunov ae87e0d3fc Do not reset mUpperBodyState for weapon->weapon switch (regression #4446) 7 years ago
Marc Zinnschlag 7d9de93fd3 Merged pull request #1477 7 years ago
Andrei Kortunov 6ed2773299 Do not stack return packages 7 years ago
Andrei Kortunov 74a2cbe696 AI: return back after pursuit 7 years ago
Andrei Kortunov 3d0631cfcc Store last AI package in savegame 7 years ago
Andrei Kortunov 3a0ee78d2b AiTravel: store mHidden flag in savegame 7 years ago
Andrei Kortunov 2f5beb8853 Remove unnecessary hack 7 years ago
Andrei Kortunov 57d686131e Remove redundant condition 7 years ago
Andrei Kortunov 5105c67642 Add mHidden field to AiTravel 7 years ago
Andrei Kortunov 81f29d8dcd AiWander: resume moving to destination after combat 7 years ago
Andrei Kortunov 18ff097e4a Add the parameter to AiSequence::stack() to control ability to cancel other AI packages 7 years ago
Andrei Kortunov 9d27eb197f AiWander: return to initial position only after combat 7 years ago
Capostrophic 24c1ee7744 Use relative stat difference for haggling 7 years ago
Capostrophic b7026df551 Improve the offered price formula (Fixes #2222) 7 years ago
Andrei Kortunov fed10e87aa Store integer actor ID in AI packages (bug #4036) 7 years ago
David Cernat 2a3c74bfcc Merge pull request #447 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
Andrei Kortunov 1b9edbe119 Add unequip animation during stance switching (bug #4327) 7 years ago
Marc Zinnschlag 7b4a69ff2f Merged pull request #1728 7 years ago
Marc Zinnschlag 362aa23546 Merged pull request #1724 7 years ago
David Cernat a28b27f5d9 Merge pull request #443 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
Capostrophic c14536a399 Update faction-owned items confiscation 7 years ago
Capostrophic 3810ade67a Don't make unnecessary faction ID searches 7 years ago
Capostrophic 191cc76378 Consider faction ownerships in item stolen checks (fixes #4293) 7 years ago
Andrei Kortunov be394870e4 Fix regressions in spell resistance 7 years ago
Andrei Kortunov 84c8fb9df7 Add pursue package only when crime was reported (bug #4433) 7 years ago
David Cernat 669d4d3d7e
Merge pull request #440 from OpenMW/master
Add OpenMW commits up to 27 May 2018
7 years ago
scrawl cfdf99f601
Revert "Merged pull request #1573"
This reverts commit 7324bd368f, reversing
changes made to 810e4416f6.
7 years ago
scrawl 99ffaafe30
Revert "Merge pull request #1701 from akortunov/standfix"
This reverts commit da47fc79f5, reversing
changes made to 7324bd368f.
7 years ago
Marc Zinnschlag 832b4bb778 Merged pull request #1659 7 years ago
David Cernat 74c2a0b311
Merge pull request #438 from OpenMW/master
Add OpenMW commits up to 24 May 2018
7 years ago
Bret Curtis da47fc79f5
Merge pull request #1701 from akortunov/standfix
Do not apply queue movement for standing actors
7 years ago
Marc Zinnschlag 7324bd368f Merged pull request #1573 7 years ago
Capostrophic ba077e7291 Fix movement fatigue loss encumbrance calculation (fixes #4413) 7 years ago
David Cernat 78234f9071 [General] Rename Event into ObjectList & WorldObject into BaseObject 7 years ago
David Cernat 5458e09c8a
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
7 years ago
Alf Henrik Sauge feeee50a88 Dropping a separate NPDTstruct12 object and instead use NPDTstruct52
NPDTstruct12 is now only used when loading and saving. Turning auto calc
on and off now no longer switches between to different set of values
7 years ago
Andrei Kortunov 3636cf2015 Do not apply queue movement for standing actors 7 years ago
Andrei Kortunov 22fb1f3403 Play spellcasting effects from objects 7 years ago
David Cernat 7db74509e0 Merge pull request #412 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwscript/transformationextensions.cpp
7 years ago
Evgeny Kurnevsky c025b8f8f3
Remove useless comparison. 7 years ago
David Cernat 9e5ddeac50
Merge pull request #408 from OpenMW/master
Add OpenMW commits up to 18 Apr 2018
7 years ago
tri4ng1e d310d36ea3
[Fix] Some PVS-Studio and cppcheck fixes 7 years ago
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.
7 years ago
David Cernat 49e94725aa [Client] Prevent MechanicsManager::playerLoaded() from enabling AI 7 years ago
David Cernat fa652964fd
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
7 years ago
Capostrophic d9acd19dc0
Merge branch 'master' into illusion 7 years ago
scrawl 92d0fb2981
Merge pull request #1667 7 years ago
scrawl 308551ad49
Merge pull request #1644 7 years ago
scrawl cbddb4a0a9
Merge pull request #1638 7 years ago
Capostrophic 77467f17c9
Fix a typo 7 years ago
David Cernat a86c68c5a1 [General] Add sync for ranged weapon & projectile strike enchantments 7 years ago
Andrei Kortunov 27c831959e Handle OnPCHitMe variable (bug #2703) 7 years ago
David Cernat e3c43c6af7 Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/spellcasting.cpp
7 years ago
Capostrophic 4f64ba7b7f Implement sBookSkillMessage GMST 7 years ago
scrawl c6abec1e51
Merge pull request #1641 7 years ago
scrawl c610b8acc8
Merge pull request #1649 7 years ago
scrawl cd9f767e29
Merge pull request #1650 7 years ago
scrawl f36adfec5f
Merge pull request #1657 7 years ago
scrawl 80a8ef6d49
Merge pull request #1661 7 years ago
Capostrophic baaf65bc2c Add vanilla enchanted weaponry behavior option, on by default (fixes #4136) 7 years ago
Capostrophic 2dca389a3b Extend magic resistance/weakness to all effects that can be resisted (fixes #4309) 7 years ago
Capostrophic e6d9bce519 Implement fWerewolfHealth GMST (fixes #4142) 7 years ago
David Cernat ac82124a5d Merge pull request #395 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwmechanics/actors.cpp
7 years ago
Capostrophic 2d119e834a Add vanilla absorb attribute behavior option, on by default (Fixes #4135) 7 years ago
Capostrophic b6a2589e7b Don't apply harmful spell effects on the player in god mode (fixes #4264) 7 years ago
Capostrophic 42b7846f81 Replace a redundant playerAllies check with a boolean (Fixes #4229) 7 years ago
Nelsson Huotari 63e34a5575 Typofix: updateCrimePersuit -> ...Pursuit 7 years ago
scrawl c02920bcd1
Merge pull request #1634
Conflicts:
	apps/openmw/mwworld/worldimp.hpp
7 years ago
scrawl f47429d575
Merge pull request #1635 7 years ago
scrawl ff7f964643
Merge pull request #1636 7 years ago
Andrei Kortunov 53ef345680 Update magic effect particles after building new animation (bug #2254) 7 years ago
Andrei Kortunov a0a30cdbf5 AI: hide torches during bad weather (bug #4334) 7 years ago
Andrei Kortunov bd6c7de579 Do not unequip two-handed weapon when equipping torch 7 years ago
Capostrophic 5b49248d6e
Restrict opening doors to bipedal actors (Fixes #4313) 7 years ago
David Cernat 20caea083a [Client] Use correct count for items in equipment packets
Previously, throwing weapon sync was completely broken for players, as the count for their equipped throwing weapons was never set and – as a result – defaulted to a count of 1 on other clients. As a result, any time a player threw a dart, they would then appear as having switched to hand-to-hand for other players.

Moreover, the count of equipped items was mistakenly based on the total count of items with that refId in the inventory. As a result, if – for example – I equipped 1 Daedric Longsword and had 4 others in my inventory, my DedicatedPlayer on other clients would equip a Daedric Longsword with a count of 5. If I was overencumbered by having that many Daedric Longswords on me and then dropped 4 of them, allowing myself to move again, my DedicatedPlayer would still walk around with 5 Daedric Longswords and lack animations due to still being overencumbered on the other clients.

These problems were less prevalent for actors, but their equipment updating code has also been changed to match that of players.
7 years ago
David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
#	README.md
7 years ago
scrawl 870c658500
Remove missing souls, remove some runaway exceptions (Fixes #4111) 7 years ago
Harald H d3b623b5d3 http to https for supported urls (#1625)
* http to https for supported urls

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http tp https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* http to https

* some url fixes

* http to https
7 years ago
Capostrophic d371bebb33 Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328) 7 years ago
Capostrophic cc0c6ddaa6 Account for empty victimRef (Bug #4328) 7 years ago
Capostrophic 929fc68160
Consider items with dead owner not stolen (fixes bug #4328) 7 years ago
David Cernat 03266d7648 [Client] Prevent guards from arresting players who are currently jailed 7 years ago
David Cernat a7e3261b0b
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
7 years ago
Andrei Kortunov f626a7fcc7 Take in account PC rank during disposition calculation (bug #4322) 7 years ago
David Cernat 66078bfea7 [General] Implement Mark location sync as part of PlayerMiscellaneous 7 years ago
David Cernat 5d4b97645d Merge pull request #374 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/CMakeLists.txt
7 years ago
Andrei Kortunov eccb49da18 Do not summon the bound bow if there is no suitable ammo 7 years ago
Andrei Kortunov b995617559 implement rateAmmo() function 7 years ago
scrawl bba9a8dd91
Don't update off-screen animations
Make flying creatures animate in-place when out of processing range
7 years ago
David Cernat 65d978a3cb
Merge pull request #364 from OpenMW/master
Add OpenMW commits up to 1 Jan 2017
7 years ago
David Cernat bca9c55046 [Client] Reinstate "Merge pull request #1529 from drummyfish/animfix"
This reverts commit 2f4cd6b713 and adds back the changes made by 45993d3da2 because the OpenMW issue at https://bugs.openmw.org/issues/4250 has been fixed by 57257d057f
7 years ago
scrawl 57257d057f
Remove unintended jump cooldown (Fixes #4250) 7 years ago
David Cernat 2f4cd6b713 [Client] Revert "Merge pull request #1529 from drummyfish/animfix"
This reverts commit 45993d3da2, reversing
changes made to 3d347730dc.

That commit made players have to wait around 1.5 seconds after each jump before doing a new one.

It will be reinstated once its accompanying OpenMW issue at https://bugs.openmw.org/issues/4250 is fixed.
7 years ago
David Cernat cac2c6c1e8 Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts 7 years ago
David Cernat ecb0ad0d77 Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
7 years ago
David Cernat 535fba0cb3 [Client] Finish drag and drops when arrested or teleported by server 7 years ago
Andrei Kortunov 0e04a26ef6 Set duration of magic effects from ingredients (bug #4261) 7 years ago
Allofich 7e87ce8787 Prevent combat on/off cycling for calmed actors 7 years ago
Allofich e0c54b3f39 Stop guards trying to arrest player when calm
(Fixes #3863)
7 years ago
David Cernat 047ad40b96 [Client] Clear FortifyAttribute effects when server sets modifier to 0 7 years ago
David Cernat e7f20e7daf Merge pull request #351 from OpenMW/master while resolving conflicts
# Conflicts:
#	CMakeLists.txt
#	README.md
7 years ago
scrawl 47a5229eed
Merge pull request #1564 7 years ago
scrawl 59bfd670c0
Merge pull request #1571 7 years ago
David Cernat 22521578eb
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
7 years ago
Grigorii Latyshev 2abb1a2ec2 Added checkMagicka parameter 7 years ago
Grigorii Latyshev 9fe5a4d236 Revert condition changes 7 years ago
Grigorii Latyshev dab72b45db Move mana reducing code back 7 years ago
Andrei Kortunov b9d9660efd Update music state in the menu mode (bug #3664) 7 years ago
Andrei Kortunov f7f8dfaf2a AiWander: do not allow flying/swimming creatures to use pathgrid 7 years ago
scrawl c50b18b3bb
Move PathgridGraph out of CellStore
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.

This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
7 years ago
scrawl 5fe68ab062
Merge pull request #1419 7 years ago
Grigorii Latyshev ce32462358 Move code to apps/openmw/mwmechanics/spellcasting.cpp, move reduce mana code to CastSpell::cast(const ESM::Spell*) 7 years ago
Andrei Kortunov dea7d0beff Do not interrupt swim and sneak idle animations during attack (bug #4122) 7 years ago
David Cernat 5aff515d3f
Merge pull request #337 from OpenMW/master
Add OpenMW commits up to 15 Nov 2017
7 years ago
scrawl cf40d19d7d
Merge pull request #1551 from thegriglat/abs
Change abs to std::abs
7 years ago
scrawl 60fba7acd8 Fix reorder warning 7 years ago
Grigorii Latyshev 6e4f6c4bd5 Change abs to std::abs 7 years ago
David Cernat 2ba1c84cf7 Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwgui/container.cpp
7 years ago
scrawl a7fd27f413
Merge pull request #1544 from rexelion/archerrangefix
use fProjectileMaxSpeed for ranged weapons distance (fixes #4192)
7 years ago
scrawl 98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
7 years ago
Andrei Kortunov 8c0dcd8b2b Do not track a nearest actor during combat and pursue (bug #4179) 7 years ago
rexelion f0649849b8 changed variable name to be more descriptive 7 years ago
Andrei Kortunov 9943bd4d74 AiWander fast forwarding improvements (bug #3638) 7 years ago
Andrei Kortunov 99517d83ea Bound items detection refactoring 7 years ago
Andrei Kortunov a02124f884 Handle item owners during pickpocketing 7 years ago
rexelion 69a56eaea3 don't initialise rangeAttackOfTarget 7 years ago
David Cernat f2a6957e16 Merge pull request #331 from OpenMW/master while resolving conflicts 7 years ago
rexelion 983c33c4c8 don't use a pointer for ActionWeapon 7 years ago
rexelion cab0002461 Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents 7 years ago
rexelion a1d9f11b04 use fProjectileMaxSpeed for ranged weapons distance 7 years ago
scrawl 801f2d42d5
Merge pull request #1537 from drummyfish/guardfix
Check the real distance to target in AIPursue (issue #4184)
7 years ago
Miloslav Číž f98a821482 fix possible bug in aipursue 7 years ago
scrawl 87c79d7102
Merge pull request #1536 from rexelion/knockoutfix
Wait a few seconds before getting up (fixes #3884)
7 years ago
Miloslav Číž 430d01a39a additional animation refactor 7 years ago
rexelion de7a7d842b mTimeUntilWake is initialised in the constructor 7 years ago
rexelion 48ec680f23 use game time instead of real time 7 years ago
Miloslav Číž f34223fce9 check the real distance to target in aipursue 7 years ago
rexelion ab66034ed1 use uniform_int_distribution instead of rand() 7 years ago