76 commits

Author	SHA1	Message	Date
scrawl	7ebbc099b3	allow stacking gui modes	2012-05-23 12:23:35 +02:00
Marc Zinnschlag	3e85151c9d	Merge remote branch 'scrawl/inventoryGUI' ... Conflicts: apps/openmw/CMakeLists.txt	2012-05-21 10:13:27 +02:00
scrawl	76d71f86bc	fixed a faction case folding issue	2012-05-21 03:10:55 +02:00
scrawl	ee884634b9	fixed item refID handling in the dialogue manager and container script extensions.	2012-05-19 13:19:26 +02:00
scrawl	5da4da820e	beginnings of trade window layout.	2012-05-17 17:15:44 +02:00
scrawl	0dc5e5919b	show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.	2012-05-17 14:54:03 +02:00
scrawl	c4aae96d94	implemented "goodbye" script function that force-cancels dialogue	2012-05-11 07:18:41 +02:00
scrawl	dc378fc6cf	allow talking with creatures	2012-05-03 06:07:41 +02:00
scrawl	eca18f3e1d	dialogue topic and choice sorting independent of case	2012-04-29 18:13:03 +02:00
Marc Zinnschlag	7ac9523e0c	Merge branch 'master' into next	2012-04-23 15:32:02 +02:00
Marc Zinnschlag	35f478071e	Issue #255: deleted the old environment class and using the new one instead	2012-04-23 15:27:03 +02:00
Marc Zinnschlag	cc86998281	removing some cout spam	2012-04-21 10:12:59 +02:00
scrawl	8231cab599	correct case for dialogue topics	2012-04-17 23:47:50 +02:00
gugus	7edc5c733c	corrected a bug about rank.	2012-04-12 17:29:05 +02:00
gugus	0553227ee1	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into Factions2 ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/player.cpp apps/openmw/mwworld/player.hpp	2012-04-09 14:43:35 +02:00
gugus	45d11eaf14	fixed a bug in the dialogue manager.	2012-04-09 14:23:12 +02:00
gugus	e5b1e27fa6	pcRaiseRank works. Player can now join factions.	2012-04-09 13:24:19 +02:00
gugus	2c7c945208	check playerfaction during dialogue	2012-04-04 22:13:57 +02:00
Marc Zinnschlag	e403c7158a	Merge remote branch 'gus/DialogueSystem'	2012-04-03 18:27:36 +02:00
gugus	a268b89239	changed the way NPC faction is checked. Should be the same way for the player.	2012-04-03 17:31:41 +02:00
gugus	319022d962	speed up dialogue start-up.	2012-03-23 15:24:39 +01:00
Marc Zinnschlag	1023ddd587	silenced some warnings	2012-03-20 10:30:21 +01:00
Marc Zinnschlag	6a0474a977	removed some cout spam	2012-03-20 10:15:22 +01:00
Marc Zinnschlag	aca274cbca	Merge remote branch 'gus/DialogueSystem'	2012-03-20 10:11:40 +01:00
gugus	7a1ff61541	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 21:31:36 +01:00
Marc Zinnschlag	f2a47d421b	some cleanup	2012-03-19 19:21:08 +01:00
gugus	d4f3430fc6	fix: topics who should not be displayed are not displayed anymore.	2012-03-19 19:17:20 +01: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	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