760 Commits

Author	SHA1	Message	Date
Marc Zinnschlag	d684b3ae11	fixed getString function in NIF loader	2012-11-22 10:35:03 +01:00
scrawl	5f7d349126	several missing includes	2012-11-14 05:32:23 +01:00
Marc Zinnschlag	75f64aa38b	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp	2012-11-10 15:44:44 +01:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
Marc Zinnschlag	4994a253da	Merge branch 'bountydisease' into dialogue	2012-11-09 18:17:14 +01:00
greye	c3f0dc0dfb	m prefix for NpcAnimation members	2012-11-08 23:11:43 +04:00
scrawl	00a2de432a	fix BulletShapeLoader namespace	2012-11-08 18:48:07 +01:00
Marc Zinnschlag	662054acf4	Issue #219: moved checks for various dialogue info fields from DialogueManager to Filter	2012-11-08 14:55:31 +01:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	5ac54d1fff	alter ESM::Script for storing id as std::string	2012-11-05 17:18:01 +04:00
greye	d5628c678f	add mId field to every record indexed by id	2012-11-05 17:18:01 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	f0a3ee0ef9	gmst id should be lowercase, wipe RecIdListT	2012-11-05 17:14:02 +04:00
scrawl	4ca0eb93ee	fix markers used for raycasting and blocking activation	2012-10-24 17:47:03 +02:00
Marc Zinnschlag	3f6afb13f1	Merge remote-tracking branch 'scrawl/alchemy'	2012-10-19 20:09:45 +02:00
Marc Zinnschlag	18686614db	Merge remote-tracking branch 'scrawl/splashscreen_dirlisting' ... Conflicts: apps/openmw/mwgui/loadingscreen.cpp	2012-10-18 15:46:43 +02:00
Marc Zinnschlag	510674aa5e	Merge branch 'master' into alchemy ... Conflicts: components/esm/loadmgef.hpp	2012-10-18 14:37:05 +02:00
Marc Zinnschlag	5fbca239dd	Issue #61: potion creation (1st part; still missing some implementations)	2012-10-18 14:02:06 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	84a4fd56c3	consider all files in Splash directory	2012-10-17 12:39:45 +02:00
Marc Zinnschlag	e05e683da3	Merge remote-tracking branch 'scrawl/spellcreation'	2012-10-12 17:19:30 +02:00
scrawl	8ccb0907e6	assertion -> exception; added the old effect flags again	2012-10-12 14:26:10 +02:00
Marc Zinnschlag	3fd887c030	silenced some warnings	2012-10-09 17:11:41 +02:00
Marc Zinnschlag	35d099a638	disabling gcc extensions	2012-10-09 17:10:25 +02:00
scrawl	21493c2dbd	added magic effect flags from Research wiki page	2012-10-01 23:33:07 +02:00
greye	31f7325e1f	fix land loading	2012-10-01 15:46:32 +04:00
greye	93078bb0dc	move record ids to defs.hpp	2012-10-01 00:55:27 +04:00
greye	3494e17b7c	wipe record superclass	2012-10-01 00:51:54 +04:00
greye	2fa4ac177a	initial resolving	2012-10-01 00:23:49 +04:00
greye	721324c1db	rm record inheritance, rework esmtool accordingly	2012-09-30 23:34:53 +04:00
Chris Robinson	cd8515396a	Use a multimap to store the text keys	2012-09-28 23:20:15 -07:00
Chris Robinson	9b491edbf8	Small cleanup for loading animation keyframes	2012-09-28 18:53:24 -07:00
scrawl	d163f8203c	change books to RecListWithIDT	2012-09-25 21:38:34 +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	bf3aad8be0	handle NCC flag	2012-09-23 18:30:13 +02:00
scrawl	872fcf3e3d	sleeping restoration of health, magicka, and fatigue	2012-09-21 17:53:16 +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	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +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	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +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
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
Marc Zinnschlag	835c530e06	Merge branch 'ingredients'	2012-09-13 13:31:46 +02:00