14459 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	7f66339790	Remove a redundant function	2015-07-24 20:23:27 +02:00
scrawl	71bc22401f	Include cleanup	2015-07-24 18:23:23 +02:00
scrawl	7e4e59efb9	Fix excessive auto-equipping in InventoryStore::removeItem (Fixes #2792)	2015-07-23 02:29:09 +02:00
scrawl	7900631d51	Print the missing player cell to error output	2015-07-23 02:29:09 +02:00
scrawl	8286dc6c5a	Player followers don't report crimes (Fixes #2457)	2015-07-23 02:29:09 +02:00
Marc Zinnschlag	3c3bd7976e	updated credits file	2015-07-22 08:36:06 +02:00
Marc Zinnschlag	6e3032efc1	Merge remote-tracking branch 'koncord/fix-gold-beh'	2015-07-22 08:30:43 +02:00
Koncord	6c3c85f0d4	Fix indent ... Remove misc.hpp in containerstore.cpp	2015-07-20 21:53:20 +09:00
Marc Zinnschlag	0cd0717e13	Merge remote-tracking branch 'origin/master'	2015-07-20 10:03:50 +02:00
Marc Zinnschlag	f3d3cbc58b	Merge remote-tracking branch 'dteviot/refactoringAiWander'	2015-07-20 09:57:46 +02:00
Marc Zinnschlag	d2cd151f77	Merge remote-tracking branch 'kunesj/master'	2015-07-20 09:45:14 +02:00
dteviot	2a4d35b98c	fixed "comma at end of enumerator list" warning.	2015-07-20 18:20:57 +12:00
Koncord	7a86c8d8b6	Fix OpAddItem, OpGetItemCount and OpRemoveItem.	2015-07-20 12:48:19 +09:00
Koncord	a24df8cb66	Revert addImp() and remove() ... add isGold() in MWWorld::Class	2015-07-20 12:43:58 +09:00
Koncord	9485aa5e44	Fix "removeitem gold_100" behavior	2015-07-20 09:53:08 +09:00
Koncord	aefcd1ad07	Fix "additem gold_100" behavior	2015-07-20 08:20:28 +09:00
Koncord	75e5023590	fix code duplication	2015-07-20 08:06:43 +09:00
Jiří Kuneš	a14a3c82de	added description of new syntax to the onRetrieveTag function comment	2015-07-19 19:52:50 +02:00
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