3583 commits

Author	SHA1	Message	Date
Pieter van der Kloet	1b9cf8c23f	More work on integrating the settings parser, profiles are handled correctly	2013-02-15 01:20:48 +01:00
Pieter van der Kloet	5d1bede9e5	Forgot to add two files	2013-02-14 11:20:47 +01:00
Pieter van der Kloet	aa25471517	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
Pieter van der Kloet	25edba0887	Rewriting the config code of the pages to use the new settings classes	2013-01-27 16:39:51 +01:00
Pieter van der Kloet	5579df30ff	Implemented data/data-local support and added settingshandlers to main.cpp	2013-01-26 18:19:04 +01:00
Pieter van der Kloet	6faf6f57e1	Added settings file reader/writers for openmw.cfg and settings.cfg	2013-01-25 05:19:06 +01:00
Marc Zinnschlag	90d05858ef	disabling dialogue sub-views for now	2013-01-22 11:50:08 +01:00
Marc Zinnschlag	cd662af634	Merge branch 'globals'	2013-01-22 11:47:24 +01:00
Marc Zinnschlag	2756d3ee94	Merge remote-tracking branch 'wheybags/containerscripts'	2013-01-21 23:02:45 +01:00
Tom Mason	f5f3c2e62d	enabling / disabling should not affect scripts	2013-01-21 20:06:08 +00:00
Tom Mason	31c71c029d	objects with scripts attached, that are inside containers will behave correctly when the container is moved	2013-01-20 17:01:30 +00:00
Emanuel Guevel	736e471613	Print a fallback text when no topic response is found	2013-01-20 17:44:09 +01:00
Emanuel Guevel	43e85ea0c6	Disallow redirection to info refusal for greetings	2013-01-20 17:44:09 +01:00
Emanuel Guevel	05796d85a4	NPC: take stats from NPDT12 into account ... Some available stats (level, reputation and disposition) were not used for NPC with auto-calculated stats.	2013-01-20 17:44:08 +01:00
Emanuel Guevel	951eb1b236	Dialogue: return a response from "Info Refusal" when disposition is not satisfied	2013-01-20 17:44:08 +01:00
Tom Mason	23dada0ee4	moved script handling on enable / disable into their own functions	2013-01-20 16:38:56 +00:00
Tom Mason	28c580d280	disabling and enabling containers causes scripts on contents to be disabled and enabled accordingly	2013-01-20 15:43:52 +00:00
Tom Mason	abe25c5f66	removed use of c++11 auto	2013-01-20 14:24:55 +00:00
Tom Mason	665a530e10	renamed realAdd to addImp	2013-01-20 14:14:34 +00:00
Tom Mason	3c6ddd7fa7	fixed isInCell method	2013-01-20 14:10:04 +00:00
Nathan Jeffords	f55da17933	made some journal accessor methods constant	2013-01-19 16:21:41 -08:00
Nathan Jeffords	4c7ae3d1ff	prevent duplicate journal entries from being recorded	2013-01-19 16:21:15 -08:00
Nathan Jeffords	528c3da6da	record heard topics in journal	2013-01-19 16:20:22 -08:00
Nathan Jeffords	d6b956cdcf	fixed swapped day & month fields when created a stamped journal entry	2013-01-19 16:19:03 -08:00
Marc Zinnschlag	2d96f52864	select correct record when opening a dialogue sub view	2013-01-19 14:29:14 +01:00
Marc Zinnschlag	82b790770d	Merge remote-tracking branch 'potatoesmaster/dialogue-creatures'	2013-01-17 10:21:01 +01:00
Emanuel Guevel	4feaa66897	Do not open the dialogue window if no greeting is found	2013-01-17 01:58:44 +01:00
Marc Zinnschlag	7b568cbb15	Merge remote-tracking branch 'potatoesmaster/dialogue'	2013-01-16 22:03:40 +01:00
Marc Zinnschlag	312f68bf9c	Merge remote-tracking branch 'thoronador/fix-spelling'	2013-01-16 12:28:33 +01:00
Thoronador	3220330ce0	fix spelling in comment	2013-01-16 04:19:16 +01:00
Emanuel Guevel	9e00c6694f	Allow only ID filtered topics for dialogue with creatures	2013-01-15 21:40:44 +01:00
Chris Robinson	8a073c113e	Use const references where appropriate	2013-01-15 12:07:15 -08:00
Chris Robinson	8361192b64	Use typedefs for some maps and some cleanup	2013-01-15 11:10:41 -08:00
Marc Zinnschlag	3053440462	Issue #539: fixed AiWander	2013-01-15 12:40:44 +01:00
Emanuel Guevel	82287445af	DialogueWindow: do not execute onFrame() when not visible	2013-01-15 00:59:48 +01:00
Emanuel Guevel	f1f9173f24	Prevent closing dialogue window when an answer is expected	2013-01-15 00:53:32 +01:00
Tom Mason	6fc64e8a4e	scripts run for items added to containers, and scripted items in player inv handled correctly	2013-01-13 19:49:56 +00:00
Tom Mason	7c8b3f1239	Merge remote-tracking branch 'real/master'	2013-01-13 17:07:18 +00:00
Tom Mason	c138e00aa2	objects scripts are now stopped when they are removed from a container	2013-01-13 17:05:12 +00:00
Marc Zinnschlag	654cd3ab9b	Issue #479: Use magnitude specified when adding disease	2013-01-13 14:52:55 +01:00
Tom Mason	d4ca954d47	scripts on items in containers added to script list on cell change	2013-01-12 18:31:57 +00:00
Marc Zinnschlag	f4ee8e2642	Issue #479: Added additional magnitude parameter to known spells	2013-01-12 13:10:20 +01:00
scrawl	ed3c23ad9a	Fixed crash on changing cell due to Utf8Encoder going out of scope	2013-01-12 01:18:36 +01:00
Marc Zinnschlag	101810d1e8	Merge remote-tracking branch 'scrawl/ingredients'	2013-01-11 11:12:07 +01:00
Nathan Jeffords	d5ebd6654d	cache loaded NIF files to eliminate reloads ... Created a NIF file caching mechanism to prevent the system from reloading a NIF during a startup and cell changes.	2013-01-10 21:47:02 -08:00
Nathan Jeffords	d469415e59	factored out two function from OMW::Engine::go ... The initialization code inside Engine::go is now in two function it calls prior to running the main loop.	2013-01-10 21:32:24 -08:00
scrawl	c71656493d	Ingredient effects now correctly hide until the player has discovered them	2013-01-11 01:23:24 +01:00
Marc Zinnschlag	274ff530dc	Merge remote-tracking branch 'wheybags/master'	2013-01-10 11:53:42 +01:00
Marc Zinnschlag	6e0b86c6f9	Merge remote-tracking branch 'potatoesmaster/getdisposition'	2013-01-10 01:29:02 +01:00
Tom Mason	8486a51535	fixed drop amounts thanks to zinnschlag	2013-01-09 22:55:28 +00:00