mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 13:19:54 +00:00
Code Issues Releases Wiki Activity
19996 commits 38 branches 54 tags 122 MiB
Commit graph

543 commits

Author SHA1 Message Date
Allofich
f36e5ef403 Use last effect of spell for hand effect color 2016-09-04 17:42:27 +09:00
Allofich
154dcc942c Let NPCs use attack type regardless of movement 2016-09-01 22:43:33 +09:00
Allofich
9e1bfde46f Add comment 2016-08-26 02:42:56 +09:00
Allofich
67bd882bc7 Disable current idle when an action is taken 2016-08-25 23:42:09 +09:00
Allofich
6190ff1f0d Update idle if current idle finishes playing 2016-08-25 21:45:56 +09:00
Allofich
f4cc5d0399 Sometimes play 1st-person weapon idle to Stop key 2016-08-25 21:34:45 +09:00
Allofich
9b0e5d6b59 Loop mid-animation idles when loading a save game 2016-08-23 19:50:56 +09:00
scrawl
b0dc625b18 Run setLoopingEnabled after the anim queue is updated 2016-08-22 23:33:24 +02:00
scrawl
719e884b7c Remove duplicate code 2016-08-22 23:25:00 +02:00
scrawl
6450c9be27 Simplify condition 2016-08-22 23:22:58 +02:00
Allofich
bf9dc45b2b Emulate vanilla animation loops more closely 2016-08-23 01:42:36 +09:00
Allofich
b332a13b4e Don't restart looped animations on repeated calls 2016-08-18 23:23:38 +09:00
Allofich
c05782581e Account for all instances of play() 2016-08-16 02:52:55 +09:00
Allofich
6163c7bb03 Use loopfallback for idle animation groups 2016-08-16 01:15:26 +09:00
Allofich
e132b52a69 Handle spell glows within updatecallback 2016-08-09 22:56:53 +09:00
Allofich
3841a8fb40 Make non-actors glow when they cast spells 2016-08-09 22:56:53 +09:00
Allofich
dca7b4beb7 Make non-actors also play spell casting sounds 2016-08-09 22:56:53 +09:00
MiroslavR
b65f379b7f Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
Allofich
cabe038a97 Make lockpick and probe sounds 3d positional 2016-07-10 22:08:42 +09:00
MiroslavR
75a66ced20 Fix actors lacking turning animations while in first person mode 2016-07-10 01:48:54 +02:00
Allofich
b1be3596dc Cleanup of #include statements 2016-06-18 10:56:28 +09:00
scrawl
693d3cea4a Float to surface fix 2016-06-15 19:38:04 +02:00
scrawl
b5cb11ff07 Split refreshCurrentAnims into multiple functions 2016-06-15 03:14:44 +02:00
scrawl
a825882c6b Process death events at the end of the death animation (Fixes #1873) 2016-06-12 00:04:50 +02:00
scrawl
0efbdb25ee Improve const-correctness in Animation 2016-05-19 22:30:14 +02:00
scrawl
3749821809 Choose a random death animation for actors that start the game as dead (Fixes #3397) 2016-05-19 21:40:05 +02:00
scrawl
e71aa53574 Don't allow playing a sound/soundgen key more than once at the same time on the same object (Fixes #2689) 2016-03-24 19:26:12 +01:00
scrawl
b332704df7 Switch hand-to-hand attack types randomly when "always use best attack" is turned on (Fixes #3259) 2016-03-19 18:03:59 +01:00
scrawl
90a99991d1 Use empty() instead of !size() 2016-02-22 19:06:12 +01:00
scrawl
8bd16e4d5a Don't compute the world matrix multiple times 2016-02-22 18:58:19 +01:00
scrawl
dda4273349 Actors that start the game as dead do not float to the surface (Fixes #3177) 
This has a minor bug (can you spot it?) that affects the vanilla engine as well, unfortunately not so simple to fix.
 2016-02-01 23:18:18 +01:00
scrawl
0bec6e5fbe Fix 'failed to find animation' warnings when a spell was equipped before the werewolf transformation 2015-12-26 18:45:09 +01:00
scrawl
29d0f448b4 Add const version of World::getAnimation 2015-12-19 16:15:45 +01:00
scrawl
f1f82af64e Fix improper swimming animations in first person mode 2015-12-11 01:24:42 +01:00
Chris Robinson
5f8a09df97 Play player sounds (except footsteps) local to the listener 2015-11-27 02:01:18 -08:00
scrawl
62169a7039 Use a single-precision PositionAttitudeTransform in speed critical places 2015-11-22 19:54:26 +01:00
scrawl
666fbba1e0 Rotations: World::rotateObject takes radians instead of degrees 
Cuts down on the amount of redundant degree<->radians conversions in the codebase.
 2015-11-12 01:09:39 +01:00
scrawl
637cd3a628 Adjust the FirstPersonNeckController to follow the camera with a reduced factor (Fixes #1784) 2015-11-10 01:01:41 +01:00
scrawl
c996702b56 Fix some uninitialised variables found by static analysis 2015-11-04 20:34:50 +01:00
scrawl
46e07e4b19 Head tracking: fall back to target collision box center if the target has no head node 2015-11-03 18:27:15 +01:00
scrawl
b72d5c5190 Don't play idlestorm animation when swimming 2015-11-03 17:48:35 +01:00
Marc Zinnschlag
b58a63e14e Merge remote-tracking branch 'scrawl/deathanim' 2015-09-17 14:54:29 +02:00
scrawl
a7f898057b Don't activate the initial death animation when skipAnim is set (Fixes #2513) 2015-09-17 04:38:42 +02:00
scrawl
126960261f Keep playing IdleSneak on the lower body when casting spells / using weapons 2015-09-16 16:14:17 +02:00
scrawl
5692ef1eae Add convenience operator [] to AnimPriority 2015-09-16 15:43:42 +02:00
scrawl
84747fbdd7 Use the actual sneak state to determine visibility of indicator (Fixes #2915) 2015-09-16 15:37:36 +02:00
dteviot
77a1d947cc extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
scrawl
8241976368 Don't attempt to play non-existing hit animations (Fixes #2856) 2015-08-15 23:27:37 +02:00
Marc Zinnschlag
d29862eac3 Merge remote-tracking branch 'emperorarthur/anim_fail' 2015-08-08 10:47:46 +02:00
scrawl
f326b8e5d2 Fix weapon animations playing on the lowerbody when swimming 2015-07-31 00:52:34 +02:00
scrawl
e8cbdcfb1e Play swimming animation fallback on the upper body when possible 2015-07-31 00:35:41 +02:00
Arthur Moore
5e6fcc2aef Alert the user if attempting to play an animation fails 
This is mostly propogating the error up the stack so the game can do something about it.
Working on avoiding log spam from calling an animation that doesn't exist every frame.
 2015-07-30 08:00:26 -04:00
scrawl
dff84adf7e Fix weapon animation priority 2015-07-26 01:35:36 +02:00
scrawl
41996b0aad Don't play turning animations in first person mode 2015-07-25 18:59:16 +02:00
scrawl
e0ee2fc01b Adjust the movement animation speed every frame (Fixes #1921) 2015-07-25 18:22:48 +02:00
scrawl
660e7f5d89 Don't update animation states in skipAnim mode (Fixes #2782) 2015-07-17 03:28:17 +02:00
scrawl
cc59493cb2 Don't restart the jump animation when equipping a different weapon (Fixes #2286) 2015-07-16 20:03:16 +02:00
scrawl
b5c79738f1 Fix enchantments casting more than once per button press, broken by a1432b0255 2015-07-16 19:56:09 +02:00
scrawl
17ada63fcb Don't play turning animations on the upperbody when in first person mode (Fixes #2287) 2015-07-15 16:43:11 +02:00
scrawl
83cceeee72 Use the extended animation priority for Block animations, allow starting attacks during a block animation (Fixes #2761) 2015-07-15 16:43:11 +02:00
scrawl
cf14d1748c Use the extended animation priority for Hit animations 2015-07-15 16:33:10 +02:00
scrawl
50db6ed396 Use the extended animation priority for weapon animations 2015-07-15 14:40:36 +02:00
scrawl
335ef97cf5 Rename Animation::Group to Animation::BlendMask 
The old naming is problematic, because the term group was being used for another feature (text key groups) already.
 2015-07-15 13:49:16 +02:00
scrawl
a7bd050928 Accurate attack timings in AiCombat 2015-07-03 05:58:12 +02:00
scrawl
741e5db862 Fix for non-bipedal creatures that use weapons, e.g. rieklings 2015-07-03 05:37:18 +02:00
scrawl
d07b176b36 Take into account hit recovery, knockdown and other animations for AiCombat attack timing 2015-07-03 02:18:35 +02:00
scrawl
a1432b0255 Move attackingOrSpell flag to the CharacterController 2015-07-02 19:14:28 +02:00
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.
 2015-06-26 05:15:07 +02:00
scrawl
beb1086260 Fix attackStrength being unset for creatures with no weapons 2015-06-26 04:21:10 +02:00
scrawl
6e5f3339ad Make sure to play IdleSwim when the character is swimming (Bug #2696) 2015-06-17 20:49:01 +02:00
scrawl
f017fd6860 Reduce includes in animation.hpp 2015-06-14 23:13:26 +02:00
scrawl
4c09ecef72 Normalize fixes 2015-06-05 03:41:10 +02:00
scrawl
4bb3cbf0fb Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
scrawl
b70383d127 Remove last remains of Ogre math 2015-06-03 21:37:21 +02:00
scrawl
2eec0caca0 Remove dependency on Ogre::StringConverter 2015-06-03 19:59:54 +02:00
scrawl
7bacb9418d Various math code ported to osg 2015-06-03 19:41:19 +02:00
scrawl
ccd95419e5 Restore various raycasting 2015-06-01 01:57:15 +02:00
scrawl
71bafcb52b Restore head tracking 2015-05-31 18:04:14 +02:00
scrawl
a066b24303 Restore WeaponAnimation 2015-05-31 01:07:43 +02:00
scrawl
988a9cad58 getHitContact Head exception fix 2015-05-30 01:41:38 +02:00
scrawl
fd50be0fb8 Restore various gameplay 2015-05-30 01:00:24 +02:00
scrawl
af2f26d04d Particle fixes 2015-05-29 20:45:27 +02:00
scrawl
f4ee805e3b Object animation fix 2015-05-28 15:44:58 +02:00
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
 2015-05-23 20:33:44 +02:00
Rohit Nirmal
396fba7fa9 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
scrawl
2235d2978b Restore animation text key handling 2015-05-22 04:36:33 +02:00
scrawl
47758c11cd Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
scrawl
83c6ba97c0 Disable skinning updates for actors beyond the AI processing distance 2015-04-30 00:10:24 +02:00
scrawl
0ff7b2ff11 MechanicsManager, frame update 2015-04-25 15:19:17 +02:00
scrawl
a3417a9c49 CharacterController compiles 2015-04-25 01:20:07 +02:00
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.
 2015-03-15 14:07:47 +13:00
scrawl
3879ce6ac1 Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
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
 2015-03-08 17:42:07 +13:00
scrawl
0c6e2170db Include cleanup 2015-02-05 04:18:42 +01:00
scrawl
bdcc3a4036 Add missing swish sound for thrown weapons 2015-01-31 22:40:40 +01:00
scrawl
f35c9b7a69 Clang warning fixes (thanks hemite) 2015-01-27 23:12:20 +01:00
scrawl
fafc14d5a0 Add proper air movement mechanics (Fixes #2077) 2015-01-13 05:37:43 +01:00
scrawl
5e7e40aac9 Fix being able to switch weapons while knocked out 2015-01-04 19:54:49 +01:00
scrawl
d56906acf7 Fix the creature position glitch 2015-01-03 19:10:15 +01:00
scrawl
70d3bfc6ed Fix idle animation not restarting immediately for creatures 2015-01-01 03:38:54 +01:00
scrawl
d26d5f6c26 Fix outdated bone locations when camera view is changed while paralyzed 2014-12-31 17:25:06 +01:00
scrawl
d1a29300f0 Handle bipedal creatures not using weapons (Fixes #2238) 2014-12-31 16:59:21 +01:00
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.
 2014-12-28 15:34:47 +01:00
scrawl
1bd3ab8a2d Fix torch animation playing when torch is hidden (Fixes #2236) 2014-12-28 14:17:53 +01:00
scrawl
8bc7eb5530 PlayGroup: Don't loop animations with no loop keys (Fixes #2223) 2014-12-24 15:45:13 +01:00
scrawl
f931ba2efc Fix some static analysis issues (coverity) 2014-12-24 15:45:12 +01:00
scrawl
d962f0918d Implement NPC head tracking (Fixes #1720) 2014-12-16 20:47:45 +01:00
scrawl
60aa209144 Implement drowning when knocked out underwater (Fixes #1228) 2014-12-12 17:42:56 +01:00
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.
 2014-12-12 16:49:22 +01:00
scrawl
bc85bb32c2 Fix vampirism magic effect not applying immediately (Fixes #1984) 2014-12-12 02:39:59 +01:00
scrawl
3c747195ae Add fall damage for creatures (Fixes #2201) 2014-12-10 17:21:34 +01:00
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.
 2014-12-05 22:02:18 +01:00
scrawl
14ae6d28b0 Fix being able to jump when overencumbered 2014-12-03 18:28:35 +01:00
scrawl
5f5fcc2fef Make PlayGroup use an indefinite number of loops (Fixes #2156) 2014-11-28 17:15:31 +01:00
scrawl
f117a75747 Force walk animation when flying (Fixes #2015) 2014-10-17 19:11:06 +02:00
scrawl
5c3bc6563b Fix divisions by zero in normalizedEncumbrance 2014-10-05 15:50:01 +02:00
scrawl
e9ed0211c9 Attempt to fix Clang warnings 2014-09-28 12:44:47 +02:00
Marc Zinnschlag
175d4f3d44 Merge remote-tracking branch 'ragora/playdeathlevelupmusic' 2014-09-23 13:30:50 +02:00
Ragora
06e683d378 Added code to play music on level up and on death 2014-09-23 04:58:19 -04:00
scrawl
447e93bdb4 Use SpellCast animation for creatures that have it (flame atronach) 2014-09-18 03:24:47 +02:00
scrawl
3ce3f31452 Adjust turning animation speed multiplier based on turning speed 2014-09-17 07:02:19 +02:00
scrawl
6debd21ec6 Make sure the Jump control is always handled by the PhysicsSystem even if game runs faster than the minimum physics timestep 2014-09-17 07:02:19 +02:00
scrawl
269c200c8f Fix jump velocity mechanics (Fixes #1708) 2014-09-17 07:02:19 +02:00
scrawl
b6a89c7845 Fix idlestorm animation conflict with torch animation 2014-09-17 07:02:19 +02:00
scrawl
4c285151a3 Fix incorrect movement animation for some creatures (Fixes #1924) 2014-09-17 07:02:10 +02:00
scrawl
157c53bed4 Handle spellcasting for creatures with no casting animation (Fixes #1856) 2014-09-15 10:42:44 +02:00
scrawl
dd5f4947d7 Add a TODO comment 2014-09-09 05:05:20 +02:00
scrawl
a9847c9453 Fix creature attacking flag not being reset after the attack starts (Fixes #1889) 2014-09-09 00:27:25 +02:00
scrawl
adbc50366b Use random attack strength for creatures (Bug #1876) 
Determining the attack strength from the time the wind-up animation was held will not work properly, as most creatures don't have this animation.

This fixes another balancing issue with Rieklings (they were previously using an attack strength of 1 every time).
 2014-09-07 18:55:59 +02:00
MiroslavR
931e778b4d Initialize mHasMovedInXY in CharacterController 2014-09-06 21:31:48 +02:00
MiroslavR
b1a449a0b9 Fix wolfrun sound playing all the time when running is default 2014-09-06 05:52:47 +02:00
scrawl
84a0d064cd Fall back to regular death animation if deathknockdown/deathknockout don't exist (Fixes #1870) 2014-09-02 15:14:23 +02:00
scrawl
feeb740497 Fix bone not found exception for golden saint spellcasting 2014-08-28 17:02:11 +02:00
scrawl
fc7ed05da8 Knock out actors when fatigue base is 0 (Fixes #1847) 2014-08-26 03:02:06 +02:00
scrawl
c5c822ecba Use Chop attack when walking diagonally (Fixes #1729) 2014-08-24 02:38:00 +02:00
scrawl
e0e4cbbb41 Implement Light magic effect (Fixes #1122) 2014-08-24 02:37:59 +02:00
scrawl
d8943aef2f Encapsulate magic effect magnitude (Feature #1489) 2014-08-17 03:58:04 +02:00
scrawl
8ae6796b2f Play creature movement animation without scaling if a fallback is used (Fixes #1797) 2014-08-13 01:53:56 +02:00
scrawl
34847baa54 Disable head animations for dead actors (Fixes #1781) 2014-08-11 05:00:13 +02:00
Marc Zinnschlag
dbf5613d8c cleanup 2014-08-03 09:28:44 +02:00
Digmaster
a32ab842ae Added ForceJump/ForceMoveJump commands 2014-08-02 22:42:40 -07:00
scrawl
8455ed6279 Cancel upper body animations when knocked down 2014-07-28 19:51:29 +02:00
scrawl
c9150c9680 Initialize character skeleton to a suitable pose (Fixes #1473) 2014-07-13 10:40:48 +02:00
scrawl
742d008765 Fix initializing CharacterController with fists or spell equipped 2014-07-08 10:30:46 +02:00
scrawl
ee81698089 Always control movement by animation except for first person or in-air 2014-07-08 10:30:45 +02:00
scrawl
10ef0a34d9 Update effects even when main animation is paused (Fixes #1585) 2014-06-28 17:54:14 +02:00
scrawl
911bd0e340 Use walk animation as fallback if there's no run animation (Fixes #1578) 2014-06-28 00:07:13 +02:00
scrawl
07d0f4458d Rotate clouds/particles to come from red mountain (Fixes #245) 2014-06-27 03:22:00 +02:00
scrawl
9eb8addc70 Make flying creatures fall when paralyzed (Fixes #1494) 2014-06-27 03:21:50 +02:00
scrawl
3d9bdad8ba Correct run speed for creatures (by Hrnchamd - Fixes #1136) 2014-06-25 00:51:02 +02:00