292 commits

Author	SHA1	Message	Date
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
Mark Siewert	64c08eada4	Merge remote-tracking branch 'upstream/next' into multiple_esm_esp	2012-11-06 20:37:29 +01:00
greye	9f1733a415	move record insertion to ESMStore	2012-11-06 17:51:38 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
emoose	cadc753216	Fixed: engine: Bug #437 Stop animations when paused better fix; scene: Bug #430 Teleporting and using loading doors linking within the same cell reloads the cell ... Bug #437 fix only pauses the RenderingManager, and still updates the mOcclusionQuery Bug #430 fix is only tested in interiors (ToddTest)	2012-11-03 19:29:55 +00:00
scrawl	33361e6539	Merge branch 'master' into spellcreation	2012-10-23 10:38:53 +02:00
scrawl	d76522e7a4	searchPtrViaHandle	2012-10-19 19:48:02 +02:00
scrawl	c991f68a2d	buying created spell	2012-10-15 21:54:19 +02:00
Mark Siewert	28d4d7ea3f	Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. ... - Remove check for 255 master/plugin files.	2012-10-07 20:00:55 +02:00
scrawl	73c69e8eda	video playback	2012-09-25 02:35:50 +02:00
scrawl	9106e5307c	moved global map from RenderingManager to gui and removed world method	2012-09-21 14:11:01 +02: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
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	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
Marc Zinnschlag	b7c9285b24	added support for out of world rendering	2012-09-14 21:12:16 +02:00
scrawl	c27ff546e4	shader cache	2012-09-02 19:40:26 +02:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
greye	e6c3e0744e	tvm update and fix	2012-08-19 10:37:51 +04:00
greye	5b2b378f25	tvm script instruction	2012-08-18 18:05:10 +04:00
greye	0e6e141fd4	camera control related script instructions	2012-08-17 15:20:57 +04:00
greye	392e6efcb5	initial player rendering	2012-08-17 15:19:43 +04:00
greye	6f87c0c36d	preview mode, advanced vanity support	2012-08-17 15:19:43 +04:00
greye	c46eeaa100	initial 3d-person camera support	2012-08-17 15:19:43 +04:00
Marc Zinnschlag	766e782aae	Merge remote branch 'greye/cross_cell-borders'	2012-08-11 12:05:10 +02:00
greye	45306e4bc3	fixed rotation adjustment	2012-08-11 13:23:54 +04:00
scrawl	11fadf4a07	forgot something	2012-08-10 16:25:27 +02:00
scrawl	44ff31b50a	removed world exit methods	2012-08-10 16:21:53 +02:00
scrawl	f72956b918	- added a simple main menu (with Return, Options and Exit buttons) ... - removed OEngine::ExitListener (what a terrible abuse of framelisteners)	2012-08-10 15:15:48 +02:00
greye	38b06aee6c	resolving conflicts	2012-08-09 21:49:00 +04:00
greye	ec9cf4d3c6	rotateObject() added, input system rewritten	2012-08-09 00:15:52 +04:00
greye	b6f7f21bcf	fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added	2012-08-08 14:51:33 +04:00
greye	ff62770657	World::isUnderwater(), World::isSwimming()	2012-08-03 14:42:09 +04:00
greye	bcc47cd5fb	local scripts, move placing to World::placeObject(Ptr, CellStore, Position)	2012-07-25 20:31:39 +04:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
gugus	0a67f60a6e	Clean-up	2012-07-09 18:47:59 +02:00
gugus	feec67094f	Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwworld/physicssystem.cpp	2012-07-09 15:23:26 +02:00
Alexander "Ace" Olofsson	113457d934	Fixed some windows issues and got rid of a few tiny warnings while at it.	2012-07-07 01:14:18 +02:00
Marc Zinnschlag	5a7b95bf7a	Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp	2012-07-03 13:15:20 +02:00
Marc Zinnschlag	4c39fefd1e	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00

Renamed from apps/openmw/mwworld/world.hpp (Browse further)