ac82124a5d
Merge pull request #395 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/actors.cpp
7 years ago
c02920bcd1
Merge pull request #1634
...
Conflicts:
apps/openmw/mwworld/worldimp.hpp
7 years ago
bd6c7de579
Do not unequip two-handed weapon when equipping torch
7 years ago
b7c6261e16
Merge pull request #392 from OpenMW/master while resolving conflicts
...
# Conflicts:
# README.md
7 years ago
870c658500
Remove missing souls, remove some runaway exceptions ( Fixes #4111 )
7 years ago
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
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
744859f327
Take in account armor condition in the armor rating calculation (bug #4246 )
7 years ago
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
b8fd530ee1
Do not speak with unconscious creatures
7 years ago
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
7 years ago
960b91a53c
Merge pull request #290 from OpenMW/master
...
Add OpenMW commits up to 17 Sep 2017
7 years ago
780e82480d
Make the PlayMode and PlayType enums scoped
...
Also shorten them by putting them in the MWSound namespace
7 years ago
b64f379949
Merge pull request #286 from OpenMW/master while resolving conflicts
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/actors.hpp
7 years ago
0d7279ea2a
Fixes a regression with bound weapons equipping (bug #4050 )
7 years ago
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
6f22d819c5
Do not allow to switch weapon to probe or lockpick during attack
7 years ago
dc53573de4
Merge pull request #1405 from akortunov/stancechangefixes
...
Do not allow player to change weapon/spell during attack or spellcast
7 years ago
fb45995a41
Do not allow player to change weapon/spell during attack or spellcasting (bug #2445 )
7 years ago
2611377081
Merge pull request #1350 from akortunov/deathanimationfix
...
Do not allow to loot fighting actors during death animation (bug #3528 )
7 years ago
7c80ddc9de
Owned crosshair improvements (bug #2789 )
7 years ago
3f159960b7
Restored pickpocket and werewolf check
7 years ago
dd919b9f2c
Do not allow to loot fighting actors during death animation (bug #3528 )
8 years ago
6222c20e82
[Client] Convert MechanicsHelper to namespace
8 years ago
c6aee3b780
[Client] Fix build by changing boost::shared_ptr into std::shared_ptr
8 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
dd3f612e88
Merge pull request #1316 from akortunov/doorfix
...
Doors usage improvements
8 years ago
cab51d26cc
Doors: small key search optimizations
8 years ago
d48b829b45
replace and purge boost::lexical_cast
8 years ago
d785344fad
purge all instances of <boost/shared_ptr.hpp>, clean up unused headers
8 years ago
38a2de3c51
convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis
8 years ago
1c6e359fe9
[Client] Set and clear hitAttemptActorId for DedicatedPlayers
...
This allows a DedicatedPlayer's follower NPCs to target enemies attacking the DedicatedPlayer.
8 years ago
20a72ec807
[Client] Send ObjectTrap packets when disarming traps with keys & probes
8 years ago
b1264cca92
[Client] Send ObjectLock whenever using spells or keys to unlock objects
8 years ago
34f0a5e076
[Client] Disable leveled creatures from their class instead of scene.cpp
8 years ago
4d81455020
[General] Rework and simplify death reasons so they work with NPCs
8 years ago
809b4d78ba
[Client] Split off DedicatedPlayer and PlayerList into different files
8 years ago
ea7c3f2dc7
[Client] Make tes3mp combat code work with Creatures, not just NPCs
8 years ago
2e8714afaa
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
8 years ago
014ff7a059
[Client] Replace usage of Networking::isDedicatedPlayer()
8 years ago
07c2d4251e
[Client] Add and use mwmp::PlayerList::isDedicatedPlayer()
8 years ago
0aaf68c994
[Client] Rename mwmp::Players into mwmp::PlayerList for clarity
8 years ago
a650683bae
[General] Add and use Target struct in mwmp::Attack
8 years ago
9882ceedf3
[General] Remove attackerGuid from mwmp::Attack because it is redundant
8 years ago
caf5428532
[General] Rename mwmp::Attack vars in preparation for Actor support
8 years ago
2565816b22
[Client] Delimit and clarify combat changes made by tes3mp
...
Additionally, revert unneeded small changes to the formatting of OpenMW code
8 years ago
678edffb5a
[Client] Rename updateDynamicStats() into updateStatsDynamic()
8 years ago
bf17464074
Merge pull request #198 from OpenMW/master
...
Add OpenMW commits up to 14 Apr 2017
8 years ago
f63b1e81cd
Merge pull request #1228 from akortunov/master
...
Options to show hidden weapon parameters
8 years ago
c6cd0a2953
Merge pull request #196 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwmechanics/spellcasting.cpp
8 years ago
506cc47c9d
Add option to show reach and attack speed for melee weapons
8 years ago
14b59e0e4b
Vanilla-like tgm ( fixes #3798 )
8 years ago
c10dd1b002
Merge pull request #188 from OpenMW/master
...
Add OpenMW commits up to 24 Mar 2017
8 years ago
5282556ae0
Show names on combat actors when RMB GUI is active
...
Fixes (#3797 )
8 years ago
1286754fb3
Add a new option to show arrow damage (feature #2923 )
8 years ago
a2ef39c655
Merge pull request #178 from OpenMW/master
...
Add OpenMW commits up to 2 Mar 2017
8 years ago
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
8 years ago
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
8 years ago
05cc69f6f1
Porting more ContainerStoreIterator usage to const version
8 years ago
a1988ac6ef
Merge pull request #161 from OpenMW/master
...
Add OpenMW commits up to 21 Feb 2017
8 years ago
22482b7eec
Don't use xmesh.nif over mesh.nif for classes that don't make use of the separated keyframes
8 years ago
9963601484
Porting code to ConstContainerStoreIterator #1
8 years ago
ecbde7b11e
Added ConstContainerStoreIterator
...
using base template for ContainerStoreIterators
less template arguments for ContainerStoreIteratorBase
8 years ago
0d75264221
Merge pull request #155 from OpenMW/master
...
Add OpenMW commits up to 17 Feb 2017, part 2
8 years ago
f883951d75
Fix incorrect calculation of armor rating (Bug #3754 )
8 years ago
a5d7c5fd39
Merge pull request #148 from OpenMW/master
...
Add OpenMW commits up to 13 Feb 2017
8 years ago
6b53541571
Prevent AI actors from hitting unintended targets
...
(Fixes #3254 )
8 years ago
d528a0edb5
Merge pull request #147 from OpenMW/master
...
Add OpenMW commits up to 11 Feb 2017
8 years ago
e047679595
Fix trying to access stats on non-actors
8 years ago
6763718412
Merge pull request #146 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/actors.cpp
8 years ago
5d2090684a
Store mHitAttemptActorId in save files
8 years ago
25c64dbb0f
Make combat engagement logic more like vanilla
...
(Fixes #2678 , Fixes #3705 )
8 years ago
2158e94a96
[Client] Fix setting of attack parameters after recent changes
8 years ago
63c8a98083
[General] Stop using virtual functions in BasePlayer
8 years ago
dfb87e9e0d
Merge pull request #124 from OpenMW/master
...
Add OpenMW commits up to 11 Jan
8 years ago
f1f9209814
Creatures now auto-equip shields ( Fixes #3704 )
8 years ago
973db7c78a
Merge pull request #113 from OpenMW/master
...
Add OpenMW commits up to 17 Dec
8 years ago
536715cf46
Cleanup tes3mp headers
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
3a733eb122
Make tes3mp includes consistent
8 years ago
fa9d6e810e
Use lowerCamelCase in tes3mp client function names like OpenMW does
8 years ago
799842b5da
Reduce using of the CPU
8 years ago
56959ebfda
Implement magic
8 years ago
cd798d5f23
Merge pull request #89 from OpenMW/master
...
Add OpenMW commits up to 30 Oct
8 years ago
125e94ef0e
Fix shadowing warnings
8 years ago
e27d1857ef
Fix formatting in previous changes made by tes3mp to OpenMW's core
8 years ago
6eae017561
Merge pull request #74 from OpenMW/master
...
Add OpenMW commits up to 5 Oct
8 years ago
506d0e8e54
Correction to display of 0-weight tooltips
8 years ago
160da0b149
Treat 0-weight armor as light armor in some respects
8 years ago
728a09e423
Reorder functions in LocalPlayer and make their names more consistent
8 years ago
ce4b326b02
Rename ID_GAME_UPDATE_BASESTATS into ID_GAME_DYNAMICSTATS_CURRENT
8 years ago
7e4543ffcb
Merge pull request #64 from OpenMW/master
...
Add OpenMW commits up to 24 Sep
8 years ago
52e00f5fef
Do not show uncarriable lights in item views
8 years ago
cdada00a8a
Merge pull request #56 from OpenMW/master
...
Add OpenMW commits up to 15 Sep
8 years ago
f323f231db
Allow activating actors without a name ( Fixes #3551 )
8 years ago
3b7693c719
Resolve conflicts in pull request #55
...
# Conflicts:
# README.md
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwmechanics/combat.cpp
8 years ago
34851349de
Pass hitPosition by const reference
8 years ago
bce0166931
Don't play blood effects for resisted hits
8 years ago
4d2ca20445
Resolve conflicts in pull request #43
...
# Conflicts:
# README.md
8 years ago
7db31ab58a
Correct telekinesis glow length
8 years ago
David Cernat
scrawl
Andrei Kortunov
Harald H
Chris Robinson
Koncord
scrawl
Bret Curtis
Ewan Higgs
Allofich
Rafael Moura
MiroslavR
Koncord
Leon Krieg