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 |