4135 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	90466fe5c9	Merge remote-tracking branch 'scrawl/hide_markers'	2012-09-13 13:23:07 +02:00
scrawl	b5ddc8d4fb	Fix the marker collision; also, nodes marked with NCO are now correctly ignored for collision.	2012-09-13 13:10:02 +02:00
scrawl	7ad80e306b	fixed the disappearing	2012-09-13 12:33:09 +02:00
scrawl	2f0b47fc38	test	2012-09-13 00:21:58 +02:00
scrawl	a96ed6ac61	splash screens on startup	2012-09-12 19:15:29 +02:00
scrawl	906d290935	Markers are actually hidden now. Inspecting the markers in NifSkope revealed why it didn't work previously: the flag that is being looked for is not present in any of the markers, nor any other flag or extra data to identify them. However, the root node name always starts with "marker", making it possible to do a string search.	2012-09-12 12:41:12 +02:00
scrawl	c3966a7c5a	oops, I used a float texture for water reflection. this change should give a little performance boost.	2012-09-11 22:45:41 +02:00
Marc Zinnschlag	d030fe7e79	Merge branch 'loadingscreen'	2012-09-11 20:35:10 +02:00
Marc Zinnschlag	e9e30c0fce	fixed a memory leak	2012-09-11 20:34:54 +02:00
scrawl	a8d9aa98b1	some fixes	2012-09-11 19:18:26 +02:00
scrawl	d5a08e31e7	scene does not disappear anymore during load	2012-09-11 17:36:20 +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
Marc Zinnschlag	4076c19cc6	silencing a cmake warning	2012-09-10 22:30:05 +02:00
Marc Zinnschlag	762f5fe692	Merge remote-tracking branch 'lgro/jenkins-code-coverage-and-unittests'	2012-09-10 22:29:02 +02:00
Lukasz Gromanowski	3c2efbe966	Disable "make install" for Debian based linux distributions. ... Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-09-10 23:03:11 +03:00
scrawl	4977c33e4c	fixed a stats window resizing problem that I introduced today	2012-09-10 21:58:19 +02:00
Marc Zinnschlag	6c03d7aec4	documentation fix	2012-09-10 21:12:35 +02:00
scrawl	9448ce5968	implemented "get<Control>Disabled" functions	2012-09-10 18:44:59 +02:00
scrawl	89ad2af1d9	key usage to open doors or containers ... to test: player->additem, "key_arrile", 1 (door in arille's tradehouse) player->additem, "key_alvur", 1 (chest in the back of beshara)	2012-09-10 17:44:59 +02:00
scrawl	fdc2a7433c	remove the wrong container open sound	2012-09-10 15:01:51 +02:00
scrawl	ad66ebf84f	fix button align on 2 windows	2012-09-10 14:31:19 +02:00
scrawl	d581ac426e	useless cout message	2012-09-10 14:10:56 +02:00
scrawl	996e6280d8	more spell buying window cleanup	2012-09-10 14:10:01 +02:00
Marc Zinnschlag	0696a3b10e	Merge remote-tracking branch 'scrawl/dynamic_sizing'	2012-09-10 14:05:46 +02:00
Marc Zinnschlag	465159d6c0	updated credits.txt	2012-09-10 14:03:57 +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	61c8a627aa	added a missing include	2012-09-10 13:19:15 +02:00
Marc Zinnschlag	273ac0a97f	Merge branch 'spellbuying'	2012-09-10 13:16:02 +02:00
Marc Zinnschlag	f17756712a	fixed spell list handling	2012-09-10 13:15:55 +02:00
Marc Zinnschlag	6c928e93d3	added missing initialisation of NPC/creature spell lists from ESX records	2012-09-10 13:04:00 +02:00
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
Marc Zinnschlag	b47fa83a3f	Merge remote-tracking branch 'scrawl/master'	2012-09-10 09:27:53 +02:00
scrawl	35dd49f948	fixed some "using namespace" in headers	2012-09-10 09:10:50 +02:00
Marc Zinnschlag	7219a47a20	Merge remote-tracking branch 'scrawl/master'	2012-09-10 00:08:05 +02:00
scrawl	56061474c4	another 3 unnecessary lines	2012-09-09 23:53:23 +02:00
scrawl	bb267dddf6	some stats window cleanup	2012-09-09 23:50:57 +02:00
Marc Zinnschlag	9ff4f5e6b7	Merge remote-tracking branch 'scrawl/master'	2012-09-09 23:37:25 +02:00
scrawl	432c089434	fix the spell tooltips to show the spell target	2012-09-09 23:06:24 +02:00
Marc Zinnschlag	bcf3a81a6c	and a tiny bit more of cleanup	2012-09-09 21:18:47 +02:00
Marc Zinnschlag	9c49ca1468	a bit more random cleanup	2012-09-09 21:08:57 +02:00
Marc Zinnschlag	06677a0fc8	fixed ID handling and some misc cleanup	2012-09-09 21:03:39 +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
Marc Zinnschlag	a3869980a4	Merge remote-tracking branch 'ace/win_fix'	2012-09-09 18:15:03 +02:00
Alexander "Ace" Olofsson	a61edb60fd	Fixed an issue with windows CPack failing due to trying to install linux binaries	2012-09-09 16:28:51 +02:00
Alexander "Ace" Olofsson	7934d8abd9	Fixed an issue with some paths not concatenating properly.	2012-09-09 16:28:02 +02:00
Adam Hogan	d1cae132aa	Merge branch 'master' of git://github.com/zinnschlag/openmw	2012-09-09 10:11:28 -04:00