1127 commits

Author	SHA1	Message	Date
Roman Melnik	88979577db	Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)	2012-03-19 21:45:53 +02:00
Roman Melnik	a9759c3f33	Fix bug #192: Remove the focus from the console when console is closed ... (set current keyFocusWidget to nullptr)	2012-03-19 21:01:00 +02:00
Marc Zinnschlag	f2a47d421b	some cleanup	2012-03-19 19:21:08 +01:00
gugus	2707391535	fix for questions	2012-03-19 18:30:52 +01:00
gugus	11569819db	compilation fix	2012-03-19 18:01:54 +01:00
gugus	ba4d44eb67	fix for questions.	2012-03-19 18:01:41 +01:00
gugus	7ca0503205	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 00:20:43 +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
Michael Papageorgiou	d10b18b0f3	Removed a couple of warnings with nosound	2012-03-18 22:50:52 +02:00
gugus	ff5d4b24fc	journal filter works now	2012-03-18 21:47:43 +01:00
Michael Papageorgiou	f567950e25	Fix for the --nosound crash	2012-03-18 22:38:53 +02:00
Marc Zinnschlag	af39275a63	Merge remote branch 'scrawl/weather'	2012-03-18 21:07:04 +01:00
scrawl	c2329b7027	removed preprocessor constants	2012-03-18 20:32:50 +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
Marc Zinnschlag	655f9fe920	Merge remote branch 'k1ll/staticogre'	2012-03-18 11:16:34 +01:00
Marc Zinnschlag	af875896ad	fix for issue #179	2012-03-18 11:09:38 +01:00
Marc Zinnschlag	187b8e58d6	fixed handling of optional instruction/function arguments; removed choice workaround	2012-03-17 19:32:44 +01:00
gugus	f87bd65ae1	Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem	2012-03-17 17:00:28 +01:00
gugus	846196d048	fixed a crash	2012-03-17 16:56:22 +01:00
scrawl	21143f006b	fix several warnings	2012-03-17 15:47:22 +01:00
scrawl	9d4f79bcfc	GCC compile fix	2012-03-17 15:24:47 +01:00
Michael Papageorgiou	dbbf50a184	Journal sounds, close sound will be added later	2012-03-17 15:52:57 +02:00
scrawl	1840401172	weather transitions (e.g. from clear to cloudy) use timescale	2012-03-17 13:14:31 +01:00
scrawl	3ae69f792a	no light-"jumps" during night	2012-03-17 12:57:52 +01:00
scrawl	5ea2122f79	sun gradually disappears	2012-03-16 20:39:58 +01:00
scrawl	d18b3271b1	transition tweak 2	2012-03-16 20:32:41 +01:00
scrawl	460b584934	transition tweaks	2012-03-16 19:49:01 +01:00
scrawl	a67cc8e73b	more fixes	2012-03-16 19:02:33 +01:00
gugus	10321ff51a	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-16 17:58:23 +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
Michael Papageorgiou	b2c6d52db1	Another file search fix	2012-03-16 09:00:18 +02:00
scrawl	877cb2aca7	much better looking moons	2012-03-15 20:35:23 +01:00
scrawl	e354203c21	stars rotation	2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson	e8eea03b4c	Fixed a few more non-virtual destructor warnings	2012-03-15 17:40:42 +01:00
Marc Zinnschlag	a7211d2a90	Merge remote branch 'werdanith/searchfix'	2012-03-15 16:54:29 +01:00
Michael Papageorgiou	588ac44bc7	Improved matching for the FileListLocator	2012-03-15 17:32:10 +02:00
Marc Zinnschlag	5b378e820d	warning level adjustments and some related fixes	2012-03-15 16:01:41 +01:00