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
6b45a48116
Add OpenMW 0.47 commits up to 1 Jul 2021
...
# Conflicts:
# components/CMakeLists.txt
4 years ago
fa30531461
Merge branch 'positively_glowing' into 'master'
...
Detach objects from the active grid when attempting to get their animation
Closes #6105
See merge request OpenMW/openmw!951
(cherry picked from commit 7d8949ec3fcd1919da59308deab06433136f6629)
692615fd Detach objects from the active grid when attempting to get their animation
4 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
7e188f2dd6
Add OpenMW commits up to 14 Feb 2021
...
# Conflicts:
# apps/openmw/mwclass/door.cpp
# apps/openmw/mwscript/aiextensions.cpp
4 years ago
2e73d2c145
Fallback to default cell name for door destination
4 years ago
c33b2e0100
Merge branch 'dehardcodebaseanim' into 'master'
...
Dehardcode Base_animation and improve Collada support
See merge request OpenMW/openmw!510
4 years ago
7b727e4d70
Revert "Remove physics dependency on basenode"
...
This reverts commit 165c731492
4 years ago
165af1c365
Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell."
...
This reverts commit f031a191b8
4 years ago
83ee1cc582
fix xbase to baseanim
4 years ago
3194520dcd
Move base_anim settings to settings-default.cfg
4 years ago
f031a191b8
Some actors are supposed to spawn on a static object that belong to an adjacent cell.
...
Since actors can be active in 3x3 grid around the player, we need to
first load all statics in a 5x5 grid around the player.
Split load and unloading in 2 phases. Add an mInactiveCells set into the
scene, which contains all cells inside the aforementioned 5x5 grid.
These cells contains only heightfields and physics objects of static
class.
4 years ago
165c731492
Remove physics dependency on basenode
...
Necessary to be able to load physics objects from inactive cells.
4 years ago
da3316daf8
Add OpenMW commits up to 4 Jan 2021
...
# Conflicts:
# CMakeLists.txt
# apps/openmw/main.cpp
# apps/openmw/mwmechanics/npcstats.hpp
# apps/openmw/mwphysics/actor.cpp
# apps/openmw/mwphysics/mtphysics.hpp
# components/CMakeLists.txt
4 years ago
275b9aea4d
rename setting
4 years ago
e62fff5f2e
Add a setting to disable graphical herbalism
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
53f91a3aa5
Merge pull request #3018 from akortunov/emplace
...
Use emplace_back instead of push_back
4 years ago
5a824d0333
components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues
4 years ago
09373a757d
Merge branch 'radioactive' into 'master'
...
Container base record mutations
See merge request OpenMW/openmw!353
(cherry picked from commit 8b33765dd414680f0074b3e115b52b291b4cb7cb)
275908a0 mutate container base records
16fca11d add changelog entry
4 years ago
065ed5138e
Use emplace_back instead of push_back
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
8e647aa72a
Fix crash on saving
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
b85875a354
Ignore Burden effect in god mode
4 years ago
39678c74bf
Add many more godmode checks to harmful magic (bug #5633 )
4 years ago
0eedf8fd9f
Add OpenMW commits up to 30 Sep 2020
...
# Conflicts:
# apps/openmw/mwmechanics/aicombat.cpp
# apps/openmw/mwmechanics/character.cpp
# apps/openmw/mwmechanics/summoning.cpp
# components/CMakeLists.txt
4 years ago
7e3d19196d
Fix #5586
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
ae1af0e103
Merge pull request #2972 from Assumeru/non-unique-additem
...
Mutate base record when calling add/remove item on non-unique actors
4 years ago
82a45eb6ae
Merge pull request #2976 from Capostrophic/unconscious
...
Add option to always allow stealing from KO'd actors (feature #5545 )
4 years ago
9c930e38fa
Add option to always allow stealing from KO'd actors (feature #5545 )
4 years ago
cc6e4ad215
Fix pickpocketing sneaking stance check
4 years ago
040a92c373
implement additem/removeitem for non-unique actors
4 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
2b2f9a8714
Redistribute hits to carried left slot when possible ( #5490 )
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
David Cernat
psi29a
jvoisin
elsid
Evil Eye
Andrei Kortunov
Nelsson Huotari
fredzio
Alexei Dobrohotov
Petr Mikheev