715 commits

Author	SHA1	Message	Date
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Marc Zinnschlag	bb6d9a329c	Merge remote-tracking branch 'scrawl/book_skillgain' into next	2012-09-26 20:35:48 +02:00
scrawl	caef570c8a	fix the weather not changing when sleeping/waiting	2012-09-25 21:49:34 +02:00
scrawl	d163f8203c	change books to RecListWithIDT	2012-09-25 21:38:34 +02:00
scrawl	853d62adba	book skillgain	2012-09-25 18:59:24 +02:00
greye	807a56c9e4	fix dynamic potion id	2012-09-23 19:29:00 +04:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	9106e5307c	moved global map from RenderingManager to gui and removed world method	2012-09-21 14:11:01 +02:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	a3c680d20a	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-19 09:41:32 +02:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	ab698bb401	date time label	2012-09-18 20:53:32 +02:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
Marc Zinnschlag	4469976be9	Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-09-18 10:44:25 +02:00
gugus	032ff7c879	Clean-up. There is still a little bug.	2012-09-17 13:36:48 +02:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Jason Hooks	192d634098	Movement keys; View angles	2012-09-16 13:19:38 -04:00
Jason Hooks	76f2a82884	More pmove stuff; Turned off broadphase, we could not fall in exteriors	2012-09-15 22:48:24 -04:00
Jason Hooks	f586f53a42	positioning	2012-09-15 16:45:50 -04:00
scrawl	9cf1cbc89b	remove book skill gain	2012-09-15 20:03:53 +02:00
scrawl	3e5ab069a6	remove the const cast	2012-09-15 19:52:18 +02:00
Jason Hooks	02bca98e9f	Setrotate working	2012-09-15 13:23:49 -04:00
scrawl	f5237ff1a6	skill gain from books	2012-09-15 19:06:56 +02:00
scrawl	2793096b50	Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/world.hpp apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwrender/renderingmanager.hpp apps/openmw/mwworld/worldimp.cpp apps/openmw/mwworld/worldimp.hpp	2012-09-15 00:57:29 +02:00
Marc Zinnschlag	b7c9285b24	added support for out of world rendering	2012-09-14 21:12:16 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	d90af9c524	Merge branch 'master' into characterpreview	2012-09-13 14:22:17 +02:00
Marc Zinnschlag	835c530e06	Merge branch 'ingredients'	2012-09-13 13:31:46 +02:00
Marc Zinnschlag	fe68a252d5	Issue #356: Implemented ingredient eating	2012-09-13 13:02:26 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
Jason Hooks	a1a7733730	Set scale implemented	2012-09-12 18:30:32 -04:00
scrawl	2f0b47fc38	test	2012-09-13 00:21:58 +02:00
scrawl	d5a08e31e7	scene does not disappear anymore during load	2012-09-11 17:36:20 +02:00
scrawl	2b339f6c0f	loading screen	2012-09-11 16:37:54 +02:00
Jason Hooks	23777033fd	Starting to implement new PhysicActor	2012-09-05 17:44:11 -04:00
Marc Zinnschlag	0879abb948	Merge branch 'actiontarget'	2012-09-04 20:56:40 +02:00
Marc Zinnschlag	da041f902f	Issue #370: fixed item taking sound	2012-09-04 20:56:28 +02:00
Marc Zinnschlag	fb8aae243d	Issue #370: replaced custom target handling in talk action with base class implementation	2012-09-04 15:38:21 +02:00
Marc Zinnschlag	8ed8dd649a	Issue #370: replaced custom target handling in take action with base class implementation	2012-09-04 15:34:44 +02:00
Marc Zinnschlag	ea1c3fe1e4	Issue #370: replaced custom target handling in open action with base class implementation	2012-09-04 15:29:51 +02:00
Marc Zinnschlag	8c2b4f996c	Issue #370: replaced custom target handling in equip action with base class implementation	2012-09-04 15:27:10 +02:00
Marc Zinnschlag	b51c42146f	Issue #370: replaced custom target handling in read action with base class implementation	2012-09-04 15:24:55 +02:00
Marc Zinnschlag	3f181f9a9d	Issue #370: Support for targets in containers	2012-09-04 15:21:56 +02:00
Marc Zinnschlag	cc55056adf	Issue #370: replaced custom target handling in apply action with base class implementation	2012-09-04 15:18:59 +02:00
Marc Zinnschlag	733654d730	Issue #370: implemented target handling in action base class	2012-09-04 15:14:33 +02:00
Marc Zinnschlag	1cecab6e3d	fixed RefData::getHandle	2012-09-04 15:08:59 +02:00