174 commits

Author	SHA1	Message	Date
scrawl	11a8d5d70a	Merge branch 'master' of git://github.com/zinnschlag/openmw into globalmap	2012-11-10 21:19:41 +01:00
scrawl	5fdc7ad809	forgot to add file	2012-11-10 13:07:26 +01:00
scrawl	ace9ee9c83	persuasion dialog	2012-11-09 20:18:38 +01:00
scrawl	38828acac9	transparent overlay	2012-11-04 12:13:04 +01:00
scrawl	234716daa6	finished spell creation	2012-10-23 11:42:38 +02:00
scrawl	0a19b56031	fix gold label	2012-10-17 18:49:49 +02:00
scrawl	e80394c0b5	fix training limit	2012-10-17 18:48:29 +02:00
scrawl	c64eb96952	Merge branch 'Travel_Dialogue' into training_travel ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwgui/dialogue.cpp apps/openmw/mwrender/globalmap.cpp files/mygui/CMakeLists.txt	2012-10-17 18:17:53 +02:00
scrawl	1a2034b4dd	training window	2012-10-17 18:03:02 +02:00
scrawl	f154031e54	last bits of the gui	2012-10-11 18:26:29 +02:00
gugus	1f4de03613	oooups	2012-10-06 22:33:10 +02:00
gugus	85d9357e3a	Travel GUI	2012-10-06 17:52:46 +02:00
scrawl	025e820703	abstracted code and use it in enchanting window as well	2012-10-03 15:36:10 +02:00
scrawl	1c0dd3ccc5	some editing code	2012-10-03 15:06:54 +02:00
scrawl	636f297f10	enchant	2012-09-28 16:52:42 +02:00
scrawl	ac0c1ea986	Merge branch 'next' of https://github.com/zinnschlag/openmw into spellcreation ... Conflicts: apps/openmw/mwgui/dialogue.cpp	2012-09-27 08:47:47 +02:00
scrawl	d393f551ed	edit effect dialog	2012-09-24 08:09:16 +02:00
scrawl	9d7c35ae48	and go	2012-09-23 00:36:20 +02:00
scrawl	8214966d44	Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap	2012-09-20 17:41:14 +02:00
scrawl	e5e3d829d0	player arrow & markers	2012-09-20 17:30:09 +02:00
scrawl	86cfc91ef3	global map rendering	2012-09-20 13:56:37 +02:00
Marc Zinnschlag	87a9373a56	Merge remote-tracking branch 'scrawl/gamma' into next	2012-09-20 09:01:58 +02:00
scrawl	b9a3f8e8d7	gamma slider	2012-09-19 23:47:42 +02:00
scrawl	bf5e30b24f	everything done except health/mana restore	2012-09-19 02:53:06 +02:00
scrawl	ab698bb401	date time label	2012-09-18 20:53:32 +02:00
scrawl	0ba996f290	dialog layout	2012-09-18 18:29:03 +02:00
scrawl	42d25c0af0	fix resources, I renamed those in the last commit, but only in one place	2012-09-16 20:56:49 +02:00
scrawl	76b494100e	finished?	2012-09-15 17:12:42 +02:00
scrawl	95f3a20e2c	Merge branch 'master' into levelup	2012-09-15 14:25:37 +02:00
scrawl	b76a28f69c	beginnings of the gui	2012-09-14 19:44:00 +02:00
scrawl	a308d2e38a	fixed exception, fixed armor label obscuring the items	2012-09-14 15:33:24 +02:00
scrawl	6ac2a12296	item selection working on the preview	2012-09-14 14:34:18 +02:00
scrawl	eef750e6b0	race selection preview	2012-09-13 19:03:31 +02:00
scrawl	5155339cb6	character preview working	2012-09-13 14:56:50 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +02:00
scrawl	a8d9aa98b1	some fixes	2012-09-11 19:18:26 +02:00
scrawl	369db182de	actual progress bar, performance optimization	2012-09-11 16:53:49 +02:00
scrawl	2b339f6c0f	loading screen	2012-09-11 16:37:54 +02:00
scrawl	ad66ebf84f	fix button align on 2 windows	2012-09-10 14:31:19 +02:00
scrawl	996e6280d8	more spell buying window cleanup	2012-09-10 14:10:01 +02:00
scrawl	ba0acd4056	changed some text colors	2012-09-10 13:52:37 +02:00
scrawl	fde69d0c87	Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing	2012-09-10 13:40:34 +02:00
scrawl	bc6a1979b0	replaced everything with the new method	2012-09-10 13:39:22 +02:00
Marc Zinnschlag	273ac0a97f	Merge branch 'spellbuying'	2012-09-10 13:16:02 +02:00
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
scrawl	bb267dddf6	some stats window cleanup	2012-09-09 23:50:57 +02:00
Marc Zinnschlag	3fad1c0786	fixed a crash	2012-09-09 20:43:21 +02:00
Adam Hogan	08410b9062	Renamed SpellBuyingWindow, took some suggestions from scrawl	2012-09-09 14:10:07 -04:00
Adam Hogan	ebf80943a9	Added spell buying window	2012-09-08 18:17:03 -04:00
Marc Zinnschlag	e2bf4694cb	Merge remote-tracking branch 'scrawl/master'	2012-08-31 09:22:32 +02:00