Commit Graph

136 Commits (00997fa7327293db6075d47d18bd36516537ba44)

Author SHA1 Message Date
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
Bret Curtis 5a824d0333 components/compiler cleanup; also cleaned up related cascading warnings; fixed up final/override issues 4 years ago
Andrei Kortunov 8ca3c3b123 Mark overrided methods by override keyword 4 years ago
David Cernat 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
Assumeru 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
David Cernat 80af0ce6a7 Add OpenMW commits up to 29 Aug 2020
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwmechanics/character.cpp
4 years ago
psi29a 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
David Cernat baa9446cd1 Add OpenMW commits up to 4 Aug 2020 4 years ago
Evil Eye 040a92c373 implement additem/removeitem for non-unique actors 5 years ago
David Cernat 3b2eb6f62c Add OpenMW commits up to 22 Jun 2020
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
5 years ago
elsid 374b85a00d
Add Class methods to get walk, run, swim speed 5 years ago
David Cernat 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
Andrei Kortunov 5468fcb29f Store attributes and skills values as floats (bug #4021) 5 years ago
Evil Eye 4d7947d27c Mutate base records when editing AI settings (#2798) 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 718dbd3f9a Use object ID as the substitution for their name (bug #5158) 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 ec1311fcb7 [Client] Make it possible to check whether a class has a ContainerStore 7 years ago
Bret Curtis d785344fad purge all instances of <boost/shared_ptr.hpp>, clean up unused headers 8 years ago
MiroslavR f323f231db Allow activating actors without a name (Fixes #3551) 8 years ago
Allofich 34851349de Pass hitPosition by const reference 8 years ago
Allofich bce0166931 Don't play blood effects for resisted hits 8 years ago
scrawl effe022bb2 Move preload model list to MWClass, preload NPC head/hair 9 years ago
scrawl 32d5dece58 Add count argument to getToolTipInfo 9 years ago
scrawl b0894ea20d Accept a ConstPtr in hasToolTip 9 years ago
scrawl 04f7a8f8eb Remove redundant getId function 9 years ago
scrawl 303521002d Accept a ConstPtr in adjustScale 9 years ago
scrawl 09bdb0ad4b Accept a ConstPtr in getServices 9 years ago
scrawl 3c98f8dde3 Accept a ConstPtr in isPersistent 9 years ago
scrawl 3fe3091275 Accept a ConstPtr in isEssential 9 years ago
scrawl 4a47fc32fa Accept a ConstPtr in getBloodTexture 9 years ago
scrawl 2bd8d60e9f Accept a ConstPtr in getPrimaryFaction, getPrimaryFactionRank 9 years ago
scrawl 2ac92012e8 Accept a ConstPtr in isClass 9 years ago
scrawl 5b082be79f Accept a ConstPtr in getBaseGold 9 years ago
scrawl da7ebfde99 Accept a ConstPtr in copyToCell 9 years ago
scrawl b09bdd6af5 Accept a ConstPtr in isBipedal 9 years ago
scrawl 92a3acfa56 Accept a ConstPtr in getBaseFightRating 9 years ago
scrawl f258c5c508 Accept a ConstPtr in getModel 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 b48445dea7 Accept a ConstPtr in getScript 9 years ago
scrawl bd9dc58560 Use the correct scale for actor swim height (Fixes #2833) 9 years ago
dteviot 541d7fb4fb Fixed assorted issues
* destructor is virtual
* renamed class to Actor
* corrected indentation of case statement
10 years ago
dteviot bb54bbd273 Pulled duplicated functions into common base class 10 years ago
scrawl 7f66339790 Remove a redundant function 10 years ago
scrawl 882e359008 Move attackStrength to the CharacterController, where it should have been to begin with
Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage.
10 years ago
scrawl 7bacb9418d Various math code ported to osg 10 years ago
scrawl 375b736e74 Use SDL to create the window
No input nor event loop handling yet, so the window will "stop responding" after a few seconds.

Thanks to KittyCat for the GraphicsWindowSDL2 code.
10 years ago
scrawl c31b416ba1 Move physicssystem to a new mwphysics module 10 years ago
scrawl 9f12e53956 Scale NPCs by their Weight property (Fixes #814) 10 years ago