786 commits

Author	SHA1	Message	Date
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
Marc Zinnschlag	918316168f	Merge remote-tracking branch 'greye/store' into next ... Conflicts: apps/openmw/mwclass/light.cpp apps/openmw/mwworld/worldimp.cpp	2012-11-07 19:34:28 +01:00
Marc Zinnschlag	0805301922	Merge remote-tracking branch 'bwrsandman/master' into next	2012-11-07 10:40:40 +01:00
bwrsandman	7911f08c53	Issue #438: set 0 a.m. to be 12 a.m.	2012-11-06 13:19:35 -05:00
greye	b3ad872845	new interface in manualref, fix various typos	2012-11-06 13:43:48 +04:00
greye	e74b2c060d	disable createRecord(), Land constness hack, various fixes with Store<T> interface	2012-11-06 13:14:03 +04:00
greye	a9c1ce412a	applying new interface vol.7, inconsistent	2012-11-06 11:29:18 +04:00
gugus	2841d831a6	Disposition is now updated everyframe	2012-11-05 23:16:37 +01:00
Marc Zinnschlag	a7da929496	Merge remote-tracking branch 'scrawl/master' into next	2012-11-05 22:46:42 +01:00
greye	4637503680	applying new interface vol.6, inconsistent	2012-11-06 00:34:11 +04:00
scrawl	646e689239	clear name edits when opening alchemy / spell creation	2012-11-05 20:47:28 +01:00
greye	42aae566a7	applying new interface vol.5, inconsistent	2012-11-05 23:41:26 +04:00
gugus	9ebe9cb40c	Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes	2012-11-05 19:55:06 +01:00
gugus	aaf1b66c7e	BarterOffer is used in other trading services too	2012-11-05 19:53:55 +01:00
Marc Zinnschlag	61942c9c4a	Issue #440: Make day numbers start at 1 instead of 0	2012-11-05 18:01:50 +01:00
greye	d205723a17	resolving m prefix/ESMStore movement	2012-11-05 18:02:47 +04:00
greye	8691eac557	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
greye	2057f5619e	move ESMStore to MWWorld	2012-11-05 17:18:01 +04:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
gugus	f72f898bd9	implement barterOffer. It's used for travel only. ... I've started to implement disposition, but it's very basic for now.	2012-11-05 11:07:43 +01:00
Marc Zinnschlag	6f7a621b6f	disabled enchanting unfinished enchantment GUI for now	2012-11-04 23:15:20 +01:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00