Commit Graph

40 Commits (master)

Author SHA1 Message Date
David Cernat 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
elsid bd33fa76b6
Use CRTP to define CustomData clone function 4 years ago
elsid 045bb7cbd7
Store CustomData and ContainerStore as unique_ptr 4 years ago
David Cernat 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
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
David Cernat 25a632c650 Add OpenMW commits up to 13 Apr 2020
# Conflicts:
#	CMakeLists.txt
#	README.md
#	apps/openmw/engine.cpp
#	apps/openmw/mwclass/creaturelevlist.cpp
#	apps/openmw/mwgui/quickkeysmenu.cpp
5 years ago
Capostrophic 07779d7fcf Properly utilize creature levelled list's scale (bug #5369) 5 years ago
David Cernat 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
Andrei Kortunov dea2018d9f Do not use dynamic casts when using ObjectState 5 years ago
David Cernat 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
Capostrophic 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
David Cernat 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
Capostrophic 7ef6fa9f61 Remove deprecated GMST get* functions 6 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
Ewan Higgs 38a2de3c51 convert std::autor_ptr to std::unique_ptr, originally by Ewan Higgs and updated by Bret Curtis 8 years ago
David Cernat 34f0a5e076 [Client] Disable leveled creatures from their class instead of scene.cpp 8 years ago
Allofich 125e94ef0e Fix shadowing warnings 8 years ago
scrawl 11f00e3aa9 Rename safePlaceObject to placeObject 9 years ago
scrawl c3ef387208 Vanilla-compatible creature/NPC respawning (Fixes #2369, Fixes #2467) 9 years ago
scrawl c5d3e6c993 Disable preloading of levelled lists 9 years ago
scrawl f6f9eff9a6 Preload levelled creatures 9 years ago
scrawl 0d4729dcd5 Use the const version of CustomData::as* 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl d9bbd83b09 Accept a ConstPtr in getToolTipInfo
Accept a ConstPtr in functions used by getToolTipInfo
9 years ago
scrawl ed3486e816 Improve const-correctness in writeAdditionalState 9 years ago
scrawl eb51e2838f Utilize the mHasCustomData flag in writeAdditionalState 9 years ago
scrawl cd4a1ffd16 Fast version of dynamic_cast for MWClass 9 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
10 years ago
scrawl dfaab1188f Fix for broken levelled creature spawning (Fixes #2365) 10 years ago
scrawl c05874e1ff Reset CreatureLevList spawning flag if levelled list returned no creature 10 years ago
Marc Zinnschlag 4fb897f2f8 added missing getId functions to classes derived from MWWorld::Class 11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
scrawl ae66d28c87 Feature #32: Implement respawn for containers, creatures and NPCs 11 years ago
scrawl 471bbd0021 Savegame: store levelled creature state and move to actorIds
(Closes #1332)
11 years ago
scrawl c8c0e5de38 Fixed code issues found with unity build. Missing include guards, duplicated functions, ... 11 years ago
scrawl 12de0afb03 Feature #50: Spawn projectiles
Fix a bug in copyObjectToCell.
Make actor rotations more consistent.
11 years ago
scrawl 9653355cf1 Feature #701: Spawn levelled creatures in cells 11 years ago
Marc Zinnschlag 239498bcd4 added getName function 15 years ago
Marc Zinnschlag f50ced4616 added missing record classes 15 years ago