2885 commits

Author	SHA1	Message	Date
greye	807a56c9e4	fix dynamic potion id	2012-09-23 19:29:00 +04:00
greye	18cc435aa1	resolving conflicts	2012-09-21 13:13:11 +04:00
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
greye	e69880f77e	almost perfect byte copies, has redundant data	2012-09-20 20:33:30 +04:00
scrawl	a161b34c67	remove useless member, fix map rendering crash	2012-09-20 18:23:27 +02:00
scrawl	98c1dc1151	ShowMap & FillMap commands, merged next	2012-09-20 18:02:37 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	451a9fd6ac	don't update world arrow position in interior	2012-09-20 17:35:30 +02:00
scrawl	e5e3d829d0	player arrow & markers	2012-09-20 17:30:09 +02:00
scrawl	5f014f7411	oops, left in a testing assertion	2012-09-20 14:04:29 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	87a9373a56	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-20 09:01:58 +02:00
scrawl	b9a3f8e8d7	gamma slider	2012-09-19 23:47:42 +02:00
scrawl	d9f6072f02	gamma correct rendering & adjustment setting	2012-09-19 23:25:07 +02:00
scrawl	32de090079	Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities	2012-09-19 19:34:02 +02:00
Marc Zinnschlag	a3c680d20a	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-19 09:41:32 +02:00
scrawl	be44810623	implemented GetPCSleep	2012-09-19 03:11:23 +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
scrawl	4d4ba6698a	fix character preview destruction; don't allow empty names in name dialog	2012-09-18 19:00:20 +02:00
scrawl	0ba996f290	dialog layout	2012-09-18 18:29:03 +02:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
Marc Zinnschlag	fcda3b6ca8	fixed some script argument types	2012-09-18 11:09:54 +02:00
Marc Zinnschlag	ea8eab4f34	more cleanup	2012-09-18 11:06:19 +02:00
Marc Zinnschlag	408c5b8bd4	some cleanup	2012-09-18 10:49:51 +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	3c1a9061de	Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly	2012-09-17 14:12:27 +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
Marc Zinnschlag	2bb400eaa8	Merge remote-tracking branch 'pvdk/datalocalfix'	2012-09-16 10:36:03 +02:00
Marc Zinnschlag	b041a511b6	Merge remote-tracking branch 'mmd/windowswarnings'	2012-09-16 10:33:06 +02:00
Jason Hooks	76f2a82884	More pmove stuff; Turned off broadphase, we could not fall in exteriors	2012-09-15 22:48:24 -04:00
Pieter van der Kloet	4bcc34f4f9	Re-enabled and fixed multiple data directory handling in the launcher	2012-09-16 04:28:51 +02:00
Pieter van der Kloet	97326ffdbf	Fixed data-local directory handling in the launcher	2012-09-16 03:01:48 +02:00
Jason Hooks	f586f53a42	positioning	2012-09-15 16:45:50 -04:00
scrawl	896428c129	enableRestMenu & enableLevelupMenu	2012-09-15 20:18:41 +02: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	cf358fa79d	>= instead of ==	2012-09-15 19:20:13 +02:00
scrawl	0dc242c603	don't increase skill beyond 100	2012-09-15 19:10:48 +02:00
scrawl	f5237ff1a6	skill gain from books	2012-09-15 19:06:56 +02:00
scrawl	234f8fa5d5	added the missing sound & notification for skill increase	2012-09-15 18:35:59 +02:00
scrawl	b34b894d6a	removed some debug stuff	2012-09-15 17:20:47 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	95f3a20e2c	Merge branch 'master' into levelup	2012-09-15 14:25:37 +02:00
scrawl	3e794a6087	remove useless member and removed a warning	2012-09-15 01:02:07 +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