2a3d6ea7f0
[Client] Don't process hits on non-actors after sending ObjectHit packet
...
This prevents errors about the non-actors not having CreatureStats.
3 years ago
7a6dfc61ec
Add OpenMW commits up to 21 May 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwscript/interpretercontext.cpp
# components/CMakeLists.txt
4 years ago
a3f304107b
Add OpenMW commits up to 2 May 2021
...
# Conflicts:
# components/CMakeLists.txt
4 years ago
04edb1c817
Trim down some internal includes
4 years ago
e1d955d92b
Remove noexcept specifier from CreatureCustomData move ctor
...
C++17 doesn't allow to declare defaulted move ctor with not matching
exception specification to the calculated one:
/Users/eddie/Downloads/BUILD/openmw-master/apps/openmw/mwclass/creature.cpp:63:9: error:
exception specification of explicitly defaulted move constructor does not
match the calculated one
CreatureCustomData(CreatureCustomData&& other) noexcept = default;
^
http://wg21.link/p1286r2 makes this possible in C++20 and newer compilers
already have it working even with -std=c++17 but older onces give an error.
4 years ago
cedf70f367
Add OpenMW commits up to 13 Apr 2021
...
# Conflicts:
# .travis.yml
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/summoning.cpp
# apps/openmw/mwphysics/mtphysics.hpp
4 years ago
bd33fa76b6
Use CRTP to define CustomData clone function
4 years ago
045bb7cbd7
Store CustomData and ContainerStore as unique_ptr
4 years ago
4620adc662
Add OpenMW commits up to 30 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwphysics/actor.cpp
4 years ago
8084a336b5
Replace zeroes and nulls by nullptrs
4 years ago
7f435ceeac
Add OpenMW commits up to 1 Nov 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwclass/container.hpp
# apps/openmw/mwclass/creature.hpp
# apps/openmw/mwclass/npc.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwdialogue/journalimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/dialogue.hpp
# apps/openmw/mwgui/mainmenu.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
# apps/openmw/mwscript/containerextensions.cpp
# apps/openmw/mwscript/interpretercontext.hpp
# components/CMakeLists.txt
4 years ago
8ca3c3b123
Mark overrided methods by override keyword
4 years ago
68837aaf4a
Add OpenMW commits up to 15 Oct 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/mwgui/containeritemmodel.cpp
# apps/openmw/mwgui/tradewindow.cpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwworld/actionteleport.cpp
# apps/openmw/mwworld/containerstore.cpp
4 years ago
72549651e0
Rework container resolution ( #3006 )
...
* Rework container resolution
* add optional argument to getCount
* remove now-redundant changes
* undo worldimp changes
* move save-fixing code to InventoryState
* replace Rng instances with Seeds
4 years ago
80af0ce6a7
Add OpenMW commits up to 29 Aug 2020
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/character.cpp
4 years ago
f90a049702
Merge branch 'movement_refactoring' into 'master'
...
Refactoring related to "smooth movement"
See merge request OpenMW/openmw!285
(cherry picked from commit 6eaf0a389d5aed3b74ab1a7cf89574612f964bdf)
e847b4c8 Split getSpeed() to getMaxSpeed() and getCurrentSpeed()
a96c46bc Refactor calculation of movement.mSpeedFactor
03ee9090 Use getMaxSpeed instead of getCurrentSpeed where it makes sense.
a178af5c Create helper functions `normalizeAngle` and `rotateVec2f`
4 years ago
baa9446cd1
Add OpenMW commits up to 4 Aug 2020
4 years ago
6ad20ec9c7
Mutate base records when adding/removing spells
4 years ago
040a92c373
implement additem/removeitem for non-unique actors
5 years ago
5eb7eb8d88
Add OpenMW commits up to 4 Jul 2020
...
# Conflicts:
# .travis.yml
# CI/before_script.linux.sh
# apps/openmw/engine.cpp
# apps/openmw/mwbase/windowmanager.hpp
# apps/openmw/mwgui/charactercreation.cpp
# apps/openmw/mwgui/windowmanagerimp.hpp
# apps/openmw/mwmechanics/character.cpp
5 years ago
3b2eb6f62c
Add OpenMW commits up to 22 Jun 2020
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
5 years ago
b4c699348f
Improved strafe movement
5 years ago
374b85a00d
Add Class methods to get walk, run, swim speed
5 years ago
a35497de0c
Remove redundant runSpeed as always equal to walkSpeed
5 years ago
e5b1843089
Add OpenMW commits up to 11 Jun 2020
...
# Conflicts:
# apps/openmw/mwbase/world.hpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwmechanics/activespells.cpp
# apps/openmw/mwmechanics/aiactivate.cpp
# apps/openmw/mwmechanics/aiactivate.hpp
# apps/openmw/mwmechanics/creaturestats.cpp
# apps/openmw/mwscript/aiextensions.cpp
# apps/openmw/mwscript/statsextensions.cpp
# apps/openmw/mwworld/worldimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
6bc04507ef
Merge pull request #2715 from akortunov/cleanup
...
Remove custom data for disposed actors
5 years ago
5468fcb29f
Store attributes and skills values as floats (bug #4021 )
5 years ago
4d7947d27c
Mutate base records when editing AI settings ( #2798 )
5 years ago
7bc3298ed4
Add OpenMW commits up to 1 Apr 2020
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# apps/openmw/mwphysics/physicssystem.cpp
5 years ago
dea2018d9f
Do not use dynamic casts when using ObjectState
5 years ago
ae65b0228a
Do not write custom data for disposed actors
5 years ago
bc093c8596
[General] Implement OnObjectHit packet, part 2
...
ObjectHit is now also sent when local actors succeed or fail in hitting other actors with melee attacks, with the packet including the success state of their attack.
It is also sent when creatures hit a non-actor object.
5 years ago
c4950f1beb
[Client] Implement PlayerTeam packet, part 2
...
When determining actors siding with someone, also check the team members of DedicatedPlayers, not just those of the LocalPlayer.
Don't set players as each other's hitAttemptActor if they are team members.
Don't run startCombat() for DedicatedPlayers who get attacked.
5 years ago
5762a36fc2
Add OpenMW commits up to 7 Nov 2019
...
# Conflicts:
# apps/openmw/mwmechanics/aifollow.hpp
5 years ago
61ab7f3c1e
Implement actors movement deceleration (feature #4544 )
5 years ago
cc25612b8d
Add OpenMW commits up to 18 Sep 2019
...
# Conflicts:
# apps/openmw/mwclass/container.cpp
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwmechanics/security.cpp
# apps/openmw/mwmechanics/spellcasting.cpp
# apps/openmw/mwscript/miscextensions.cpp
5 years ago
649a14dfae
Merge branch 'master' into activation
5 years ago
480000da07
Use Open action as fallback for companion activation (bug #5161 )
5 years ago
718dbd3f9a
Use object ID as the substitution for their name (bug #5158 )
5 years ago
6b74630f6e
Preparation work
...
Phase out canBeActivated() to unify activation checks
Use getName() for the name caption in tooltips
Always use tooltips for non-activator objects
Invert hasTooltip default value
5 years ago
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
b57c0bcafe
Add OpenMW commits up to 6 June 2019
...
# Conflicts:
# apps/openmw/mwgui/hud.cpp
# apps/openmw/mwgui/jailscreen.cpp
# apps/openmw/mwgui/waitdialog.cpp
# apps/openmw/mwinput/inputmanagerimp.cpp
# apps/openmw/mwworld/worldimp.hpp
5 years ago
5181c601c0
Add OpenMW commits up to 2 May 2019
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwscript/statsextensions.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
6205ff6b04
Add OpenMW commits up to 30 Jan 2019
...
# Conflicts:
# apps/openmw/mwworld/worldimp.cpp
5 years ago
cbba81df03
Add OpenMW commits up to 14 Nov 2018
...
# Conflicts:
# .travis.yml
# CI/before_install.linux.sh
# CI/before_script.linux.sh
# CMakeLists.txt
# apps/openmw/CMakeLists.txt
# apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
# apps/openmw/mwworld/containerstore.cpp
# apps/openmw/mwworld/inventorystore.cpp
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
David Cernat
jvoisin
elsid
Andrei Kortunov
Assumeru
psi29a
Petr Mikheev
Capostrophic