9193 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nikolay Kasyanov	8f99da084b	OS X: plugins are now in Frameworks dir, not in Plugins	2014-02-16 14:13:12 +04:00
Nikolay Kasyanov	3c281c6a62	OS X: specify path to framework binary, not to framework directory	2014-02-16 14:12:45 +04:00
Nikolay Kasyanov	c2fe0d480a	Merge remote-tracking branch 'upstream/master' into osx-ogre-19 ... Conflicts: CMakeLists.txt	2014-02-14 00:04:16 +04:00
Marc Zinnschlag	053b3dc371	Merge branch 'openmw-28' ... Conflicts: CMakeLists.txt	2014-02-13 20:57:28 +01:00
Nikolay Kasyanov	58add97676	Merge branch 'master' into osx-ogre-19 ... Conflicts: CMakeLists.txt	2014-02-13 20:34:06 +04:00
Marc Zinnschlag	e9238b456d	use case-insensitive sorting in columns	2014-02-13 15:01:10 +01:00
Marc Zinnschlag	d73097c2e4	Merge remote-tracking branch 'scrawl/master'	2014-02-13 13:13:37 +01:00
scrawl	ea90035eca	Enable irc notification for travis	2014-02-13 12:35:33 +01:00
scrawl	1ed1b43296	Enable release branches in Travis CI	2014-02-13 12:30:53 +01:00
scrawl	0fcec24c9b	Remove some bogus dependencies for travis build	2014-02-13 12:24:15 +01:00
scrawl	4e6507248b	Fix travis build	2014-02-13 12:19:21 +01:00
scrawl	d4a755d1aa	Fix some hardcoded literals	2014-02-13 11:15:55 +01:00
Marc Zinnschlag	9c52820754	Merge remote-tracking branch 'scrawl/master'	2014-02-13 10:54:51 +01:00
scrawl	c6fb0f2d9b	Removed terrain component's dependency on ESM	2014-02-13 10:13:53 +01:00
scrawl	fb0c5be536	Don't suppress git error output	2014-02-13 10:13:03 +01:00
Emanuel Guevel	8824af30b4	Allow to display message box outside of dialogue window	2014-02-11 18:26:57 +01:00
Marc Zinnschlag	ffd1783690	Merge remote-tracking branch 'mrcheko/master'	2014-02-11 17:03:50 +01:00
Marc Zinnschlag	e44a7268fc	Merge remote-tracking branch 'potatoesmaster/selected-spell'	2014-02-11 17:00:41 +01:00
Emanuel Guevel	a3eea4f6b6	Do not allow spellcasting stance without spell selected	2014-02-11 16:34:51 +01:00
Emanuel Guevel	70d35da116	Unset selected spell when removed	2014-02-11 16:34:23 +01:00
Emanuel Guevel	6a4820c0f7	Show a message when the player attempts to cast a disabled spell	2014-02-11 14:52:58 +01:00
Emanuel Guevel	8c8f4cd420	Fix typo	2014-02-10 22:53:16 +01:00
mrcheko	a6be72673c	improves animation-controlled velocity check	2014-02-08 16:59:15 +02:00
scrawl	8f949c6ae2	Fix lockpicks	2014-02-08 07:35:34 +01:00
scrawl	6ce499f0e6	Fixes #848: Use hardcoded animation velocity for first person movement	2014-02-06 04:05:22 +01:00
scrawl	ff11d85a62	Fix wrong assertion	2014-02-06 03:15:01 +01:00
scrawl	4a26909172	Fixes #1159: Don't allow quick keys menu in chargen	2014-02-05 12:15:49 +01:00
scrawl	677fc84223	Refactor actors update	2014-02-05 09:50:21 +01:00
scrawl	73c9efc5e3	Add generated version.hpp to gitignore	2014-02-05 08:48:15 +01:00
scrawl	0cc1cd8f7e	Fix message box formatting bug	2014-02-05 05:18:11 +01:00
scrawl	7907181c0c	Fix uninitialized member	2014-02-05 05:18:11 +01:00
scrawl	ffe19e7a52	Feature #50: Handle attach & release of projectiles	2014-02-05 05:18:11 +01:00
scrawl	8b8fb931a0	Feature #50: Don't allow ranged weapon attack when ammunition is empty	2014-02-05 05:18:10 +01:00
scrawl	a07eaa0c0d	Feature #50: Allow body pitch in third person for ranged weapon aiming	2014-02-05 05:18:10 +01:00
scrawl	5ee105c812	Fix typo	2014-02-05 05:18:10 +01:00
scrawl	7cf22391a5	Feature #50: Handle weapon controllers (i.e. bowstring animations, etc)	2014-02-05 05:18:10 +01:00
scrawl	975f0e05b4	Fixes #1157 (attribute layout issue)	2014-02-05 05:18:10 +01:00
scrawl	e1e7a492e2	Fix movement speed formula for flying creatures	2014-02-05 05:18:10 +01:00
scrawl	f608ceeffc	Fixes #1158 (Armor rating label issues)	2014-02-05 05:18:10 +01:00
scrawl	8aed4fcfa4	Correction for marksman weapon inventory preview	2014-02-05 05:18:10 +01:00
scrawl	5b076aa570	Revert "Bug #1074: Inventory paperdoll obscures armour rating" ... This reverts commit b017a3be3e.	2014-02-05 05:18:10 +01:00
scrawl	2c0d46525b	Fast-forward particle systems to make cell loads less obvious.	2014-02-05 05:18:09 +01:00
scrawl	cf3812188f	Fix bounding box assertions due to negative particle life time ... Other parts of the code could not deal with negative life times and produced negative particle sizes as a result (which Ogre could not handle)	2014-02-05 05:18:09 +01:00
scrawl	df78357e05	Handle knockout separately (Closes #1151)	2014-02-05 05:18:09 +01:00
mrcheko	688f359a33	discard creatures speed and negative fatique changes	2014-02-03 23:09:26 +02:00
Marc Zinnschlag	c5b92ed6c8	Merge remote-tracking branch 'pvdk/versioninfo'	2014-02-03 11:21:11 +01:00
Marc Zinnschlag	21f502df34	compatibility fix	2014-02-03 11:20:55 +01:00
pvdk	f263acdac6	Merge remote-tracking branch 'upstream/master' into versioninfo	2014-02-03 02:27:24 +01:00
Alexander "Ace" Olofsson	e50a393de4	Fix linking issues on Windows using MSVC.	2014-02-02 23:59:57 +01:00
pvdk	4e03e9cf87	Changed development version info text and the tooltip now works on all platforms	2014-02-02 20:10:47 +01:00