David Cernat
74c2a0b311
Merge pull request #438 from OpenMW/master
...
Add OpenMW commits up to 24 May 2018
2018-05-24 12:16:11 +03:00
Capostrophic
1c9fba9a8c
Fix jumping encumbrance calculation
2018-05-13 17:18:45 +03:00
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
a86c68c5a1
[General] Add sync for ranged weapon & projectile strike enchantments
2018-04-03 14:12:27 +03:00
David Cernat
3f8d94b030
[General] Synchronize strike enchantments in combat
2018-04-03 10:27:02 +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
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
2018-03-08 21:23:24 +01: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
Andrei Kortunov
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
2017-12-07 22:43:32 +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
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02: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
Andrei Kortunov
3f159960b7
Restored pickpocket and werewolf check
2017-08-12 21:18:05 +04:00
Andrei Kortunov
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
2017-08-07 09:55:50 +04:00
Koncord
6222c20e82
[Client] Convert MechanicsHelper to namespace
2017-06-27 16:43:53 +08:00
David Cernat
c6aee3b780
[Client] Fix build by changing boost::shared_ptr into std::shared_ptr
2017-06-18 19:36:06 +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
Bret Curtis
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
2017-06-09 19:08:53 +02:00
Ewan Higgs
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
2017-06-09 16:49:25 +02:00
David Cernat
1c6e359fe9
[Client] Set and clear hitAttemptActorId for DedicatedPlayers
...
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
2017-05-30 08:20:45 +03:00
David Cernat
4d81455020
[General] Rework and simplify death reasons so they work with NPCs
2017-05-05 22:16:31 +03:00
David Cernat
809b4d78ba
[Client] Split off DedicatedPlayer and PlayerList into different files
2017-04-30 14:57:43 +03:00
David Cernat
2e8714afaa
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
2017-04-19 22:06:04 +03:00
David Cernat
014ff7a059
[Client] Replace usage of Networking::isDedicatedPlayer()
2017-04-18 18:07:39 +03:00
David Cernat
07c2d4251e
[Client] Add and use mwmp::PlayerList::isDedicatedPlayer()
2017-04-17 20:36:20 +03:00
David Cernat
0aaf68c994
[Client] Rename mwmp::Players into mwmp::PlayerList for clarity
2017-04-17 19:10:33 +03:00
David Cernat
a650683bae
[General] Add and use Target struct in mwmp::Attack
2017-04-17 18:31:39 +03:00
David Cernat
9882ceedf3
[General] Remove attackerGuid from mwmp::Attack because it is redundant
2017-04-17 18:03:33 +03:00
David Cernat
caf5428532
[General] Rename mwmp::Attack vars in preparation for Actor support
2017-04-17 17:24:11 +03:00
David Cernat
2565816b22
[Client] Delimit and clarify combat changes made by tes3mp
...
Additionally, revert unneeded small changes to the formatting of OpenMW code
2017-04-17 11:55:22 +03:00
David Cernat
678edffb5a
[Client] Rename updateDynamicStats() into updateStatsDynamic()
2017-04-16 14:11:55 +03:00
David Cernat
c6cd0a2953
Merge pull request #196 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
2017-04-13 07:07:49 +03:00
Andrei Kortunov
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
2017-03-25 22:40:11 +04:00
David Cernat
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
2017-03-24 07:24:55 +02:00
Allofich
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
2017-03-22 20:04:29 +09: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
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
David Cernat
0d75264221
Merge pull request #155 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017, part 2
2017-02-17 23:19:30 +02:00
MiroslavR
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
2017-02-17 03:11:37 +01:00
David Cernat
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
2017-02-13 21:29:51 +02:00
Allofich
6b53541571
Prevent AI actors from hitting unintended targets
...
(Fixes #3254 )
2017-02-12 19:51:19 +09: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
2158e94a96
[Client] Fix setting of attack parameters after recent changes
2017-01-25 18:04:20 +02:00
David Cernat
63c8a98083
[General] Stop using virtual functions in BasePlayer
2017-01-25 17:06:15 +02:00
