1283 commits

Author	SHA1	Message	Date
Marc Zinnschlag	02e979ed4b	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-03-18 19:06:31 +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	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
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
Marc Zinnschlag	6f9d9c0f9e	another armour class detection fix	2012-03-15 15:05:14 +01:00
Marc Zinnschlag	7ab20c3eb1	fixed armour class detection	2012-03-15 14:36:12 +01:00
Marc Zinnschlag	c616d005e8	fixed a spelling mistake	2012-03-15 14:31:16 +01:00
Marc Zinnschlag	3c3fb8d706	Merge remote branch 'werdanith/activationsounds2' into equipment	2012-03-15 14:06:48 +01:00
Michael Papageorgiou	f7c7ed0ac7	Fix regression with locating sound files	2012-03-15 13:56:46 +02:00
gugus	07d8d654cd	one step toward function filters and end choices.	2012-03-14 18:47:29 +01:00
Marc Zinnschlag	81abd97753	Merge remote branch 'scrawl/weather'	2012-03-14 09:40:22 +01:00
Marc Zinnschlag	010c8e6041	Merge remote branch 'scrawl/viewingdistance'	2012-03-14 09:35:24 +01:00
Michael Papageorgiou	947288e13a	Merge master and rewrite around the new detection function	2012-03-14 00:38:44 +02:00
scrawl	e8267c7363	adjusted fog distance, prevents objects suddenly popping up on cell load	2012-03-13 22:14:35 +01:00
scrawl	8421fd2670	fixed a visual issue with the stars	2012-03-13 19:57:33 +01:00
Michael Papageorgiou	db9085ae59	Pickup sounds for weapons	2012-03-13 20:40:30 +02:00
Michael Papageorgiou	7c1475b723	Pickup sounds for potions, repair, gold, lights, rings	2012-03-13 20:01:55 +02:00
Michael Papageorgiou	34e18df0fe	Pickup sounds for apparatus, books, clothes, ingredients, lockpicks, misc and probes	2012-03-13 18:50:32 +02:00
scrawl	f46d9b094b	fix weather sounds sometimes playing in interiors	2012-03-13 17:25:07 +01:00
Michael Papageorgiou	6dddf8a3d5	Pickup sounds for armors	2012-03-13 18:05:38 +02:00
Marc Zinnschlag	cbbc295eb6	implemented new equipment functions in MWClass	2012-03-13 15:35:06 +01:00
Marc Zinnschlag	c314cddb1c	added getEquipmentSkill function to Class hierarchy	2012-03-13 14:27:13 +01:00
Marc Zinnschlag	ea336214de	more inventory sanity checks	2012-03-13 14:04:19 +01:00
Marc Zinnschlag	4b73116b9d	added getEquipmentSlots function to MWWorld::Class hierarchy	2012-03-13 13:50:11 +01:00
Marc Zinnschlag	635b7ec6cb	slot system	2012-03-13 13:31:11 +01:00
Michael Papageorgiou	703e484a92	Doors and Containers sounds, now in 3D	2012-03-13 14:17:49 +02:00