Chris Robinson
59f1bc7542
Use time values for the aniamtion's start, stop, and loop points
...
This seems to be closer to the expected behavior. This more cleanly handles 0-
length animations, especially where the start marker comes after the stop
marker while still being on the same time key.
2013-07-24 08:38:36 -07:00
Chris Robinson
0c8d4d9be2
Add beginnings of melee hits
2013-07-24 02:51:42 -07:00
Chris Robinson
45302f9e25
Handle controllers in the NPC's bound object parts
2013-07-23 22:05:03 -07:00
Chris Robinson
fecb8c1cc4
Fix the completion amount for 0-length anims
2013-07-23 05:30:37 -07:00
Chris Robinson
537d5c4934
Avoid trying to play animations without any animation sources
2013-07-23 04:36:25 -07:00
Chris Robinson
ad6d663e09
Remove some unnecessary debug messages
2013-07-23 03:44:52 -07:00
Chris Robinson
ef17fdeb15
Remove some unused methods
2013-07-23 01:37:41 -07:00
Marc Zinnschlag
ec575200e3
Merge remote-tracking branch 'gus/MeleeCombat2'
...
Conflicts:
apps/openmw/mwrender/animation.cpp
2013-07-23 09:12:23 +02:00
Marc Zinnschlag
a8168c58c2
Merge remote-tracking branch 'kolek/thirdpersonzoom'
2013-07-20 18:29:59 +02:00
Kolzi
d12bac2d9e
Third person zoom - fixed code review issues.
2013-07-20 16:55:35 +02:00
Kolzi
1b7966ca27
Can zoom in and out in third person view.
2013-07-19 16:12:01 +02:00
Chris Robinson
0cb7d186e7
Use Play_TypeFoot for 'left' and 'right' soundgen keys
2013-07-18 21:50:11 -07:00
Marc Zinnschlag
fdd47e5b73
silenced a warning
2013-07-18 13:50:12 +02:00
Chris Robinson
9ea6b22a83
Handle soundgen animation keys
2013-07-17 23:58:21 -07:00
Chris Robinson
c7692acb79
Update the player's Ptr in mwrender when changing cells
2013-07-17 19:11:03 -07:00
scrawl
91e95e1404
Use the correct slash, chop or thrust animation
2013-07-16 23:32:41 +02:00
Chris Robinson
a932a89e02
Specify the velocity-based animation speed multiplier when playing it
2013-07-16 01:30:03 -07:00
Chris Robinson
f296d13c20
Add a speed multiplier to the animation state
2013-07-16 00:43:31 -07:00
scrawl
daf9dca121
Fix exception when starting a new game
2013-07-15 20:37:36 +02:00
scrawl
c81b852071
Fixes inaccurate ray casts; rely on getCameraToViewportRay
2013-07-15 00:39:37 +02:00
scrawl
fa5198d7b2
Fix an assertion
2013-07-14 14:59:24 +02:00
scrawl
61661c8653
Fix first person meshes casting shadows
2013-07-14 14:55:07 +02:00
scrawl
a049638e7f
Fixes character previews getting shadowed randomly
2013-07-14 14:54:40 +02:00
Chris Robinson
3771e5839e
Allow some more third person fallbacks in first person
2013-07-13 17:03:10 -07:00
Chris Robinson
5ee889e8b6
Attach the camera to the Head node in first-person
2013-07-13 16:12:38 -07:00
Chris Robinson
2d7620e774
Rotate the neck when looking up and down in first-person
2013-07-13 12:39:06 -07:00
Chris Robinson
4df1f198a7
Avoid a map lookup for every skin body part when updating
2013-07-12 22:32:09 -07:00
Chris Robinson
6de56615aa
Avoid casting shadows in first-person view
2013-07-12 22:32:05 -07:00
Chris Robinson
025fa4e0d5
Use a multimap for the bodypart map
2013-07-12 22:32:04 -07:00
Chris Robinson
a5e4faaed2
Show arms and body parts in first person
...
This isn't yet fully correct. The arms need to rotate up and down with
the camera, and the mesh's bounding box is causing them to blink out at
certain angles since they don't fit the animation.
2013-07-12 22:31:59 -07:00
Chris Robinson
908f010c74
Reset the NPC object root when switching POV
...
When in first person, the skeleton in the .1st.nif file is used. In
particular, these have extra finger bones that are used by the first
person models.
2013-07-12 22:31:57 -07:00
scrawl
72600a16cf
Fix chargen race menu bug, updating a render target from within MyGUI's ControllerManager update is not a good idea
2013-07-06 17:02:40 +02:00
Miroslav Puda
743b3dec99
Correction of libavutil version
2013-06-26 07:17:29 +02:00
eroen
d75391de8e
libav-9 - fix missing includes
...
With libav-9 and ffmpeg-1.0, libavcodec/avcodec.h no longer defines the
AV_CH_LAYOUT_* constants. They have been defined in libavutil/channel_layout.h
for a long time prior to this.
2013-06-24 21:08:28 +02:00
scrawl
4c8a04d9cb
Merge branch 'master' of https://github.com/zinnschlag/openmw into sdl_input2
...
Conflicts:
apps/openmw/mwinput/inputmanagerimp.cpp
2013-06-15 17:41:42 +02:00
scrawl
5252ffa104
More cleanup
2013-06-15 17:06:27 +02:00
scrawl
f1ff9b69b3
Mouse grab and relative input need to be disabled when the mouse leaves the window; Disabled resolution switching / window resizing for now due to several glitches
2013-06-15 15:33:47 +02:00
scrawl
14a2a26a56
Fullscreen resizing fix
2013-06-12 20:08:55 +02:00
scrawl
403704b92a
Use openmw.png for SDL_SetWindowIcon
2013-06-12 16:15:04 +02:00
scrawl
918a1655bb
Restored HW cursor rotation and resolution/fullscreen switching
2013-06-12 14:58:07 +02:00
scrawl
495aeb5d3b
Merge branch 'master' into HEAD
...
Conflicts:
CMakeLists.txt
apps/openmw/engine.cpp
apps/openmw/mwgui/cursorreplace.cpp
apps/openmw/mwgui/cursorreplace.hpp
apps/openmw/mwgui/windowmanagerimp.cpp
apps/openmw/mwgui/windowmanagerimp.hpp
apps/openmw/mwinput/inputmanagerimp.cpp
libs/openengine/ogre/renderer.cpp
2013-06-12 12:34:33 +02:00
darkf
fc0f04324c
Remove some superfluous mSkyManager NULL checks
2013-06-11 20:56:40 -07:00
fstp
98e5cb6d7b
Added ifdef to keep backward compatibility with the FFmpeg library.
2013-06-10 15:10:39 +02:00
scrawl
1e7cf4ae1c
GLES2 experiment
2013-05-25 04:15:24 +02:00
scrawl
7a2d1cd8ce
Security skill
2013-05-19 18:40:37 +02:00
scrawl
c7805e7dd2
Fix sun glare persisting after changing to an interior cell
2013-05-18 23:10:37 +02:00
scrawl
4983d08fe4
Fix a problem with statics disappearing sometimes on the map
...
Ogre::StaticGeometry doesn't seem to like materials being changed at runtime. It stores raw pointers to Ogre::Technique objects also, which conflicts with shiny's way of managing "unloaded" materials as having zero techniques. If a static geometry object is baked from an unloaded material, it won't find any techniques to use and can't render. By moving the unload call afterwards, it will be detected as in use by a renderable and won't be unloaded. Ideally this needs fixing of Ogre::StaticGeometry to not hold on to Technique objects (they also currently need to be rebuilt whenever user settings are changed, which also causes "unloading" of materials)
2013-05-18 22:55:30 +02:00
scrawl
60563afc10
Fix a new game crash, reset camera
2013-05-17 22:53:43 +02:00
Chris Robinson
e8bbb755c3
Play the left-arm torch animation when it's equipped
2013-05-17 06:21:59 -07:00
Chris Robinson
ee585046ac
Don't show weapons in first-person
2013-05-17 01:56:16 -07:00