11738 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	8daf790235	Merge branch 'next' of https://github.com/zinnschlag/openmw into next	2012-09-25 21:50:33 +02:00
scrawl	caef570c8a	fix the weather not changing when sleeping/waiting	2012-09-25 21:49:34 +02:00
scrawl	359824d614	oops	2012-09-25 21:49:34 +02:00
scrawl	4453459378	re-use the texture across preview instances	2012-09-25 21:49:34 +02:00
scrawl	e2b1329620	fix the race selection escape crash	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
Marc Zinnschlag	a34bdb9623	per NPC ID interaction tracking	2012-09-25 10:48:57 +02:00
scrawl	05eb307bfb	added video timing	2012-09-25 02:54:29 +02:00
scrawl	73c69e8eda	video playback	2012-09-25 02:35:50 +02:00
scrawl	b63d205c6e	change the select attribute/skill dialogs to be reusable	2012-09-24 22:09:38 +02:00
Marc Zinnschlag	5bdc7bcacf	Merge branch 'master' into next	2012-09-24 10:14:09 +02:00
scrawl	d393f551ed	edit effect dialog	2012-09-24 08:09:16 +02:00
scrawl	02e7b3df4f	oops	2012-09-24 01:07:33 +02:00
scrawl	f8a18d58a6	re-use the texture across preview instances	2012-09-24 01:06:17 +02:00
scrawl	dd5c083124	fix the race selection escape crash	2012-09-24 00:42:05 +02:00
greye	1339787863	remove underscores from filenames in esm	2012-09-23 23:12:10 +04:00
greye	7368e7b655	rename getASCII() to getLegacyEnc()	2012-09-23 22:20:18 +04:00
greye	c54750977f	remove underscores in guards	2012-09-23 22:11:08 +04:00
scrawl	1cb1259e18	fixing some unrelated warnings	2012-09-23 19:36:37 +02:00
scrawl	bf3aad8be0	handle NCC flag	2012-09-23 18:30:13 +02:00
greye	807a56c9e4	fix dynamic potion id	2012-09-23 19:29:00 +04:00
scrawl	9d7c35ae48	and go	2012-09-23 00:36:20 +02:00
scrawl	b4db339fd5	everything uses find now	2012-09-22 21:39:05 +02:00
scrawl	9f2668b45b	Task #400 Review GMST access	2012-09-22 21:35:57 +02:00
scrawl	f45a6b71a9	Merge branch 'master' into next	2012-09-22 20:48:55 +02:00
scrawl	b471bef92a	Merge branch 'master' into next	2012-09-22 20:48:22 +02:00
Marc Zinnschlag	63772e2301	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-22 18:27:51 +02:00
Marc Zinnschlag	39e21a6103	Merge remote-tracking branch 'scrawl/globalmap' into next	2012-09-22 18:27:42 +02:00
scrawl	dbf59d14dc	water gamma correction	2012-09-22 16:52:53 +02:00
scrawl	78b2d51cfc	fix a map crash	2012-09-22 16:52:31 +02:00
Nikolay Kasyanov	8a81a4a334	Fixed typo on openmw.cfg that caused launcher crash on OS X	2012-09-22 13:03:58 +04:00
Marc Zinnschlag	9d1a9520fc	Merge remote-tracking branch 'jhooks/physicsaedra3' into next	2012-09-22 09:05:36 +02:00
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