2044 commits

Author	SHA1	Message	Date
scrawl	899e35591c	Escape MyGUI markup codes in console output	2015-09-26 02:08:23 +02:00
Alexander "Ace" Olofsson	7d4125d97f	Fixes for building with unity build	2015-09-24 15:21:42 +02:00
Marc Zinnschlag	96880b4dfe	Merge remote-tracking branch 'scrawl/tabs'	2015-09-17 09:30:31 +02:00
Emmanuel Anne	29a84452ab	durations in tooltips : use "show effect duration" setting	2015-09-16 22:42:54 +02:00
scrawl	a47617c21f	Fix tab indentations in apps/ and components/	2015-09-16 20:45:37 +02:00
Emmanuel Anne	b0d373f7e6	durations in tooltips : water walking effects is seen differently ... so move the duration info out of this block...	2015-09-16 19:19:29 +02:00
Emmanuel Anne	1472711583	add duration to spell icons too ... and use gmststrings instead of direct strings in tooltips durations can display minutes and hours I don't know any effect lasting an hour or more but you never know...	2015-09-16 17:53:14 +02:00
Marc Zinnschlag	353d6973e2	Merge remote-tracking branch 'origin/master'	2015-09-08 08:27:00 +02:00
scrawl	0442bc98f3	Update sleep interruption formula according to wiki, thanks Hrnchamd	2015-09-07 22:31:11 +02:00
scrawl	fd48c1d6f4	Make the Equip script function "use" items (drink potion, use alchemy, etc)	2015-09-07 22:09:08 +02:00
scrawl	8aaba0af6f	Fix journal page navigation bug introduced by 7dd09dd637 (Fixes #2899)	2015-08-30 17:38:21 +02:00
Jordan Ayers	cd5bef958f	Remove dead code from alchemywindow. ... Also align some braces.	2015-08-24 07:43:30 -05:00
Marc Zinnschlag	a52b947efe	Merge remote-tracking branch 'dteviot/MagicEffectsRefactorDraft3'	2015-08-23 12:11:30 +02:00
scrawl	52d8bc555c	Add missing checks to see if spell still exists when loading a savegame (Bug #2883)	2015-08-21 14:24:49 +02:00
dteviot	77a1d947cc	extracted MWMechanics::getPlayer()	2015-08-21 21:12:39 +12:00
scrawl	af3b0cd883	Improve some error messages	2015-08-21 00:31:43 +02:00
Marc Zinnschlag	d436dc332b	Merge remote-tracking branch 'jeffreyhaines/gametimetracker'	2015-08-20 20:39:44 +02:00
Jeffrey Haines	f94d3237fc	Removed unused cmake import	2015-08-19 13:28:01 -04:00
Jeffrey Haines	61bb55aff4	Removed long int parameter	2015-08-19 13:23:40 -04:00
Jeffrey Haines	d91f197119	Time played display setting	2015-08-19 11:31:43 -04:00
Jeffrey Haines	69729046bf	Updated parameter name to reflect units	2015-08-19 10:11:40 -04:00
Jeffrey Haines	e86891d6e1	Time played displayed in save/load menus	2015-08-19 10:05:08 -04:00
scrawl	67bd6cd708	Remove empty line at the beginning of files ... git ls-files -z | xargs -0 sed -i '1{/^$/d}'	2015-08-18 23:06:12 +02:00
scrawl	9fad33cd14	Don't reset the item model's sort/filter options in updatePlayer (Fixes #2863)	2015-08-16 17:49:53 +02:00
scrawl	c8d6679a25	Remove an unused function	2015-08-16 17:40:20 +02:00
scrawl	afb3d94ba4	Fix cell names in the save/load menu not being localised (Fixes #2840)	2015-08-16 01:55:14 +02:00
scrawl	c25dacb480	Fix "Level" string in the save/load menu not being localised (Bug #2840)	2015-08-16 01:53:58 +02:00
scrawl	7dd09dd637	Fix being able to flip journal pages with the mousewheel when the options overlay is active (Fixes #2855)	2015-08-15 20:44:15 +02:00
scrawl	c57e72fe03	Adjust the sleep interruption chance (Fixes #2781)	2015-08-15 16:09:53 +02:00
scrawl	e8c9d3ea2a	Fix cell names on world map not always being translated (Fixes #2832)	2015-08-13 17:08:21 +02:00
scrawl	0d8f07d563	Properly apply changes when backing out of chargen dialogs (Fixes #2627)	2015-08-13 17:08:21 +02:00
Marc Zinnschlag	d2cd151f77	Merge remote-tracking branch 'kunesj/master'	2015-07-20 09:45:14 +02:00
Jiří Kuneš	a14a3c82de	added description of new syntax to the onRetrieveTag function comment	2015-07-19 19:52:50 +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	77f1387da8	Include cleanup	2015-07-18 20:36:28 +02:00
Jiří Kuneš	75f5972898	show owned - better settings	2015-07-18 17:13:20 +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	b3ad983f1f	Merge remote-tracking branch 'scrawl/version' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2015-07-18 12:22:37 +02:00
Marc Zinnschlag	edde1fb727	Merge remote-tracking branch 'scrawl/master'	2015-07-18 11:40:36 +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	6e493500c9	Show custom map markers on the tooltip of the world map marker (Fixes #2711)	2015-07-18 00:14:11 +02: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
Jiří Kuneš	72728b9c01	disable cusor when item/container is owned	2015-07-17 16:32:35 +02:00