4902 Commits

Author	SHA1	Message	Date
scrawl	c0dd383cd0	Fix door collision to work with all possible movement directions	2013-04-30 09:43:32 +02:00
Chris Robinson	05060e57ec	Add a weapon state to the character controller	2013-04-29 13:07:49 -07:00
Glorf	d283f8d85f	Bugfix #748	2013-04-29 21:19:13 +02:00
Chris Robinson	020e3e8a8e	Show the equipped weapon in the inventory screen ... And use the proper pose based on what's equipped.	2013-04-29 12:08:43 -07:00
Chris Robinson	854de1c6c1	Make sure the weapon is in the proper group	2013-04-29 11:43:37 -07:00
Chris Robinson	15a2eeebb8	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-04-29 10:16:29 -07:00
Chris Robinson	063322b081	Declare some variables closer to where they're used	2013-04-29 10:12:50 -07:00
Chris Robinson	0cf531ba12	Make sure to update parts when the weapon changes	2013-04-29 09:53:36 -07:00
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
Marc Zinnschlag	bab899513a	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-29 18:04:22 +02:00
Glorf	74de8b83b6	Enabled collision when new game	2013-04-29 17:56:16 +02:00
Marc Zinnschlag	236751ec45	some IdCollection and IdTable cleanup	2013-04-29 17:52:01 +02:00
Chris Robinson	a15758ac85	Fix preview and vanity cameras	2013-04-29 08:48:45 -07:00
Glorf	6222b3f52a	Bugfix #744	2013-04-29 17:19:20 +02:00
Chris Robinson	d17e1e83d5	Rename MWRender's Player to Camera	2013-04-29 05:50:40 -07:00
Chris Robinson	dbba126344	Use a method to check if the view should be first person	2013-04-29 04:40:28 -07:00
Chris Robinson	bb8277920b	Manage the player's NpcAnimation object in the RenderingManager ... It may be more appropriate to manage it in MWRender::Actors with the other Animation-based objects, but that will need some (minor) interface changes.	2013-04-29 03:31:46 -07:00
scrawl	6c5ea1ea7a	Fix incorrect weapon health meter for fully repaired weapons, fix exception when equipping lockpicks or probes	2013-04-29 12:05:10 +02:00
scrawl	5ff098b8fb	Fix quick keys being triggered when in UI mode	2013-04-29 11:55:30 +02:00
scrawl	867c7db014	Fix wrong door sounds	2013-04-29 11:00:15 +02:00
scrawl	9648804af5	Fix terrain material leak, this should in theory allow the terrain to free its temporary resources	2013-04-29 10:20:38 +02:00
scrawl	78596cad83	Fix enchantment points value	2013-04-29 10:19:09 +02:00
Chris Robinson	ba3a67f84b	Don't store the player base node in MWRender::Player	2013-04-28 23:44:44 -07:00
Chris Robinson	24e503330b	Merge remote-tracking branch 'zini/master' into animations	2013-04-28 09:41:31 -07:00
Marc Zinnschlag	11a45b3034	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 18:22:09 +02:00
scrawl	67e5e939a1	Fix some doors	2013-04-28 17:57:36 +02:00
Marc Zinnschlag	f2a5377b2b	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-28 16:52:48 +02:00
Marc Zinnschlag	116ac05677	Merge remote-tracking branch 'scrawl/doors'	2013-04-28 16:44:11 +02:00
Glorf	98baf9fac1	Bugfix #718	2013-04-28 16:36:12 +02:00
scrawl	6ecd88af14	More fixes	2013-04-28 15:59:59 +02:00
scrawl	4ee1a6ee02	Put door physics in a separate method, some fixes	2013-04-28 15:36:37 +02:00
Marc Zinnschlag	cd61177eed	Merge remote-tracking branch 'gus/renderWeaponShield'	2013-04-28 15:00:47 +02:00
scrawl	9343b4459e	Opening doors	2013-04-28 14:59:15 +02:00
Marc Zinnschlag	a6b7f8e904	Merge remote-tracking branch 'scrawl/fall'	2013-04-28 14:14:10 +02:00
Marc Zinnschlag	93c98e1df4	Merge remote-tracking branch 'scrawl/athletics'	2013-04-28 14:11:12 +02:00
Marc Zinnschlag	738a54337d	removed redundant case smashing	2013-04-28 14:07:53 +02:00
gus	3d9ceede77	little fix (weapons disapeared when tab was pressed)	2013-04-28 12:33:41 +01:00
gus	5388c25e64	Fix or lockpicks.	2013-04-28 11:55:50 +01:00
gus	766d1efa84	Render weapon and shield. Only shield can be seen right now as weapons need to be drawed out.	2013-04-28 11:41:01 +01:00
scrawl	7d61459ccd	Added stub implementation for 'Fall'. There is no use for this function because our physics controller applies gravity constantly anyway.	2013-04-28 11:13:21 +02:00
scrawl	fdf80c1c4f	Fix unused variable	2013-04-28 11:05:01 +02:00
scrawl	db78d15fc4	Fix changeWeather	2013-04-28 11:02:30 +02:00
Chris Robinson	ce7bc20fa1	Avoid special-casing player rotation	2013-04-28 01:14:58 -07:00
scrawl	07891fa213	Athletics skill increase	2013-04-28 07:53:04 +02:00
Glorf	3669d0a998	Bugfix #742	2013-04-27 20:57:44 +02:00
Marc Zinnschlag	e7bf1d230c	fixed an indexing problem in IdCollection	2013-04-27 16:22:04 +02:00
Chris Robinson	ab52e68c05	Merge remote-tracking branch 'zini/master' into animations	2013-04-27 05:16:15 -07:00
Chris Robinson	137017b325	Don't allow forcing vanity mode	2013-04-27 01:24:36 -07:00
Glorf	ade871ce12	Corrected unused opcodes	2013-04-26 17:31:58 +02:00
Glorf	89f7ef2472	Move, moveworld script instructions	2013-04-26 17:28:19 +02:00