Commit Graph

381 Commits (c++11)

Author SHA1 Message Date
Marc Zinnschlag 91d1bab4ac replaced NULL with nullptr 10 years ago
scrawl a7bd050928 Accurate attack timings in AiCombat 10 years ago
scrawl 741e5db862 Fix for non-bipedal creatures that use weapons, e.g. rieklings 10 years ago
scrawl d07b176b36 Take into account hit recovery, knockdown and other animations for AiCombat attack timing 10 years ago
scrawl a1432b0255 Move attackingOrSpell flag to the CharacterController 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 beb1086260 Fix attackStrength being unset for creatures with no weapons 10 years ago
scrawl 6e5f3339ad Make sure to play IdleSwim when the character is swimming (Bug #2696) 10 years ago
scrawl f017fd6860 Reduce includes in animation.hpp 10 years ago
scrawl 4c09ecef72 Normalize fixes 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl b70383d127 Remove last remains of Ogre math 10 years ago
scrawl 2eec0caca0 Remove dependency on Ogre::StringConverter 10 years ago
scrawl 7bacb9418d Various math code ported to osg 10 years ago
scrawl ccd95419e5 Restore various raycasting 10 years ago
scrawl 71bafcb52b Restore head tracking 10 years ago
scrawl a066b24303 Restore WeaponAnimation 10 years ago
scrawl 988a9cad58 getHitContact Head exception fix 10 years ago
scrawl fd50be0fb8 Restore various gameplay 10 years ago
scrawl af2f26d04d Particle fixes 10 years ago
scrawl f4ee805e3b Object animation fix 10 years ago
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
10 years ago
Rohit Nirmal 396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 10 years ago
scrawl 2235d2978b Restore animation text key handling 10 years ago
scrawl 47758c11cd Readded collision objects and movement physics 10 years ago
scrawl 83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 10 years ago
scrawl 0ff7b2ff11 MechanicsManager, frame update 10 years ago
scrawl a3417a9c49 CharacterController compiles 10 years ago
dteviot 3f28634d1f consolidate random number logic
Note, I suspect Rng::rollClosedProbability() is not needed.  The only difference between it and rollProbability() is that one time in 37k (on Windows), it will give an output of 1.0.
On some versions of Linux, the value of 1.0 will occur about 1 time in 4 billion.
10 years ago
scrawl 3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 10 years ago
dteviot ca8c8c6aa4 fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl bdcc3a4036 Add missing swish sound for thrown weapons 10 years ago
scrawl f35c9b7a69 Clang warning fixes (thanks hemite) 10 years ago
scrawl fafc14d5a0 Add proper air movement mechanics (Fixes #2077) 10 years ago
scrawl 5e7e40aac9 Fix being able to switch weapons while knocked out 10 years ago
scrawl d56906acf7 Fix the creature position glitch 10 years ago
scrawl 70d3bfc6ed Fix idle animation not restarting immediately for creatures 10 years ago
scrawl d26d5f6c26 Fix outdated bone locations when camera view is changed while paralyzed 10 years ago
scrawl d1a29300f0 Handle bipedal creatures not using weapons (Fixes #2238) 10 years ago
scrawl 6c9875969a Stop idle animations for non-biped creatures when attacking/moving
The idle animation wouldn't be visible anyway, since these creatures don't have animation layers. However sounds tagged in the animation would still play.
10 years ago
scrawl 1bd3ab8a2d Fix torch animation playing when torch is hidden (Fixes #2236) 10 years ago
scrawl 8bc7eb5530 PlayGroup: Don't loop animations with no loop keys (Fixes #2223) 10 years ago
scrawl f931ba2efc Fix some static analysis issues (coverity) 10 years ago
scrawl d962f0918d Implement NPC head tracking (Fixes #1720) 10 years ago
scrawl 60aa209144 Implement drowning when knocked out underwater (Fixes #1228) 10 years ago
scrawl d034a079e6 Allow equipping twohanded weapon and shield at the same time (Fixes #1785)
The shield can be equipped, meaning armor rating and item enchantments apply, but can not be blocked with.
10 years ago
scrawl bc85bb32c2 Fix vampirism magic effect not applying immediately (Fixes #1984) 10 years ago
scrawl 3c747195ae Add fall damage for creatures (Fixes #2201) 10 years ago
scrawl 416d549568 Fix animation glitch caused by knockdown
If the player was knocked down while having no weapon, spell nor fists ready, the animation state would incorrectly shift to "weapon equipped" even though no weapon is equipped.
10 years ago