15933 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	63b9b075aa	Do not allow soul trapping the same creature more than once (Fixes #3102)	2015-12-26 18:47:22 +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	6b67911658	Unset DrawState_Spell when becoming a werewolf	2015-12-26 18:26:55 +01:00
scrawl	f052c05018	Move werewolf functions from World to MechanicsManager	2015-12-26 18:23:13 +01:00
scrawl	53334d08a2	Disable Ready Magic and Cycle Weapon/Spell hotkeys for werewolves (Fixes #3100)	2015-12-26 18:15:57 +01:00
Alexander "Ace" Olofsson	d3da51bbb2	Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor	2015-12-26 00:30:51 +01:00
scrawl	a7c886721c	Merge pull request #866 from ace13/build-fix ... Fix build error with OSG >=3.3.3 <3.4.0	2015-12-26 00:28:34 +01:00
scrawl	a1e163ed20	Correct an error in the timestamp subtracting logic (Fixes #3105)	2015-12-26 00:26:13 +01:00
Alexander "Ace" Olofsson	d32358558e	We actually want the commit hash, so no zips	2015-12-24 22:39:07 +01:00
Alexander "Ace" Olofsson	f422fe49f8	Slight improvement to the build setup	2015-12-24 18:27:57 +01:00
Alexander "Ace" Olofsson	0efb8e2949	osgDB::ObjectCache was added in 3.3.3, not 3.4.0 ... Fixes redefinition error on builds with OSG >3.3.3 <3.4.0	2015-12-24 17:18:32 +01:00
Alexander "Ace" Olofsson	09ec622f66	Remove unused environment, only do 32-bit	2015-12-24 11:42:12 +01:00
Alexander "Ace" Olofsson	93ee8f1991	Allow for earlier CMake on Qt4	2015-12-24 11:33:59 +01:00
Alexander "Ace" Olofsson	fe241be26c	Merge branch 'master' of git://github.com/OpenMW/openmw into appveyor	2015-12-24 11:27:02 +01:00
Alexander "Ace" Olofsson	2142d0d2d6	Make Qt5 happy	2015-12-24 02:48:00 +01:00
Alexander "Ace" Olofsson	1dbc1e67d8	Possible Qt5 link fix for AppVeyor	2015-12-24 02:41:35 +01:00
Alexander "Ace" Olofsson	c8145a1b91	Let's see if we can't get AppVeyor to work	2015-12-23 19:32:43 +01:00
Alexander "Ace" Olofsson	c226d015ac	AppVeyor doesn't pass the platform env variable?	2015-12-23 18:59:41 +01:00
Alexander "Ace" Olofsson	5743c839a8	Why is this breaking on AppVeyor?	2015-12-23 18:51:04 +01:00
Alexander "Ace" Olofsson	f3187b17c8	Update OpenAL soft link, get qtbinpatcher to run	2015-12-23 18:38:53 +01:00
Marc Zinnschlag	2162f21550	Merge branch 'drop'	2015-12-20 10:18:05 +01:00
Marc Zinnschlag	fb2384a7d6	updated credits file	2015-12-20 09:26:39 +01:00
Aesylwinn	9bd14215d7	Expanded inventory check to creatures and NPCs	2015-12-19 22:02:39 -05:00
Aesylwinn	4c14117761	Added checks to verifier for container inventories	2015-12-19 20:03:00 -05:00
scrawl	db7b80b503	Revert "Accept a ConstPtr in ItemPtr tooltips" ... This reverts commit 41c8ec56e0. Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.	2015-12-19 22:52:35 +01:00
scrawl	2176ac592c	Call updateDialogueGlobals before dialogue starts (Fixes #3034)	2015-12-19 21:58:49 +01:00
scrawl	5ac226f519	Another collision mask fix	2015-12-19 17:02:57 +01:00
scrawl	e5d9ee30f4	Add count argument to copyObjectToCell ... Fixes the gold bug introduced in c9ca5bc946	2015-12-19 16:48:32 +01:00
scrawl	41c8ec56e0	Accept a ConstPtr in ItemPtr tooltips	2015-12-19 16:37:26 +01:00
scrawl	5a7bbbd508	Accept a ConstPtr in ToolTips::setFocusObject	2015-12-19 16:34:26 +01:00
scrawl	32d5dece58	Add count argument to getToolTipInfo	2015-12-19 16:29:07 +01:00
scrawl	0d4729dcd5	Use the const version of CustomData::as*	2015-12-19 16:19:52 +01:00
scrawl	16e3699739	Fix collision mask in castSphere	2015-12-19 16:18:12 +01:00
scrawl	b0894ea20d	Accept a ConstPtr in hasToolTip	2015-12-19 16:15:45 +01:00
scrawl	29d0f448b4	Add const version of World::getAnimation	2015-12-19 16:15:45 +01:00
scrawl	51c77c5045	Accept a ConstPtr in getDoorState	2015-12-19 16:15:45 +01:00
scrawl	7a2ca5580a	Accept a ConstPtr in RippleSimulation	2015-12-19 15:51:41 +01:00
scrawl	53f4b92426	AiEscort do not follow target through doors ... Testing revealed a problem where the guard on the prison ship would incorrectly follow the player outside. Upon further investigation in vanilla MW, it appears that with AiEscort the actor only follows the target through doors once the AiEscort package has completed, *and* no new AI package is running yet.	2015-12-19 15:15:44 +01:00
scrawl	2c51e7345f	Use a separate collision type for doors (Fixes #1962)	2015-12-18 18:32:42 +01:00
scrawl	604b5d24e9	Use a ConstPtr in SoundManager	2015-12-18 18:11:30 +01:00
scrawl	a0fb31e3b1	Accept a ConstPtr in getLOS	2015-12-18 18:03:47 +01:00
scrawl	029d467ea5	Accept a ConstPtr in getItemsOwnedBy, getContainersOwnedBy	2015-12-18 18:00:18 +01:00
scrawl	388aed1748	Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions	2015-12-18 17:56:48 +01:00
scrawl	ed101ad35a	Remove redundant getPlayerAnimation function	2015-12-18 17:44:57 +01:00
scrawl	c9ca5bc946	Accept a ConstPtr in placeObject	2015-12-18 17:42:59 +01:00
scrawl	6c505ca06f	Accept a ConstPtr in getHitContact	2015-12-18 17:38:21 +01:00
scrawl	0796f49c17	Accept a ConstPtr in various physics getters	2015-12-18 17:36:14 +01:00
scrawl	795032621c	Use a ConstPtr for the ActorMap and ObjectMap	2015-12-18 17:30:39 +01:00
scrawl	7a8a7e3dd6	Add const version of getAnimation	2015-12-18 17:21:51 +01:00
scrawl	7a4aac1842	Use a ConstPtr for the PtrAnimationMap	2015-12-18 17:20:29 +01:00