1327 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	d9945a976d	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-02-12 13:47:04 +01:00
Marc Zinnschlag	facc36fa34	Merge remote branch 'corristo/osx-packaging' into packaging	2012-02-12 13:35:54 +01:00
Marc Zinnschlag	a0ac6e5150	cells were sometimes not fully loaded	2012-02-12 12:35:29 +01:00
gugus	4d4ae41a4a	greetings are working now	2012-02-11 12:19:02 +01:00
gugus	4658ec276f	increased the max size of the text of the dialogue	2012-02-11 12:18:47 +01:00
gugus	eee5d20809	a little fix	2012-02-10 22:54:17 +01:00
gugus	f1dc360720	added the script instruction addTopic	2012-02-10 22:02:24 +01:00
gugus	554bf8e586	Improvement in the dialogue manager	2012-02-10 22:01:31 +01:00
Pieter van der Kloet	eea8773be1	Changed the order of preference for the configuration files	2012-02-10 21:45:46 +01:00
Marc Zinnschlag	bc71fb47e0	minor fix	2012-02-10 21:24:33 +01:00
Pieter van der Kloet	17b1546dc1	Changed the way screenshots are created (Bug #191)	2012-02-10 20:23:59 +01:00
gugus	94ab65f8bb	fixe a compiling error?	2012-02-10 16:21:04 +01:00
gugus	ea8335a393	addTopic function	2012-02-10 16:09:43 +01:00
Marc Zinnschlag	bb7730a708	Merge branch 'lightfix'	2012-02-10 14:55:52 +01:00
gugus	597e670eef	corrected the light problem	2012-02-10 14:51:49 +01:00
Marc Zinnschlag	00ac2deefb	Merge remote branch 'pvdk/cmakeogre' into cmakeogre	2012-02-10 14:36:34 +01:00
Marc Zinnschlag	b878c87ba8	Merge branch 'renderingfix'	2012-02-10 14:33:27 +01:00
gugus	e7ef39cabc	more improvements to dialogue filters. Some of them are still missing.	2012-02-09 19:27:15 +01:00
gugus	f76e0e1941	corrected the light problem	2012-02-08 00:32:22 +01:00
Marc Zinnschlag	c4e028effe	fixing a faulty include	2012-02-06 10:48:58 +01:00
Marc Zinnschlag	0b0254d30e	spelling fix	2012-02-06 10:48:14 +01:00
Marc Zinnschlag	784c6fe0ff	some cleanup	2012-02-06 10:41:13 +01:00
Marc Zinnschlag	e1600d9a2a	fixed movable object cleanup for ordinary objects	2012-02-06 10:29:18 +01:00
Marc Zinnschlag	c471aa950f	re-enabled batching for statics; fixed a misplaced assert	2012-02-06 09:42:24 +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	ee02154805	lights without a mesh were not rendered	2012-02-04 10:48:15 +01:00
Marc Zinnschlag	52a6605f10	Merge remote branch 'mirc/refactor_wm' into refactor_wm ... - changed the way dynamics stats are passed to the character creation object - some more clean up Conflicts: .gitignore apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp	2012-02-03 11:24:28 +01:00
Cris Mihalache	4bc7051741	Finished refactoring, brought CharacterCreation up to standards	2012-02-02 18:31:28 +02:00
Nikolay Kasyanov	472d88e2c5	Feature #162 - Need to create app bundle using CMake, not by hand WIP	2012-02-01 20:48:13 +04:00
Cris Mihalache	ed5892eb5c	Finished moving the bulk of character creation code	2012-01-30 21:53:17 +02:00
Cris Mihalache	d17ba6ce19	Forgot the CharacterCreation files	2012-01-30 19:27:49 +02:00
Cris Mihalache	4b758376be	Created a class for char gen, and starting moving code to it	2012-01-30 16:38:43 +02:00
Marc Zinnschlag	78b6ceabc7	Merge branch 'refdata' into equipment	2012-01-30 12:38:55 +01:00
Marc Zinnschlag	e19cea3e7b	Merge branch 'refdata' into next	2012-01-30 12:38:35 +01:00
Marc Zinnschlag	a4785ffc4f	minor fix	2012-01-30 12:38:13 +01:00
Jason Hooks	2d0e83a2cf	Reversing changes	2012-01-30 00:06:29 -05:00
Jason Hooks	d2b3c1dbac	Collision may be working correctly	2012-01-29 18:13:43 -05:00
Jason Hooks	9c73fa6b6d	Physics sort of fixed	2012-01-29 17:50:51 -05:00
Nikolay Kasyanov	a301fc355e	Feature #162 - Need to create app bundle using CMake, not by hand In progress. Still need to handle dynamically loaded libs (Ogre & Qt plugins)	2012-01-29 23:41:27 +04:00
Marc Zinnschlag	5a70f28f47	removed a warning	2012-01-29 20:29:02 +01:00
Lukasz Gromanowski	b004e2479c	Issue #133 Handle resources across multiple data directories - WIP ... Work In Progress - added support for multiple paths in SoundManager. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-01-29 20:27:03 +01:00
Marc Zinnschlag	81d0d58346	Merge remote branch 'mirc/master' into openengine	2012-01-29 20:25:11 +01:00
Cris Mihalache	daa8fb15ce	Removed all physics-related code from Engine	2012-01-29 20:51:20 +02:00
Cris Mihalache	6d4fa9274e	Moved OpenEngine systems into their appropriate classes	2012-01-29 17:31:18 +02:00
Jason Hooks	1da519a914	Some cleanup	2012-01-29 00:42:55 -05:00
gugus	5cbd256e1c	"full" question support. Now needs to be linked with the dialogue Manager.	2012-01-28 16:16:49 +01:00
gugus	debec44b51	better colors (not perfect yet), and some basic question support (not finished yet).	2012-01-28 16:08:22 +01:00
Marc Zinnschlag	0d7f39fcb5	Merge branch 'refdata' into next	2012-01-28 11:46:34 +01:00
Marc Zinnschlag	f2972b1ca0	turned ContainerStore from a template into a simple struct	2012-01-28 11:45:55 +01:00