4462 commits

Author	SHA1	Message	Date
gus	ee47e99dad	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 ... Conflicts: apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2013-07-16 11:40:19 +01:00
gus	f6e3445414	Jittering gone + bugfix: chop animation works! ... TODO: fix this unequip stuff	2013-07-16 09:50:59 +01:00
Chris Robinson	e5e9c83ed5	Merge remote-tracking branch 'zini/master' into animation-state	2013-07-16 01:33:46 -07: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
Chris Robinson	3a1facefdf	Store a pointer to the character controller for non-actor objects	2013-07-15 23:47:04 -07:00
Chris Robinson	06e631f213	Track death separately in the character controller	2013-07-15 23:43:33 -07:00
Chris Robinson	4ae65c20e6	Separate movement and idle states ... This allows us to better handle cases of "missing" animations. Mainly for first-person, but also for spells and certain weapon types.	2013-07-15 22:56:23 -07:00
scrawl	94d45e1518	Fix twohanded weapons not unequipping when equipping a torch	2013-07-15 23:21:01 +02:00
scrawl	daf9dca121	Fix exception when starting a new game	2013-07-15 20:37:36 +02:00
gus	f7f23ac5d8	improvement of the chop animation. Still some jittering.	2013-07-15 17:18:16 +01:00
gus	f7b711aabe	bugfix	2013-07-15 16:37:32 +01:00
gus	076f98cbba	change way animations keys are handled (thanks KittyCat!)	2013-07-15 16:37:25 +01:00
Marc Zinnschlag	fd9cc1c282	Merge remote-tracking branch 'vorenon/container'	2013-07-15 09:33:16 +02:00
Marc Zinnschlag	a0022e711b	Merge remote-tracking branch 'scrawl/raycast'	2013-07-15 09:20:16 +02:00
vorenon	66eb82b363	oops again	2013-07-15 02:26:22 +02:00
vorenon	33779ae23c	oops	2013-07-15 02:23:18 +02:00
vorenon	d4739a451a	added ability to close container windows with the activation key	2013-07-15 02:18:24 +02:00
scrawl	c81b852071	Fixes inaccurate ray casts; rely on getCameraToViewportRay	2013-07-15 00:39:37 +02:00
scrawl	8407e2b3aa	Fixes the console sometimes receiving text after it was closed	2013-07-14 23:54:28 +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
gus	3947f44aa3	Porting old work	2013-07-13 22:24:52 +01: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
Chris Robinson	7883087586	Store a pointer to the character controller in the map	2013-07-12 22:31:50 -07:00
scrawl	bbb5d2b98a	Change tooltip positioning to resemble vanilla	2013-07-10 03:40:13 +02:00
Marc Zinnschlag	71a6955182	Merge remote-tracking branch 'scrawl/master'	2013-07-08 09:46:00 +02:00
scrawl	91f6d87126	Fix an uninitialized variable	2013-07-07 16:57:46 +02:00
Marc Zinnschlag	602e40e19d	Merge remote-tracking branch 'greye/coc'	2013-07-07 13:34:28 +02:00
greye	e553f285b8	update player position on engine start	2013-07-07 15:06:05 +04:00
greye	f3d54a7ba4	move finding default cell positions to World	2013-07-07 15:03:06 +04:00
greye	0c303aa285	fix fading on cell transition when cell is loaded	2013-07-07 14:30:11 +04:00
greye	6bb3942288	use Land height data for position in coc	2013-07-07 13:47:58 +04:00
greye	a3094b808e	update coc behaviour for interior cells	2013-07-07 13:47:58 +04:00
scrawl	744c5804ed	Simplified doors, now they will stop after hitting an obstacle instead of trying to back off.	2013-07-07 03:52:17 +02: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
scrawl	58fce74620	Use the already existing mScrollPage as step size for scrollbar button repeats; increased precision of options menu sliders	2013-07-06 16:40:57 +02:00
scrawl	5c8950f91c	Merge branch 'master' of git://github.com/zinnschlag/openmw	2013-07-06 16:08:29 +02:00
Marc Zinnschlag	f9d7c7574e	Merge remote-tracking branch 'swick/scrollbar'	2013-07-06 13:13:27 +02:00
Marc Zinnschlag	3dc42fb948	Merge remote-tracking branch 'greye/master'	2013-07-06 12:28:01 +02:00
greye	76d95dffb6	special case for loading StartScript records	2013-07-05 23:52:46 +04:00
Sebastian Wick	26bd2a5301	use the new scrollbar; range dependent step size; fix	2013-07-05 20:28:46 +02:00