David Cernat
|
5458e09c8a
|
Merge pull request #420 from OpenMW/master
Add OpenMW commits up to 11 May 2018
|
2018-05-12 06:32:01 +03:00 |
|
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
|
2018-05-09 00:25:07 +02:00 |
|
David Cernat
|
49e94725aa
|
[Client] Prevent MechanicsManager::playerLoaded() from enabling AI
|
2018-04-12 17:18:06 +03:00 |
|
David Cernat
|
fa652964fd
|
Merge pull request #403 from OpenMW/master
Add OpenMW commits up to 9 Apr 2018
|
2018-04-10 06:43:24 +03:00 |
|
scrawl
|
cbddb4a0a9
|
Merge pull request #1638
|
2018-04-09 20:23:20 +00:00 |
|
Andrei Kortunov
|
27c831959e
|
Handle OnPCHitMe variable (bug #2703)
|
2018-04-03 07:38:19 +04:00 |
|
David Cernat
|
e3c43c6af7
|
Merge pull request #400 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
|
2018-04-03 01:25:17 +03:00 |
|
scrawl
|
f36adfec5f
|
Merge pull request #1657
|
2018-04-02 17:28:12 +00:00 |
|
Capostrophic
|
e6d9bce519
|
Implement fWerewolfHealth GMST (fixes #4142)
|
2018-03-30 19:27:18 +03:00 |
|
David Cernat
|
b7c6261e16
|
Merge pull request #392 from OpenMW/master while resolving conflicts
# Conflicts:
# README.md
|
2018-03-09 21:07:46 +02:00 |
|
Capostrophic
|
d371bebb33
|
Prevent items in a container owned by a dead actor from being counted as stolen (Bug #4328)
|
2018-03-03 15:57:13 +03:00 |
|
Capostrophic
|
cc0c6ddaa6
|
Account for empty victimRef (Bug #4328)
|
2018-03-03 15:57:03 +03:00 |
|
Capostrophic
|
929fc68160
|
Consider items with dead owner not stolen (fixes bug #4328)
|
2018-02-26 23:21:51 +03:00 |
|
David Cernat
|
a7e3261b0b
|
Merge pull request #383 from OpenMW/master
Add OpenMW commits up to 11 Feb 2018
|
2018-02-11 06:57:54 +02:00 |
|
Andrei Kortunov
|
f626a7fcc7
|
Take in account PC rank during disposition calculation (bug #4322)
|
2018-02-10 17:58:30 +04:00 |
|
David Cernat
|
ecb0ad0d77
|
Merge pull request #359 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
|
2017-12-25 02:03:02 +02:00 |
|
Allofich
|
7e87ce8787
|
Prevent combat on/off cycling for calmed actors
|
2017-12-06 01:03:24 +09:00 |
|
David Cernat
|
22521578eb
|
Merge pull request #349 from OpenMW/master
Add OpenMW commits up to 28 Nov 2017
|
2017-11-29 03:52:15 +02:00 |
|
scrawl
|
5fe68ab062
|
Merge pull request #1419
|
2017-11-27 21:13:11 +00:00 |
|
David Cernat
|
2ba1c84cf7
|
Merge pull request #335 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwgui/container.cpp
|
2017-11-12 06:35:15 +02:00 |
|
scrawl
|
98b4f9c596
|
Merge pull request #1549 from akortunov/itemmodels
Item models reworking
|
2017-11-11 22:12:07 +00:00 |
|
Andrei Kortunov
|
9943bd4d74
|
AiWander fast forwarding improvements (bug #3638)
|
2017-11-11 15:31:06 +04:00 |
|
Andrei Kortunov
|
99517d83ea
|
Bound items detection refactoring
|
2017-11-11 11:58:22 +04:00 |
|
Andrei Kortunov
|
a02124f884
|
Handle item owners during pickpocketing
|
2017-11-11 11:58:18 +04:00 |
|
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
|
2017-10-16 07:37:29 +03:00 |
|
Andrei Kortunov
|
8f255a6b72
|
Handle Trespassing crime differently from Theft (bug #4158)
|
2017-10-15 11:03:02 +04:00 |
|
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
|
2017-10-06 04:10:04 +03:00 |
|
Andrei Kortunov
|
1cb7ed5db1
|
Use owned tooltips for items in containers correctly
|
2017-10-04 12:13:45 +04:00 |
|
Andrei Kortunov
|
c5fcb9684e
|
Improve owned crosshair feature behaviour
|
2017-09-30 21:29:02 +04:00 |
|
Andrei Kortunov
|
3ebb18ce18
|
Make unconscious actors do not report about crimes
|
2017-09-30 20:35:29 +04:00 |
|
Andrei Kortunov
|
34895157f9
|
Consider taking items from unconscious NPC as a theft
|
2017-09-30 20:22:26 +04:00 |
|
David Cernat
|
44fb7518ee
|
Merge pull request #300 from OpenMW/master
Add OpenMW commits up to 28 Sep 2017
|
2017-09-28 11:09:14 +03:00 |
|
Andrei Kortunov
|
668a947210
|
Inherit owner, if an item is in container (regression #4128)
|
2017-09-27 20:00:41 +04:00 |
|
David Cernat
|
7f0ea7d01f
|
Merge pull request #294 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwmechanics/character.cpp
|
2017-09-20 16:52:44 +03:00 |
|
Andrei Kortunov
|
65d8e2ff5d
|
Allow to use GetDetected without a reference (bug #3110)
|
2017-09-18 21:46:57 +04:00 |
|
David Cernat
|
b64f379949
|
Merge pull request #286 from OpenMW/master while resolving conflicts
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
|
2017-09-04 18:05:24 +03:00 |
|
Andrei Kortunov
|
a5b01fefec
|
Allow to interrupt an attack, if attack button is held
|
2017-09-01 14:28:21 +04:00 |
|
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
|
2017-08-31 15:14:13 +03:00 |
|
scrawl
|
dc53573de4
|
Merge pull request #1405 from akortunov/stancechangefixes
Do not allow player to change weapon/spell during attack or spellcast
|
2017-08-29 23:11:23 +00:00 |
|
Andrei Kortunov
|
fb45995a41
|
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445)
|
2017-08-29 15:53:23 +04:00 |
|
Andrei Kortunov
|
7c80ddc9de
|
Owned crosshair improvements (bug #2789)
|
2017-08-18 17:08:15 +04:00 |
|
Andrei Kortunov
|
bc7353f100
|
Check animation state for GetPCRunning and GetPCSneaking
|
2017-08-16 20:30:47 +04:00 |
|
scrawl
|
8acf0ba633
|
Merge pull request #1394 from akortunov/followerattackfix
Prevent followers from attacking player if crime was reported
|
2017-08-14 22:19:46 +00:00 |
|
Andrei Kortunov
|
7a5645b35d
|
Prevent followers from attacking player if crime was reported
|
2017-08-14 18:42:19 +04:00 |
|
Andrei Kortunov
|
f84eb68b3d
|
Confiscate an item when you try to sell it to its owner (bug #3944)
|
2017-08-14 11:31:17 +04:00 |
|
scrawl
|
ba72eb77f4
|
Merge pull request #1374 from akortunov/guardfix
Disable AiPursue package for player's followers
|
2017-08-06 21:11:08 +00:00 |
|
Andrei Kortunov
|
72ce118d02
|
Disable AiPursue package for player's followers
|
2017-08-05 12:38:26 +04:00 |
|
David Cernat
|
721b218cc2
|
Merge pull request #258 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# README.md
|
2017-08-05 00:09:34 +03:00 |
|
Andrei Kortunov
|
d1489f5b42
|
Take in account a temporary disposition in isAggressive check (bug #3987)
|
2017-08-03 19:18:31 +04:00 |
|
David Cernat
|
1d504a665f
|
[General] Add RANK, EXPULSION and BOTH actions to PlayerFaction packets
|
2017-07-05 07:06:33 +03:00 |
|