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 |
|
David Cernat
|
fa3baac0f3
|
Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
|
2017-06-18 18:16:10 +03:00 |
|
Allofich
|
028762a7dc
|
Make guards that are attacked try to arrest player
(Fixes #3706)
|
2017-06-15 01:47:10 +09:00 |
|
David Cernat
|
70d9374a6a
|
[General] Implement PlayerKillCount packets
|
2017-06-10 14:04:19 +03:00 |
|
David Cernat
|
48ee8fd536
|
[Client] Send PlayerFaction packets when getting expelled from factions
|
2017-05-24 12:19:11 +03:00 |
|
David Cernat
|
809b4d78ba
|
[Client] Split off DedicatedPlayer and PlayerList into different files
|
2017-04-30 14:57:43 +03:00 |
|
David Cernat
|
10d554af5b
|
[Client] Make NPCs react to DedicatedPlayer & DedicatedActor attacks
|
2017-04-20 17:00:40 +03:00 |
|
David Cernat
|
edb155869b
|
Merge pull request #201 from OpenMW/master
Add OpenMW commits up to 19 Apr 2017
|
2017-04-19 22:12:33 +03:00 |
|
Andrei Kortunov
|
3c4c47d1e6
|
Reduced scope of fHoldBreathTime variable
|
2017-04-19 15:52:15 +04:00 |
|
Andrei Kortunov
|
c3fd327bb2
|
Fixed drowning widget initialization
|
2017-04-19 08:48:16 +04:00 |
|
David Cernat
|
53081a6a6f
|
[Client] Clean up more checks by using PlayerList::isDedicatedPlayer()
|
2017-04-18 12:38:26 +03:00 |
|
David Cernat
|
11a9e3bdb1
|
Merge pull request #197 from OpenMW/master
Add OpenMW commits up to 14 Apr 2017
|
2017-04-14 05:57:28 +03:00 |
|
Andrei Kortunov
|
dc036e96d4
|
fixed magicka calculation on chargen (bug #3694)
|
2017-04-13 18:30:36 +04:00 |
|
David Cernat
|
7647715dac
|
Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
|
2017-03-28 08:05:23 +03:00 |
|
Andrei Kortunov
|
7bd0c74aa8
|
Fixes mWatchedTimeToStartDrowning initialization (fixes bug #3801)
|
2017-03-25 14:15:16 +04:00 |
|
Andrei Kortunov
|
b89fdcfd27
|
Vanilla style drowning widget (partially fixes bug #3801).
|
2017-03-24 09:41:18 +04:00 |
|
David Cernat
|
a2ef39c655
|
Merge pull request #178 from OpenMW/master
Add OpenMW commits up to 2 Mar 2017
|
2017-03-02 22:14:15 +02:00 |
|
Rafael Moura
|
7fa2703715
|
Porting more ContainerStoreIterator usage to const version #3
|
2017-02-28 14:31:51 +00:00 |
|
David Cernat
|
d528a0edb5
|
Merge pull request #147 from OpenMW/master
Add OpenMW commits up to 11 Feb 2017
|
2017-02-11 21:27:51 +02:00 |
|
Allofich
|
e047679595
|
Fix trying to access stats on non-actors
|
2017-02-11 19:59:42 +09:00 |
|
David Cernat
|
6763718412
|
Merge pull request #146 from OpenMW/master while resolving conflicts
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
|
2017-02-10 21:39:16 +02:00 |
|
Allofich
|
5d2090684a
|
Store mHitAttemptActorId in save files
|
2017-02-07 01:26:26 +09:00 |
|
Allofich
|
25c64dbb0f
|
Make combat engagement logic more like vanilla
(Fixes #2678, Fixes #3705)
|
2017-02-07 01:25:12 +09:00 |
|
David Cernat
|
27242cdab9
|
Merge pull request #142 from OpenMW/master
Add OpenMW commits up to 6 Feb 2017
|
2017-02-06 09:13:19 +02:00 |
|
scrawl
|
fe0cf5be05
|
StatsWindow: don't rebuild all skill widgets when one skill changes
|
2017-02-06 02:40:35 +01:00 |
|
David Cernat
|
83277a1512
|
Send spellbook in LocalPlayer CharGen & change UPDATE action name to SET
|
2017-01-20 09:07:07 +02:00 |
|
David Cernat
|
be851f5e1a
|
Send packet with spells gained at character generation
|
2017-01-19 16:56:21 +02:00 |
|
David Cernat
|
fba4878fee
|
Merge pull request #118 from OpenMW/master
Add OpenMW changes up to 27 Dec
|
2016-12-27 03:49:52 +02:00 |
|
NeveHanter
|
8902bb5b13
|
Player now pays for the following actors when travelling, with the exception of the first follower who travels for free, refactored getFollowers to getActorsFollowing/getActorsSidingWith
|
2016-12-20 12:38:51 +01:00 |
|
David Cernat
|
973db7c78a
|
Merge pull request #113 from OpenMW/master
Add OpenMW commits up to 17 Dec
|
2016-12-17 23:27:09 +02:00 |
|
Leon Krieg
|
c7b4b2cdd7
|
Fixed multiple spelling mistakes
|
2016-12-14 16:39:33 +01:00 |
|
David Cernat
|
7bbeed629d
|
Merge pull request #109 from OpenMW/master
Add OpenMW changes up to 25 Nov
|
2016-11-26 01:58:43 +02:00 |
|
scrawl
|
b6d02d9b14
|
Fix order of operations when undoing werewolf transformation of an NPC
|
2016-11-22 16:37:49 +01:00 |
|
David Cernat
|
c6eac31d94
|
Merge pull request #106 from OpenMW/master
Add OpenMW changes up to 20 Nov
|
2016-11-20 01:20:25 +02:00 |
|
MiroslavR
|
8f91732b09
|
Show starting abilities, powers and spells in stat-review window (Fixes #2410)
|
2016-11-19 21:51:19 +01:00 |
|
David Cernat
|
b028f0b51f
|
Merge pull request #104 from OpenMW/master
Add OpenMW commits up to 17 Nov
|
2016-11-17 21:13:58 +02:00 |
|
MiroslavR
|
5e46121046
|
Implement fleeing AI (Closes #1118)
|
2016-11-16 20:15:25 +01:00 |
|
David Cernat
|
06152fde77
|
Stop player-controlled NPCs from reporting crimes committed by players
|
2016-10-31 11:00:56 +02:00 |
|
MiroslavR
|
b65f379b7f
|
Save scripted animation state (Fixes #1931, #2150, #3393)
|
2016-08-03 03:52:35 +02:00 |
|
MiroslavR
|
80f2ae0ca7
|
Apply magic effects while waiting/sleeping
|
2016-07-06 00:20:23 +02:00 |
|
Allofich
|
1602eb3de8
|
Fix so that keepPlayerAlive() will not run twice
|
2016-06-27 21:43:49 +09:00 |
|
Allofich
|
19a20a6871
|
Fix update of fatigue display
|
2016-06-27 21:17:06 +09:00 |
|
Allofich
|
b1be3596dc
|
Cleanup of #include statements
|
2016-06-18 10:56:28 +09:00 |
|
scrawl
|
4acfe1a7e4
|
Move cleanupSummonedCreature to the mechanics manager (Bug #3439)
|
2016-06-12 02:43:33 +02:00 |
|
scrawl
|
f417d7780a
|
Fix the enemy nearby check (Bug #3423)
|
2016-06-07 01:55:34 +02:00 |
|
scrawl
|
79c8f69b24
|
Clear the class selected / race selected flags when starting a new game (Fixes #3326)
|
2016-04-03 20:23:28 +02:00 |
|
scrawl
|
a6e23d03d3
|
Don't clamp disposition twice, clamping is already done inside getDerivedDisposition
|
2016-03-18 00:42:22 +01:00 |
|
scrawl
|
79eb2d20e0
|
Cleanup
|
2016-03-18 00:39:19 +01:00 |
|
scrawl
|
12ec90f9e7
|
Change default argument, fix GetDisposition
|
2016-03-18 00:38:02 +01:00 |
|
ae-g-i-s
|
c9791c5c1a
|
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233)
|
2016-03-08 21:30:28 +01:00 |
|
ae-g-i-s
|
2f1c6c740c
|
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)"
This reverts commit 000597236e.
|
2016-03-08 20:41:39 +01:00 |
|
ae-g-i-s
|
000597236e
|
Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)
|
2016-03-06 18:29:32 +01:00 |
|
scrawl
|
c4d38bb42d
|
Fix clang analyzer warnings
|
2016-02-16 19:17:04 +01:00 |
|
scrawl
|
b0431833a1
|
Fix some defects reported by Coverity CI
|
2016-01-21 16:08:04 +01:00 |
|