309 commits

Author	SHA1	Message	Date
scrawl	75b336baea	Merge branch 'physicsaedra2' of https://github.com/jhooks1/openmw into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp apps/openmw/mwworld/player.cpp libs/openengine/bullet/physic.cpp	2012-04-18 13:43:15 +02:00
Jason Hooks	4d07ae7fe0	Swimming working	2012-04-18 00:13:38 -04:00
scrawl	f2fae770d4	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwworld/player.cpp	2012-04-13 13:55:13 +02:00
scrawl	052cc47ee9	fixed waterAdded	2012-04-03 16:53:33 +02:00
scrawl	c0af3c7241	Merge branch 'master' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-02 19:57:58 +02:00
scrawl	c5f044eb0d	fixed compilation	2012-03-28 22:46:29 +02:00
scrawl	58f7a03626	Merge branch 'terrain18' into terraincollision ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-03-28 21:46:52 +02:00
scrawl	e6303fc3f4	Merge branch 'master' into water ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwrender/renderingmanager.hpp	2012-03-28 21:37:20 +02:00
Jason Hooks	51fb9e67cd	Merge	2012-03-18 21:31:31 -04:00
scrawl	91d2031eb7	first attempt at map window	2012-03-16 17:09:31 +01:00
scrawl	2edd7e59f4	some fixes and facilities for saving the fog of war to disk	2012-03-14 20:44:06 +01:00
scrawl	9612ce595b	Merge branch 'master' of https://github.com/zinnschlag/openmw into terraincollision ... Conflicts: CMakeLists.txt	2012-03-13 17:09:50 +01:00
scrawl	fa68be2b19	set map window cell name	2012-03-10 16:05:12 +01:00
scrawl	5b38b17baf	local map rendering (nothing to see yet, as it is not displayed in GUI)	2012-03-10 15:28:18 +01:00
scrawl	f79bf1f300	fog	2012-02-26 13:13:29 +01:00
Jason Hooks	38a0d1d1c5	Merging in master	2012-02-19 15:39:12 -05:00
Jason Hooks	2d0e83a2cf	Reversing changes	2012-01-30 00:06:29 -05:00
Jason Hooks	9c73fa6b6d	Physics sort of fixed	2012-01-29 17:50:51 -05:00
Marc Zinnschlag	16bc374921	animation updates were hooked up to the wrong update function	2012-01-23 14:33:06 +01:00
Jason Hooks	e1aba44da6	Switching cells in exterior works	2012-01-22 16:38:10 -05:00
Jason Hooks	ec94ecacaf	Zinis branch merge	2012-01-22 15:02:38 -05:00
Jason Hooks	a0838369b2	Very basic exterior water	2012-01-21 20:05:08 -05:00
Jason Hooks	2aad3a0bd8	Correct water levels	2012-01-19 23:29:07 -05:00
Jason Hooks	8798f7dd40	Bringing in some of Azathoth's work	2012-01-14 18:34:14 -05:00
Jason Hooks	653d999ac4	Animation creatures	2011-12-26 19:23:46 -05:00
Jason Hooks	1b835d6702	Cell changing fixes	2011-12-24 21:53:12 -05:00
Jason Hooks	7bd911b401	Problems with handles	2011-11-24 23:13:34 -05:00
Marc Zinnschlag	51d5c7cd59	Merge remote branch 'jhooks/mwrender' into mwrender ... Conflicts: apps/openmw/engine.cpp - fixed code that did not compile - removed tons of tabs - more clean up	2011-11-21 12:52:28 +01:00
Jason Hooks	7319f7a8c6	Many bugs fixed related to changing cells	2011-11-19 01:01:19 -05:00
Jason Hooks	15fcdc8b72	Physics working	2011-11-17 19:38:52 -05:00
Jason Hooks	b3e1044699	Exterior cells	2011-11-17 18:08:48 -05:00
Jason Hooks	a0947cd432	Player handle changed;Interior removed;Exterior removed;Cellimp removed; Probe fixed	2011-11-16 21:15:49 -05:00
Jason Hooks	9b94074472	addObject	2011-11-16 16:22:13 -05:00
Jason Hooks	58f103a75c	Adding new insertCellRefList;Collection switched to a set	2011-11-15 23:31:18 -05:00
Jason Hooks	dd46694059	Changing a lot of things in scene and world	2011-11-13 23:14:18 -05:00
Jason Hooks	d4f63443e6	Hiding the rendering manager; crash eliminated	2011-10-24 22:11:36 -04:00
Jason Hooks	6efc61b9df	Removal of MWScene; Object listing fixed	2011-10-24 13:42:36 -04:00
Marc Zinnschlag	8bebae17aa	Issue #19: More local script related cleanup	2011-10-07 09:52:42 +02:00
Marc Zinnschlag	10778d8c3e	Issue #19: factored out local script handling into a separate class ... This also fixes a bug related to self-destructing references (introduced during the cell handling improvements)	2011-10-06 12:30:30 +02:00
Marc Zinnschlag	e8632a799d	Feature #28: refactored out cell management into a separate class	2011-09-08 11:02:55 +02:00
Marc Zinnschlag	40853e292f	various bits of clean up	2011-09-04 09:48:50 +02:00
Marc Zinnschlag	afa84b72e0	fixed exterior bug	2011-09-03 10:26:31 +02:00
Marc Zinnschlag	0a2979caf2	more cleanup	2011-08-27 10:45:09 +02:00
Marc Zinnschlag	f8029aaa9e	more cleanup; fixes for player handling during physics (unrelated to the actual refactoring bugs); fixed minor bug in character initialisation	2011-08-27 10:30:38 +02:00
Marc Zinnschlag	705e11becb	Merge remote branch 'swick/mwrender' into mwrender ... Conflicts: apps/openmw/mwworld/world.cpp	2011-08-22 21:27:53 +02:00
Sebastian Wick	29b8a5374b	get rid of the warnings	2011-08-19 17:03:47 +02:00
Marc Zinnschlag	6d8cfa7dfa	fixed crash bug	2011-08-09 09:56:09 +02:00
Sebastian Wick	a13b958600	MWWorld::Scene::insertCell	2011-08-09 00:05:16 +02:00
Sebastian Wick	54724d7e7f	start RenderingManager	2011-08-07 16:40:01 +02:00
Sebastian Wick	4b846a54f1	PhysicsSystem	2011-08-01 15:55:36 +02:00
Sebastian Wick	8d4dc096a4	move getExterior back	2011-08-01 14:41:15 +02:00
Sebastian Wick	3f007d29cc	move mInteriors and mExterior back to World::World	2011-08-01 14:34:50 +02:00
Sebastian Wick	6baf904f0f	mStore fixed; glibc detected in shutdown process	2011-08-01 04:53:06 +02:00
Sebastian Wick	b131f022ba	constructor & destructor	2011-08-01 04:36:23 +02:00
Sebastian Wick	380cd5ca35	World::Scene improvements	2011-08-01 04:30:21 +02:00
Sebastian Wick	af59f3c475	cut down World::Scene	2011-08-01 04:17:50 +02:00
Sebastian Wick	64633ddcdb	wired string to_utf8 error (maybe it returnes an empty string)	2011-08-01 04:06:38 +02:00
Sebastian Wick	ff68ca7e52	next try :/	2011-08-01 03:33:02 +02:00
Sebastian Wick	e7057bed29	moving stuff from MWWorld::World to MWWorld::Scene but receiving segfault signals	2011-07-31 17:07:11 +02:00