353e7d530a
Add OpenMW commits up to 18 Aug 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
ed05125f6a
Add OpenMW commits up to 2 Aug 2019
...
# Conflicts:
# apps/openmw/mwmechanics/combat.cpp
5 years ago
8729c3c5e3
Add OpenMW commits up to 9 Mar 2019
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# README.md
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwscript/animationextensions.cpp
# apps/openmw/mwscript/guiextensions.cpp
# apps/openmw/mwscript/miscextensions.cpp
# apps/openmw/mwscript/soundextensions.cpp
5 years ago
95a5607509
Add OpenMW commits up to 22 Feb 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/containerextensions.cpp
5 years ago
3efffe92e3
Add OpenMW commits up to 5 Nov 2018
...
# Conflicts:
# CI/before_install.linux.sh
# CMakeLists.txt
# apps/openmw/mwmechanics/aifollow.cpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwphysics/physicssystem.hpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/CMakeLists.txt
5 years ago
fba07194cf
Add OpenMW commits up to 29 Oct 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
889bcec7f8
Add OpenMW commits up to 1 Sep 2018
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwclass/creature.cpp
# apps/openmw/mwclass/npc.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/difficultyscaling.cpp
# apps/openmw/mwscript/transformationextensions.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
84cab59057
Add OpenMW commits up to 19 Aug 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/main.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwmechanics/actors.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
# apps/openmw/mwworld/cellstore.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/scene.cpp
# apps/openmw/mwworld/worldimp.cpp
# components/misc/debugging.hpp
5 years ago
0339958e21
[General] Rename Log class into TimedLog
5 years ago
f0cef772fa
Refactor weapon types behaviour
...
1. Move weapon types behaviour from switches to the table (should allow
us to de-hardcode weapon types later)
2. Gereralize bones injection to actors skeletons (instead of using the
hardcoded xbase_anim_sh.nif)
5 years ago
453068cc7d
Disallow actors to start combat with themselves (bug #3550 )
...
Allow creatures to play initial attack dialogue
Don't add combat package to dead actors
6 years ago
3032b177a1
Remove redundant includes
6 years ago
b33016d89f
Allow creatures to play Attack voiceover
6 years ago
49d81241db
Merge branch 'master' into pathfinder_detour
6 years ago
bfd7c83c4d
[Client] Fix backwards logic when setting type for AI attacks
6 years ago
ca07e3a364
Check for obstacle before back up (bug #4656 )
6 years ago
31340a212a
Fix functions name style
6 years ago
4d868bec92
Use osg::Vec3f to store path nodes in Pathfinder
6 years ago
e06f0b797a
Replace all NULLs to nullptr
6 years ago
9d2dc96a2e
[Client] Use RANGED type for ranged attacks that haven't hit a target
6 years ago
7ef6fa9f61
Remove deprecated GMST get* functions
6 years ago
15fa47827b
AiCombat: Avoid jittering when aiming in melee
6 years ago
3527f3800e
Use the correct spell projectile speed GMST in AI aiming
6 years ago
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
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
ee45f54b53
Refactor AiTemporaryStorage usage
7 years ago
fed10e87aa
Store integer actor ID in AI packages (bug #4036 )
7 years ago
22521578eb
Merge pull request #349 from OpenMW/master
...
Add OpenMW commits up to 28 Nov 2017
7 years ago
c50b18b3bb
Move PathgridGraph out of CellStore
...
By definition this is not 'Mutable state of a cell' and does not belong in CellStore.
This change should improve startup times (graph is now loaded on demand) and edits to 'pathgrid.hpp' no longer cause the entirety of OpenMW to be rebuilt.
7 years ago
2ba1c84cf7
Merge pull request #335 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwgui/container.cpp
7 years ago
f0649849b8
changed variable name to be more descriptive
7 years ago
69a56eaea3
don't initialise rangeAttackOfTarget
7 years ago
983c33c4c8
don't use a pointer for ActionWeapon
7 years ago
cab0002461
Backing up distance is now dependent on opponents's weapon range; don't back up from ranged oponents
7 years ago
721b218cc2
Merge pull request #258 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
8 years ago
6222c20e82
[Client] Convert MechanicsHelper to namespace
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
62b24eb078
Combat AI: do not use range weapons under water
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
a4165325fa
[Client] Improve synchronization of Actor swings
8 years ago
ce9605957a
[Client] Use different way of preventing attacks on players in dialogue
8 years ago
edb155869b
Merge pull request #201 from OpenMW/master
...
Add OpenMW commits up to 19 Apr 2017
8 years ago
2e8714afaa
[Client] Rethink and restructure tes3mp combat code so it works for NPCs
8 years ago
5a00b239ac
Reduce scope of variables
8 years ago
8752ae9c6a
Fix include
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
e10c4d8814
Stop combat between AI when canFight is false
8 years ago
739cd5ba45
Fixed more spelling mistakes
8 years ago
David Cernat
Andrei Kortunov
Capostrophic
elsid
Capostrophic
scrawl
rexelion
Koncord
Bret Curtis
Ewan Higgs
Allofich
scrawl
Leon Krieg