1745 commits

Author	SHA1	Message	Date
Marc Zinnschlag	1201c271b2	Merge remote branch 'swick/initocfg'	2012-04-05 12:43:00 +02:00
Sebastian Wick	f7bfea5861	typo 2 -.-	2012-04-05 00:16:44 +02:00
Sebastian Wick	56c9992b29	typo	2012-04-04 23:52:42 +02:00
Sebastian Wick	8c84f68dab	fix for older boost versions; unsigned warning	2012-04-04 23:51:22 +02:00
Marc Zinnschlag	6fd3d5c776	Merge remote branch 'lgro/master'	2012-04-04 23:19:30 +02:00
Lukasz Gromanowski	cd2789b15a	Revert "Issue #225: Correction to commit ae98904." ... This reverts commit 0e5c90d3e7.	2012-04-04 21:05:19 +02:00
Sebastian Wick	5dd65c11ee	forgot to save the file	2012-04-04 21:04:52 +02:00
Sebastian Wick	57ae1bdc43	Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg ... Conflicts: apps/openmw/main.cpp	2012-04-04 20:58:02 +02:00
Sebastian Wick	6ccb32d26c	import nosound option	2012-04-04 20:06:31 +02:00
Sebastian Wick	d3a6484bbc	set the default value for --fallback the right way	2012-04-04 19:59:46 +02:00
Sebastian Wick	a974d88cf1	Revert "set a default value for --fallback" ... This reverts commit 94a220dcdd.	2012-04-04 19:58:04 +02:00
Sebastian Wick	94a220dcdd	set a default value for --fallback	2012-04-04 19:52:07 +02:00
Sebastian Wick	48b7b03453	typo; World::getFallback(std::string key, std::string def)	2012-04-04 16:15:15 +02:00
Sebastian Wick	16e7bf353a	remove debug message	2012-04-04 16:08:46 +02:00
Sebastian Wick	de510d445b	throw an error if the --fallback syntax is wrong	2012-04-04 15:23:14 +02:00
Sebastian Wick	329ba24eab	streamlined command line options	2012-04-04 15:11:30 +02:00
Marc Zinnschlag	e403c7158a	Merge remote branch 'gus/DialogueSystem'	2012-04-03 18:27:36 +02:00
Marc Zinnschlag	cc9696cc2c	Merge remote branch 'scrawl/minimap'	2012-04-03 18:26:20 +02:00
scrawl	51e33cc090	fixed map of some interiors	2012-04-03 15:34:13 +02:00
Sebastian Wick	329d59e52b	typo	2012-04-03 02:17:15 +02:00
Sebastian Wick	73705dadf6	parse fallback with boost program option custom validators	2012-04-03 02:14:39 +02:00
Sebastian Wick	d87dffa948	should work... but does not even compile	2012-04-03 01:47:43 +02:00
Sebastian Wick	2d23d79fd5	allways merge fallback; better syntax	2012-04-03 00:44:26 +02:00
Marc Zinnschlag	26371a82a5	Merge remote branch 'scrawl/crashfix'	2012-04-02 23:53:07 +02:00
Lukasz Gromanowski	0e5c90d3e7	Issue #225: Correction to commit ae98904. ... Changed pointer to LandData struct to simple member variable.	2012-04-02 23:50:53 +02:00
Sebastian Wick	ab9c430632	fallback in apps/openmw; fix for apps/mwiniimporter	2012-04-02 20:47:09 +02:00
scrawl	d4a2bdfa3d	fix crash when hardware occlusion queries unsupporetd	2012-04-02 20:46:42 +02:00
scrawl	16481b0594	Merge branch 'master' into minimap	2012-04-02 19:38:36 +02:00
scrawl	342464530d	rotated map working	2012-04-02 19:37:24 +02:00
Sebastian Wick	6e19076dc5	fallback for ini importer	2012-04-02 17:07:18 +02:00
scrawl	5f2a674d93	fixed a typo	2012-04-02 16:14:39 +02:00
scrawl	00cc45c537	FPS is now a setting instead of commandline option	2012-04-02 16:10:54 +02:00
scrawl	fd662f937a	add settings for viewing distance and fog	2012-04-02 15:51:48 +02:00
scrawl	e5cc9adbb0	added settings for rendering distance of small objects	2012-04-02 15:30:29 +02:00
scrawl	2b4b941192	Merge branch 'master' into gamesettings	2012-04-02 15:21:10 +02:00
Sebastian Wick	16674ad141	open file for writing AFTER reading it :)	2012-04-02 14:42:01 +02:00
scrawl	e0631dd9be	Merge branch 'master' into minimap ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-02 14:38:02 +02:00
Sebastian Wick	89565bacd1	since the default method is not available in older boost we should check by ourselfs if the options are given and dont use notify	2012-04-02 14:34:21 +02:00
scrawl	1445ae992d	adding a setting to disable static geometry	2012-04-02 14:24:16 +02:00
scrawl	5accca385c	fix crash on exit when no user settings exist	2012-04-02 13:47:25 +02:00
Marc Zinnschlag	6022d3ab13	Merge remote branch 'corristo/pgrd-rendering' ... reduced cout spam. Conflicts: apps/openmw/mwrender/debugging.cpp apps/openmw/mwrender/renderingmanager.cpp components/bsa/bsa_archive.cpp libs/openengine/bullet/physic.hpp	2012-04-02 12:04:47 +02:00
Marc Zinnschlag	fb44a5da10	Merge remote branch 'ace/win-fix'	2012-04-02 11:46:09 +02:00
Marc Zinnschlag	eccb983c44	Merge remote branch 'chris/sound'	2012-04-02 11:34:48 +02:00
Marc Zinnschlag	cdd0182912	Merge remote branch 'scrawl/occlusionquery' ... Reduced cout spam Conflicts: apps/openmw/mwrender/occlusionquery.cpp	2012-04-02 11:33:16 +02:00
Chris Robinson	63e0e82049	Implement an Audiere-based decoder	2012-04-01 15:02:07 -07:00
Chris Robinson	2147210ad7	Don't set an underwater environment when there's no water	2012-04-01 12:46:49 -07:00
Lukasz Gromanowski	ae989040e5	Issue #225: Fix for memleak when loading terrain.	2012-04-01 21:29:49 +02:00
Alexander "Ace" Olofsson	cec9562282	Fixing an ambigous symbol	2012-04-01 20:29:00 +02:00
scrawl	0a5757791c	Merge branch 'master' into minimap	2012-04-01 20:17:07 +02:00
scrawl	c2a82c3d89	Merge branch 'master' into gamesettings	2012-04-01 20:06:18 +02:00