812 commits

Author	SHA1	Message	Date
scrawl	86671096ec	remove commandline switch for new game	2012-12-16 16:14:49 +01:00
scrawl	c5dd0e1968	New Game button	2012-12-16 16:05:31 +01:00
scrawl	a3bd3a40ca	fix 2 unrelated leaks	2012-12-16 00:47:29 +01:00
scrawl	5f676f9c6b	Merge branch 'master' of https://github.com/zinnschlag/openmw into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp apps/openmw/mwscript/miscextensions.cpp	2012-12-11 22:28:23 +01:00
Marc Zinnschlag	386eec51c1	some skill usage fixes	2012-12-07 11:36:38 +01:00
eduard	ea8ee11ff7	tradding skill use	2012-12-06 14:25:53 +01:00
eduard	5332546541	tradding skill use	2012-12-06 13:58:52 +01:00
scrawl	3db850a7d1	Don't crash if no loading screens are found	2012-12-03 05:45:04 +01:00
scrawl	ea2bbec76e	better fix for bed activation	2012-12-03 05:32:12 +01:00
Tom Mason	a6fd369e4e	Fixed wait window reappearing after sleeping	2012-12-02 22:10:47 +00:00
Marc Zinnschlag	b25f2e88ce	Issue #492: fixed double alchemy ingredients removal	2012-12-02 15:07:22 +01:00
Marc Zinnschlag	556d737f65	Merge remote-tracking branch 'trombonecot/windowformatting'	2012-12-02 14:36:36 +01:00
eduard	30d0e93cf4	Fix window formatting on tool tip with too log titles	2012-12-02 14:12:18 +01:00
eduard	7e7e6e2bcb	Fix window formatting on tool tip with too log titles	2012-12-02 14:08:22 +01:00
scrawl	c4facc233e	Merge branch 'master' into videoplayback ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-12-01 11:30:51 +01:00
scrawl	8e857587d7	fix a text coloring bug	2012-11-28 02:36:33 +01:00
scrawl	1def60dbe1	PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank	2012-11-28 02:15:34 +01:00
Marc Zinnschlag	a6c7f16a7b	Merge remote-tracking branch 'scrawl/reputation'	2012-11-23 21:26:44 +01:00
scrawl	eb29b1593b	ModReputation, SetReputation	2012-11-23 19:56:45 +01:00
scrawl	f218ef2675	fix separator	2012-11-23 19:21:13 +01:00
scrawl	1d7e92b6b3	dialogue fixes	2012-11-23 19:05:40 +01:00
scrawl	693eeabeca	shiny: fix GLSL texture units when shaders were disabled	2012-11-19 13:55:26 +01:00
scrawl	dc67a547b0	global map explored overlay	2012-11-16 19:34:09 +01:00
scrawl	aefde3f5bc	Merge branch 'master' into globalmap	2012-11-15 13:21:24 +01:00
Marc Zinnschlag	409d15576b	Merge remote-tracking branch 'greye/player-model'	2012-11-12 14:18:38 +01:00
scrawl	11a8d5d70a	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-10 21:19:41 +01:00
scrawl	7c22690116	Merge branch 'next' into globalmap	2012-11-10 21:19:10 +01:00
greye	623e00531d	fix reentering race selection	2012-11-10 21:54:43 +04:00
greye	0d33d005a5	head/hair selection	2012-11-10 21:30:16 +04:00
greye	50867e8d87	fix gender selection update, main model visibility and couple of crashes	2012-11-10 19:57:50 +04:00
Marc Zinnschlag	0ab4068fbd	Merge remote-tracking branch 'scrawl/persuasion' into next	2012-11-10 14:59:52 +01:00
Marc Zinnschlag	d15eb6cd17	Merge remote-tracking branch 'greye/player-model' into next	2012-11-10 12:36:01 +01:00
greye	b1ef0026a9	race selection/inventory preview character model update	2012-11-10 11:41:12 +04:00
scrawl	92bba18218	removed useless member	2012-11-10 00:47:24 +01:00
scrawl	94aeb15220	bartering disposition change	2012-11-10 00:38:45 +01:00
scrawl	33b4b29fbc	persuasion mechanics, added reputation	2012-11-10 00:29:36 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	d53a7ade1e	method names, disposition uint->int	2012-11-09 14:42:09 +01:00
scrawl	ae78eaeb28	fixed training, fixed todo comments	2012-11-08 23:21:03 +01:00
scrawl	b2afb1fd5c	Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement ... Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp	2012-11-08 23:16:40 +01:00
scrawl	bf4e855260	fixed creatures	2012-11-08 22:31:08 +01:00
gugus	4634227f1c	notify the user when the merchant doesn't accept the offer	2012-11-08 21:50:56 +01:00
scrawl	3d7146cd50	don't allow opening a window multiple times, primarily the console	2012-11-08 19:34:54 +01:00
greye	2a86432887	store birthsign in MWWorld::Player	2012-11-08 18:50:23 +04:00
gugus	0a883f4492	The player can now barter with merchants	2012-11-08 13:38:20 +01:00
greye	83e758ee50	clean up interfaces	2012-11-08 16:37:57 +04:00
greye	9dc9098fa7	update MWBase::World interface since records contains own id	2012-11-08 01:52:34 +04:00
greye	f818fa1ebf	minor update since records contains own id	2012-11-08 01:39:24 +04:00
greye	5b9621bca5	store player record data in ESMStore	2012-11-08 01:36:43 +04:00
greye	9ab2c16055	store created character classes as dynamic records	2012-11-08 01:22:44 +04:00