4505 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jason Hooks	f365cab824	Possible fix for a issue	2012-09-21 16:10:08 -04:00
Marc Zinnschlag	8da00caaa4	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-21 20:39:20 +02:00
scrawl	47d9fae89f	don't use cache	2012-09-21 20:35:50 +02:00
Marc Zinnschlag	3560690660	Merge remote-tracking branch 'scrawl/sleep_wait' into next	2012-09-21 18:27:06 +02:00
scrawl	845dddbab8	fix a weird problem with the fading overlay	2012-09-21 18:09:07 +02:00
scrawl	b91d74d394	fix normalized encumbrance	2012-09-21 17:56:15 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +02:00
Marc Zinnschlag	28e2430f3a	Merge remote-tracking branch 'scrawl/master'	2012-09-21 17:47:27 +02:00
scrawl	f49401bb53	center map on the player, dynamic map size	2012-09-21 16:26:04 +02:00
scrawl	1d012d1680	don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.	2012-09-21 15:24:26 +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
greye	09195894cf	restore INGR and MGEF	2012-09-21 12:30:08 +04:00
greye	2d5ddd104b	Land::loadData rework	2012-09-21 12:12:16 +04:00
greye	bd94f257bf	a bit formatting	2012-09-21 09:36:18 +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	e8bba2b833	disabled loading of land normals again, didn't need them after all	2012-09-20 14:06:30 +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
Marc Zinnschlag	ede9a2b170	fixed an orientation problem	2012-09-19 19:56:02 +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
Nikolay Kasyanov	4b5706d652	Fixed packaging on OS X	2012-09-19 11:16:13 +04: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	4829f47a4f	rewrote the fader to use Rectangle2d instead of overlay, in order to not cover the UI	2012-09-18 21:04:43 +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
greye	597b88e95a	update saving AI packages	2012-09-18 19:30:19 +04:00
Marc Zinnschlag	4abb9a00da	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-18 11:25:09 +02:00
Marc Zinnschlag	747a4e1123	increased version number and updated readme	2012-09-18 11:19:21 +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
Jason Hooks	f01aae138f	Removing void	2012-09-17 17:23:26 -04: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
Marc Zinnschlag	b96485284a	removed some unneeded return values	2012-09-17 13:41:15 +02:00
gugus	032ff7c879	Clean-up. There is still a little bug.	2012-09-17 13:36:48 +02:00
Brother Brick	05c3936797	Merge remote-tracking branch 'upstream/master' into static	2012-09-17 11:57:38 +02:00
Brother Brick	ff54508633	during cleanup we now delete all plugins created	2012-09-17 11:57:29 +02:00