14558 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	23bfa29ae6	Merge pull request #677 from Koncord/fix-def-conflict ... Fix definition conflict	2015-07-19 19:40:34 +02:00
Koncord	7924ecef3e	Fix definition conflict	2015-07-19 23:37:20 +09:00
Marc Zinnschlag	9b3d5c958f	Merge remote-tracking branch 'scrawl/music'	2015-07-19 11:49:00 +02:00
Marc Zinnschlag	137d5e2586	Merge remote-tracking branch 'scrawl/master'	2015-07-19 11:46:06 +02:00
dteviot	00eef585af	renamed mPlayedIdle to mIdleAnimation.	2015-07-19 18:04:42 +12:00
dteviot	22f49128cc	replaced multiple booleans with single state variable.	2015-07-19 18:02:13 +12:00
dteviot	1ed6e95c07	Got rid of some radians to degrees to radians conversions.	2015-07-19 18:01:25 +12:00
dteviot	3ebe9fb34f	renamed mRotate to mTurnActorGivingGreetingToFacePlayer	2015-07-19 18:00:49 +12:00
scrawl	b01abe4d19	Stop title music when the game starts (Fixes #2468)	2015-07-19 02:08:24 +02:00
scrawl	1156668843	Render certain map markers on top of the player arrow (Fixes #2559)	2015-07-19 00:45:02 +02:00
Jiří Kuneš	a5b4e087c5	define owned colours in settings.cfg	2015-07-18 22:17:46 +02:00
Jiří Kuneš	cbc44b33ba	define crosshair owned colour in openmw_hud_box.skin.xml	2015-07-18 21:29:38 +02:00
scrawl	278a078e9d	Unify magic effect tick functions ... - Removes duplicated code - Handle some zero-duration instant effects that were not handled before (disintegrate, sun damage, elemental damage)	2015-07-18 20:39:45 +02:00
scrawl	77f1387da8	Include cleanup	2015-07-18 20:36:28 +02:00
Marc Zinnschlag	833ad5a2b4	Merge remote-tracking branch 'origin/master'	2015-07-18 17:48:05 +02:00
Marc Zinnschlag	cdfa3006a3	incorrect sBribe GMSTs for new omwgame files (Fixes #2785)	2015-07-18 17:47:50 +02:00
Marc Zinnschlag	b2ab0122ab	Merge branch 'scriptbuttons'	2015-07-18 17:37:43 +02:00
Jiří Kuneš	75f5972898	show owned - better settings	2015-07-18 17:13:20 +02:00
Marc Zinnschlag	f1ac440b78	do not allow editing of deleted scripts	2015-07-18 17:00:00 +02:00
Jiří Kuneš	df077f8649	color tooltip red when taking item would result in crime	2015-07-18 16:56:57 +02:00
Marc Zinnschlag	8763a3b3c3	make compilation delay configurable via a user setting	2015-07-18 15:32:38 +02:00
scrawl	111cf5462b	Merge pull request #666 from scrawl/animation ... Animation refactoring & fixes	2015-07-18 13:33:41 +02:00
Marc Zinnschlag	73b6df8280	put script compilation in script subview behind a timer	2015-07-18 13:09:17 +02:00
Marc Zinnschlag	4fa2cd288d	Merge branch 'openmw-36' ... Conflicts: apps/openmw/mwworld/store.hpp	2015-07-18 12:47:05 +02:00
Marc Zinnschlag	b3ad983f1f	Merge remote-tracking branch 'scrawl/version' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2015-07-18 12:22:37 +02:00
Marc Zinnschlag	e921552053	Merge remote-tracking branch 'scrawl/opencs'	2015-07-18 11:58:20 +02:00
Marc Zinnschlag	edde1fb727	Merge remote-tracking branch 'scrawl/master'	2015-07-18 11:40:36 +02:00
Marc Zinnschlag	39ab9948f6	updated credits file	2015-07-18 11:40:18 +02:00
Marc Zinnschlag	964cd44e96	Merge remote-tracking branch 'kunesj/master'	2015-07-18 11:34:04 +02:00
scrawl	05d2790601	Merge pull request #672 from slothlife/windows-icon-fix ... Fix for loading window icon on Windows	2015-07-18 05:00:23 +02:00
slothlife	f8f0380413	Fix for loading window icon on Windows	2015-07-17 21:41:53 -05:00
scrawl	58720e6a28	Fix the OpenCS rendering crash on exit (Fixes #2735)	2015-07-18 03:52:48 +02:00
scrawl	753d35b0de	Merge pull request #667 from slothlife/static-deps-build ... Add support for linking OpenSceneGraph statically and fixes for MyGUI and QT static linking	2015-07-18 03:28:07 +02:00
scrawl	a33ca75742	Pass AnimPriority by const reference	2015-07-18 03:23:41 +02:00
scrawl	f09e4620b6	Move OpenMW version information to a textfile instead of compiling it in ... Now we don't need to recompile 3 .cpp files and re-link whenever the current git HEAD changes.	2015-07-18 03:09:04 +02:00
scrawl	c783b50a83	Fix config file priority in the launcher to match OpenMW	2015-07-18 01:38:35 +02:00
scrawl	6e493500c9	Show custom map markers on the tooltip of the world map marker (Fixes #2711)	2015-07-18 00:14:11 +02:00
slothlife	420789baa9	Remove an unused include	2015-07-17 15:26:04 -05:00
slothlife	1b3cc957f8	Move some OSG static library setup code	2015-07-17 15:13:43 -05:00
scrawl	41bed4c7d9	Use multimap to speed up custom map marker code	2015-07-17 20:49:10 +02:00
Jiří Kuneš	4a6d806127	fixed comment, save settings to member variable, removed usless include, changed variable to const	2015-07-17 20:30:00 +02:00
Jiří Kuneš	e68b388d16	removed setCrosshairOwned from windowmanager	2015-07-17 19:13:45 +02:00
Jiří Kuneš	c019f8e23d	use correct mechanics manager	2015-07-17 18:49:47 +02:00
Jiří Kuneš	15107ca5cf	crosshair owned - settings option	2015-07-17 17:48:38 +02:00
Jiří Kuneš	66edae9b93	change collor of crosshair	2015-07-17 17:29:00 +02:00
slothlife	df99d5a59d	Move setup code for OSG when statically linked	2015-07-17 09:56:21 -05:00
Jiří Kuneš	72728b9c01	disable cusor when item/container is owned	2015-07-17 16:32:35 +02:00
Marc Zinnschlag	5febb96012	do not try to jump to source location for errors that do not have a source location	2015-07-17 13:59:50 +02:00
Marc Zinnschlag	f665919046	consider column when jumping to error in source text	2015-07-17 13:53:22 +02:00
Marc Zinnschlag	0abd29a3b4	jump to line in source text when clicking on an error in error table	2015-07-17 13:42:25 +02:00