15947 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	e695619aa5	ExprParser: Warn about ignored arguments	2016-01-03 00:02:58 +01:00
scrawl	ded0962130	Update AUTHORS.md	2016-01-02 20:52:22 +01:00
scrawl	5feab8c7d3	Merge pull request #869 from neuralroberts/master ... Use correct direction multipliers during awareness check	2016-01-02 20:51:00 +01:00
Poncho	b1020dcd42	Use correct direction multipliers during awareness check	2016-01-02 12:24:39 -06:00
scrawl	3ebfb47983	Do not discard root node transformations if the root node is named 'bip01' (Bug #3118)	2016-01-02 01:30:06 +01:00
scrawl	1905f0bf2d	Add support for placing BodyParts in a cell (Bug #3118)	2016-01-02 01:30:06 +01:00
scrawl	a9f0f30bb8	Reject conditions testing agaist Choice when not currently in a choice (Fixes #3117)	2016-01-01 23:55:52 +01:00
scrawl	0333c40047	Fix typo in SameRace dialogue function (function was inverted, Fixes #3116)	2016-01-01 02:59:55 +01:00
scrawl	6fde02ea42	LocalScripts: initialize mIter	2016-01-01 02:59:55 +01:00
scrawl	7f7e8c63bf	Correct path to gamecontrollerdb.txt (Fixes #3112)	2015-12-31 00:37:47 +01:00
Alexander "Ace" Olofsson	42e3ff6f96	Revert "Build without unity builds, how far will we get?" ... This reverts commit 05335491ac.	2015-12-28 09:01:08 +01:00
Alexander "Ace" Olofsson	05335491ac	Build without unity builds, how far will we get?	2015-12-28 05:42:21 +01:00
Alexander "Ace" Olofsson	d5196ac4fc	Let's throw in a build badge too	2015-12-27 20:05:37 +01:00
Alexander "Ace" Olofsson	1ac091e5b5	Quick appveyor.yml cleanup	2015-12-27 20:00:52 +01:00
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