David Cernat
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.cpp
5 years ago
David Cernat
f671c0bddc
Add OpenMW commits up to 1 Apr 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/engine.cpp
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/trainingwindow.cpp
# apps/openmw/mwgui/travelwindow.cpp
# apps/openmw/mwgui/waitdialog.cpp
5 years ago
David Cernat
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
David Cernat
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
David Cernat
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
David Cernat
6fdef4fd0a
Add OpenMW commits up to 1 Jan 2019
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
5 years ago
David Cernat
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
889bcec7f8
Add OpenMW commits up to 1 Sep 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
David Cernat
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
capostrophic
cac05ef826
Sneaking consistency fixes (bug #5103 )
...
Correct pickpocketing behavior when not actually sneaking
Fix first person swimming animation regression when sneaking stance is on
Move typical sneaking use case checks into mechanics manager
Correct awareness checks
5 years ago
capostrophic
ff133bd740
Don't clamp final actor fight rating to 0 (bug #5105 )
...
Fix werewolf aggro distance
6 years ago
Capostrophic
453068cc7d
Disallow actors to start combat with themselves (bug #3550 )
...
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
6 years ago
Capostrophic
9d191055bf
Make offered price caps barter-specific (bug #5028 )
6 years ago
Andrei Kortunov
7214f24f5c
Ignore containers, when we search for owner
6 years ago
Andrei Kortunov
861d41f4a4
Native graphics herbalism support (feature #5010 )
6 years ago
Andrei Kortunov
e534153d00
Use friendly hits only for player's followers (bug #4984 )
6 years ago
Bret Curtis
886c77bced
Merge pull request #2145 from akortunov/rest
...
Update jail state once instead of for every single hour
6 years ago
elsid
d3bdf912a4
Do not scale duration when timescale is zero
6 years ago
Andrei Kortunov
fcdb0c16bf
Update jail state once instead of for every single hour
6 years ago
Andrei Kortunov
3032b177a1
Remove redundant includes
6 years ago
Capostrophic
650cd47255
Fix redundant searchPtr call
6 years ago
Andrei Kortunov
8580a58ba0
Optimize HUD update (do not do unnecessary work)
6 years ago
Capostrophic
624db99bf2
Remove some redundant code
6 years ago
Andrei Kortunov
a53333c3d5
Native animated containers support (feature #4730 )
6 years ago
Capostrophic
6d48d9329e
Avoid making string copies instead of references
6 years ago
Capostrophic
39f8637e95
Simplify some actor loops and avoid some redundant calculations
6 years ago
Andrei Kortunov
06d226a1b7
Minor tweaks for actors processing range setting
6 years ago
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
6 years ago
Marc Zinnschlag
2d87d1d9d2
Merged pull request #1959
6 years ago
Andrei Kortunov
e06f0b797a
Replace all NULLs to nullptr
6 years ago
Capostrophic
09aecb955c
getSkill usage cleanup (bug #4671 )
6 years ago
Andrei Kortunov
8af021d729
Restore dynamic stats for actors in inactive cells (bug #1875 )
6 years ago
Capostrophic
7ef6fa9f61
Remove deprecated GMST get* functions
6 years ago
Bret Curtis
3c827da702
Merge branch 'master' into combat_anims
6 years ago
Marc Zinnschlag
20c53594de
Merged merge request !36
6 years ago
James Carty
4489838ea3
Fix incorrect function call
6 years ago
James Carty
43f1c9163c
Fix issue in which murder wouldn't be reported after paying fine
6 years ago
Andrei Kortunov
16edac8c47
Fix incorrect 'preparing' word spelling
6 years ago
James Carty
6889432030
Move code to seperate functions for reusability
6 years ago
Capostrophic
75bd6e1d28
Make search for allies in actorAttacked recursive
6 years ago
David Cernat
a3b9274365
[Client] Make it possible to check if an item ID belongs to a bound item
6 years ago
David Cernat
6cb5ac6e63
Merge pull request #457 from OpenMW/master while resolving conflicts
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/main.cpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwmechanics/character.cpp
components/CMakeLists.txt
7 years ago
Andrei Kortunov
3d1daaebab
Rework manual spellcasting (e.g. via scripts)
7 years ago
David Cernat
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
Andrei Kortunov
5fd3ec1035
Implement unlockable locks with 'lock 0' console command
7 years ago
Andrei Kortunov
9c3da41130
Add murder bounty when a player follower commits murder (bug #2852 )
7 years ago
Bret Curtis
3e4dc31e39
Merge branch 'master' into fatigue
7 years ago
Andrei Kortunov
74a2cbe696
AI: return back after pursuit
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
b7026df551
Improve the offered price formula ( Fixes #2222 )
7 years ago
David Cernat
2a3c74bfcc
Merge pull request #447 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
Marc Zinnschlag
7b4a69ff2f
Merged pull request #1728
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
84c8fb9df7
Add pursue package only when crime was reported (bug #4433 )
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
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
scrawl
cbddb4a0a9
Merge pull request #1638
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
scrawl
f36adfec5f
Merge pull request #1657
7 years ago
Capostrophic
e6d9bce519
Implement fWerewolfHealth GMST ( fixes #4142 )
7 years ago
David Cernat
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
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
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
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
Allofich
7e87ce8787
Prevent combat on/off cycling for calmed actors
7 years ago
David Cernat
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
7 years ago
scrawl
5fe68ab062
Merge pull request #1419
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
98b4f9c596
Merge pull request #1549 from akortunov/itemmodels
...
Item models reworking
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
David Cernat
e164e6305e
Merge pull request #313 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
Andrei Kortunov
8f255a6b72
Handle Trespassing crime differently from Theft (bug #4158 )
7 years ago
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
7 years ago
Andrei Kortunov
1cb7ed5db1
Use owned tooltips for items in containers correctly
7 years ago
Andrei Kortunov
c5fcb9684e
Improve owned crosshair feature behaviour
7 years ago
Andrei Kortunov
3ebb18ce18
Make unconscious actors do not report about crimes
7 years ago
Andrei Kortunov
34895157f9
Consider taking items from unconscious NPC as a theft
7 years ago
David Cernat
44fb7518ee
Merge pull request #300 from OpenMW/master
...
Add OpenMW commits up to 28 Sep 2017
7 years ago
Andrei Kortunov
668a947210
Inherit owner, if an item is in container (regression #4128 )
7 years ago
David Cernat
7f0ea7d01f
Merge pull request #294 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
7 years ago
Andrei Kortunov
65d8e2ff5d
Allow to use GetDetected without a reference (bug #3110 )
7 years ago
David Cernat
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
Andrei Kortunov
a5b01fefec
Allow to interrupt an attack, if attack button is held
7 years ago
David Cernat
4468e6ec4a
Merge pull request #280 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .gitignore
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
scrawl
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
7 years ago