65 commits

Author	SHA1	Message	Date
Marc Zinnschlag	b46a2bfa01	Merge remote branch 'werdanith/journalmessage'	2012-03-19 19:34:28 +01:00
Marc Zinnschlag	f2a47d421b	some cleanup	2012-03-19 19:21:08 +01:00
Michael Papageorgiou	82c4bfbf18	Add a notification when the journal is updated	2012-03-19 20:18:08 +02:00
gugus	2707391535	fix for questions	2012-03-19 18:30:52 +01:00
gugus	ba4d44eb67	fix for questions.	2012-03-19 18:01:41 +01:00
gugus	1a832a65f6	Changed a lot of things. Topics can now change durring dialogue without bug. ... Missing: ability to remove keyword	2012-03-19 00:19:58 +01:00
gugus	ff5d4b24fc	journal filter works now	2012-03-18 21:47:43 +01:00
gugus	9c85a8c1ce	Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-18 19:06:52 +01:00
Marc Zinnschlag	ce2cb709c5	fixed getJournalIndex function	2012-03-18 19:05:35 +01:00
gugus	00d3bc9d23	every filters are check during dialogue now. There is a problem with journal.	2012-03-18 18:58:22 +01:00
gugus	7f2ff6f5f1	removed the TODO	2012-03-18 18:05:28 +01:00
gugus	4afe6dd235	death filter	2012-03-18 18:04:51 +01:00
gugus	48e6a42168	Merge branch 'dialogue' of https://github.com/zinnschlag/openmw.git into DialogueSystem ... Conflicts: apps/openmw/mwdialogue/dialoguemanager.cpp	2012-03-18 17:59:11 +01:00
gugus	34b33b78d2	better filters	2012-03-18 17:58:14 +01:00
Marc Zinnschlag	76b24d9d1a	fixed a compile error	2012-03-18 17:30:05 +01:00
gugus	8740354c80	inventory filter now use player inventory	2012-03-18 17:03:54 +01:00
gugus	019a28093b	better filters	2012-03-18 15:26:18 +01:00
Marc Zinnschlag	d9677cb33e	fixed problem with parsing optional string arguments	2012-03-18 14:27:49 +01:00
gugus	100c6a42a5	better default values for filters	2012-03-18 11:32:05 +01:00
scrawl	9d4f79bcfc	GCC compile fix	2012-03-17 15:24:47 +01:00
gugus	042d87f77f	a lot of clean up	2012-03-16 17:53:34 +01:00
gugus	91801e5cab	stop spamming messages	2012-03-16 17:39:14 +01:00
gugus	56a84b6a1a	choices works. The only thing remaining is the script arguments problems. ... Need a lot of clean up too.	2012-03-16 17:30:59 +01:00
gugus	07d8d654cd	one step toward function filters and end choices.	2012-03-14 18:47:29 +01:00
gugus	6f7752633a	there was no extension in the compiler context. Corrected. But Choice doesn't work.	2012-03-07 18:44:09 +01:00
Marc Zinnschlag	69f0ec99f1	implemented dialogue scripts	2012-03-05 16:56:14 +01:00
Marc Zinnschlag	65756db49e	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-03-05 11:34:16 +01:00
gugus	9716199d18	script "fix". I'm waiting for you Zini^^	2012-02-18 12:19:42 +01:00
gugus	c0bd86ce44	scripts. Not tested	2012-02-17 20:20:23 +01:00
gugus	232e478768	Fix for prefix/suffix stuff	2012-02-15 13:23:59 +01:00
Marc Zinnschlag	d66b6743f4	minor fix	2012-02-12 13:58:02 +01:00
gugus	4d4ae41a4a	greetings are working now	2012-02-11 12:19:02 +01:00
gugus	eee5d20809	a little fix	2012-02-10 22:54:17 +01:00
gugus	554bf8e586	Improvement in the dialogue manager	2012-02-10 22:01:31 +01:00
gugus	ea8335a393	addTopic function	2012-02-10 16:09:43 +01:00
gugus	e7ef39cabc	more improvements to dialogue filters. Some of them are still missing.	2012-02-09 19:27:15 +01:00
gugus	c65c160e7b	finished connecting the dialogue GUI and the dialogue manager	2012-02-05 12:25:23 +01:00
gugus	abe38e5f87	Started to weire the dialogue manager and the dialogue GUI	2012-02-05 10:54:56 +01:00
Marc Zinnschlag	33f8049a36	accessing topic index didn't work	2011-12-29 17:32:57 +01:00
Marc Zinnschlag	e18dde4571	added topic tracking	2011-04-26 20:48:36 +02:00
Marc Zinnschlag	7a1b215b6a	splitting of topic class from quest class	2011-04-26 20:39:59 +02:00
Marc Zinnschlag	3406d2fa89	removed redundant data from quest class	2011-04-26 20:22:50 +02:00
Marc Zinnschlag	944291d34f	added quest tracking to the journal	2011-04-26 20:08:37 +02:00
Marc Zinnschlag	65e43c448a	splitted StampedJournalEntry class off from JournalEntry	2011-04-22 11:16:39 +02:00
Marc Zinnschlag	f3fecdc627	quest entries are added to main journal now	2011-04-21 11:05:49 +02:00
Marc Zinnschlag	23464e4035	added interface and container for main journal	2011-04-19 11:02:22 +02:00
Marc Zinnschlag	5851e0a28c	added journal entry struct	2011-04-19 10:54:11 +02:00
Marc Zinnschlag	b40117449a	added journal script interface	2011-04-04 11:23:15 +02:00
Marc Zinnschlag	190f77f6c9	added journal class	2011-04-04 11:16:56 +02:00
Marc Zinnschlag	4a12be11bf	moved PlayerPos class from MWRender to MWWorld and renamed it to Player	2011-01-04 15:58:22 +01:00