6597 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	2cb7e1f3d5	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-30 10:24:02 +02:00
scrawl	c0dd383cd0	Fix door collision to work with all possible movement directions	2013-04-30 09:43:32 +02:00
Glorf	d283f8d85f	Bugfix #748	2013-04-29 21:19:13 +02: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
Glorf	6222b3f52a	Bugfix #744	2013-04-29 17:19:20 +02:00
scrawl	d5c7a26041	Fix broken loose file resources when using Ogre 1.9	2013-04-29 12:32:24 +02: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
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	6ea82333d4	Headers cleanup	2013-04-28 16:38:33 +02:00
Glorf	98baf9fac1	Bugfix #718	2013-04-28 16:36:12 +02:00
scrawl	2e1dda9010	Fix old bullet versions	2013-04-28 16:19:40 +02:00
scrawl	6ecd88af14	More fixes	2013-04-28 15:59:59 +02:00
scrawl	208f9ca8c5	Fix problem with newer (or older?) bullet version (thanks travis)	2013-04-28 15:56:09 +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
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	90b38cbfbe	fixed parsing of end statements in scripts with IDs matching keywords	2013-04-27 14:06:23 +02: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
Marc Zinnschlag	32138dbb0f	silenced a warning	2013-04-26 13:33:47 +02:00
Chris Robinson	2822f431c4	Merge remote-tracking branch 'zini/master' into animations	2013-04-26 01:38:51 -07:00
Chris Robinson	b666f1d551	Work around a problem with MWRender::Player::renderPlayer ... NpcAnimation::setViewMode makes a call to the character controller, in the mechanics manager, to forcefully update the character's state. This in turn makes a call to the player's old NpcAniamtion object that was just deleted. The mechanics manager will eventually remove and reinsert the player, so the old character controller will be removed and a new one will get the right Animation object again, but not in time for the setViewMode call. There's many factors that all contribute to this run-around, which needs discussion on how to best fix.	2013-04-26 01:30:36 -07:00
Chris Robinson	55ee4e65a9	Clean up the slotlist struct	2013-04-25 23:42:20 -07:00
scrawl	7821610ec6	Make OnDeath work with explicit reference	2013-04-26 02:08:53 +02:00
scrawl	a373f53988	Added SetAtStart	2013-04-26 02:02:51 +02:00
Marc Zinnschlag	4e45222a63	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:57:24 +02:00
Glorf	240217ae42	Fixed rotations more than 360 degrees	2013-04-25 20:52:38 +02:00
Marc Zinnschlag	1e9656ee9c	Merge remote-tracking branch 'glorf/rotate-update1'	2013-04-25 20:22:40 +02:00
Glorf	7cd4dd0c91	Improved local rotations	2013-04-25 19:14:10 +02:00
Chris Robinson	274f3c7b77	Force character state to update after switching view modes	2013-04-25 07:08:11 -07:00