692 commits

Author	SHA1	Message	Date
scrawl	d90af9c524	Merge branch 'master' into characterpreview	2012-09-13 14:22:17 +02:00
scrawl	7ad80e306b	fixed the disappearing	2012-09-13 12:33:09 +02:00
scrawl	4f3eb3c34a	character preview WIP	2012-09-13 00:54:32 +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
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
scrawl	4977c33e4c	fixed a stats window resizing problem that I introduced today	2012-09-10 21:58:19 +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	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
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
scrawl	b66c8099eb	new system for dynamic sizing of buttons & text boxes	2012-09-10 11:20:27 +02:00
scrawl	35dd49f948	fixed some "using namespace" in headers	2012-09-10 09:10:50 +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
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
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
scrawl	760f05c454	the HUD can be toggled with F12 key; useful for screenshots	2012-08-30 20:47:39 +02:00
greye	a90547bbbe	code formatting	2012-08-29 21:35:06 +04:00
scrawl	6ad08dfd33	added settings for crosshair & subtitles	2012-08-29 11:15:17 +02:00
scrawl	1c5055c8ac	fix a problem where hovering a marker would render it on top of the fog of war instead of below	2012-08-28 18:49:44 +02:00
scrawl	7eaf5e7f0f	changed the markers to look more like morrowind's (hover effect)	2012-08-28 18:40:11 +02:00
scrawl	571d5095d4	removed a cout	2012-08-28 17:32:50 +02:00
scrawl	5834b4baa5	door markers on the local map	2012-08-28 17:30:34 +02:00
Marc Zinnschlag	160b52162b	Merge remote-tracking branch 'scrawl/quick_keys' ... Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp	2012-08-28 09:06:40 +02:00
scrawl	321f7c3419	fix an infinite recursion regression on several dialogs.	2012-08-27 21:29:04 +02:00
scrawl	5c28a67203	broke something in the last commit.	2012-08-27 20:55:39 +02:00
scrawl	4f19b7fb9b	fix leaks.	2012-08-27 20:52:32 +02:00
scrawl	bc36b0e2bd	remove the restriction on the last quick key	2012-08-27 20:51:13 +02:00
scrawl	6161f81c24	last bits of the quick key menu.	2012-08-27 20:44:14 +02:00
scrawl	9af0b48ad6	show/hide crosshair correctly	2012-08-27 19:18:55 +02:00
scrawl	c5e55d3cac	fix screenshot function	2012-08-27 15:51:01 +02:00
scrawl	c0f27bd5ef	magic selection window	2012-08-26 11:37:33 +02:00
scrawl	fab4cfecb1	some unfinished work on quick keys window	2012-08-26 10:52:06 +02:00
scrawl	67577c6192	UI cursor & camera sensitivity sliders	2012-08-13 18:48:50 +02:00
scrawl	c7b8787c32	"reset to defaults" button, invert y axis button	2012-08-13 02:55:22 +02:00
scrawl	bc6e4feedc	hotkey window first version	2012-08-13 01:26:15 +02:00
scrawl	97c45455fd	fix WindowManager destruction	2012-08-12 21:21:23 +02:00
Marc Zinnschlag	c4bf6214db	Merge remote branch 'scrawl/master'	2012-08-12 18:11:36 +02:00
Marc Zinnschlag	6534c2a55a	Issue #107: WindowManager is accessed only through the interface class from now on	2012-08-12 18:11:09 +02:00
Marc Zinnschlag	35a64edf2a	Issue #107: removed a template from the window manager	2012-08-12 16:07:04 +02:00
Marc Zinnschlag	484cce12a8	Issue #107: removed redundant getStore function from window manager	2012-08-12 14:36:46 +02:00
Marc Zinnschlag	f37d3cd3c9	Issue #107: added a few todo comments	2012-08-12 14:09:55 +02:00
Marc Zinnschlag	4ca3cb81d4	Issue #107: some include clean up	2012-08-12 14:07:48 +02:00
Marc Zinnschlag	e0ba7cf952	Issue #107: Fixing up the window manager interface	2012-08-12 13:46:14 +02:00
Marc Zinnschlag	020fde70b8	Issue #107: moving function implementations from hpp to cpp file	2012-08-12 11:10:17 +02:00
Marc Zinnschlag	dbac3d2e5f	Issue #107: fixing WindowManager::removeDialog	2012-08-12 10:52:29 +02:00
Marc Zinnschlag	a3b27ae756	Issue #107: Moved ClassPoint from window manager to character creation	2012-08-12 10:50:03 +02:00
Marc Zinnschlag	0231533d05	Issue #107: InputManager is accessed only through the interface class from now on	2012-08-11 17:53:39 +02:00
Marc Zinnschlag	b68f9d6a28	Issue #107: MechanicsManager is accessed only through the interface class from now on	2012-08-11 17:30:55 +02:00
scrawl	dcf1e66456	fix main menu placement after resolution changes	2012-08-11 17:26:01 +02:00
scrawl	44ff31b50a	removed world exit methods	2012-08-10 16:21:53 +02:00
scrawl	f72956b918	- added a simple main menu (with Return, Options and Exit buttons) ... - removed OEngine::ExitListener (what a terrible abuse of framelisteners)	2012-08-10 15:15:48 +02:00
Marc Zinnschlag	6bd48d12af	Issue #107: SoundManager is accessed only through the interface class from now on	2012-08-09 14:33:21 +02:00
Marc Zinnschlag	d00d40cc3f	Issue #107: Journal is accessed only through the interface class from now on	2012-08-09 12:56:03 +02:00
Marc Zinnschlag	923109b260	Issue #107: DialogueManager is accessed only through the interface class from now on	2012-08-09 10:35:53 +02:00
scrawl	15a16aeba1	Fixed DirectX HLSL shaders and re-enabled them in the gui	2012-08-01 04:11:16 +02:00
Marc Zinnschlag	db10baafe1	Merge branch 'scriptconsole'	2012-07-30 12:43:48 +02:00
Marc Zinnschlag	fd6c155118	Issue #352: added --script-run switch	2012-07-30 12:37:46 +02:00
Marc Zinnschlag	23f8595b87	Issue #352: refactored script execution in console	2012-07-30 11:57:19 +02:00
Marc Zinnschlag	90de02b901	Issue #350: console only script instructions	2012-07-30 11:43:28 +02:00
Marc Zinnschlag	78fe6fdce5	Issue #351: Refactoring Action class	2012-07-27 12:00:10 +02:00
Marc Zinnschlag	2d080ce4ef	compile fix	2012-07-23 21:47:53 +02:00
Marc Zinnschlag	483a6d8605	Merge remote branch 'scrawl/shadersystem'	2012-07-23 21:46:06 +02:00
scrawl	02a52c0ff1	fixed some more settings bugs	2012-07-23 21:39:22 +02:00
scrawl	3ebc6fd590	fixed a settings window bug	2012-07-23 20:50:56 +02:00
scrawl	a70f93b024	fix "Crash when running openmw with --start="XYZ", remove HLSL for windows	2012-07-23 20:12:42 +02:00
Marc Zinnschlag	2c5d3d8df9	Merge remote branch 'scrawl/shadersystem' into shadersystem ... Attention: We have submodules again. Don't forget to update! Conflicts: components/files/configurationmanager.cpp	2012-07-23 14:12:21 +02:00
greye	32b1350b63	CreatureStats class	2012-07-22 18:29:54 +04:00
scrawl	f5ffea4d4b	new button, water timescale	2012-07-19 23:30:41 +02:00
scrawl	e077814a8c	water	2012-07-19 22:23:07 +02:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Marc Zinnschlag	2c70a93553	Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp	2012-07-17 10:32:18 +02:00
Marc Zinnschlag	0d3a7d482e	Merge remote branch 'modred11/master'	2012-07-17 10:21:46 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
scrawl	7d5b94709d	Merge branch 'master' into shadersystem ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2012-07-14 11:16:35 +02:00
Carl Maxwell	e4d046f69c	Prepending m to the name of every member variable. ... I made a bunch of changes in apps/openmw/mwrender/animation.cpp because the scope brackets didn't line up in a bunch of places npcanimations.cpp & creatureanimations.cpp were the same kind of thing	2012-07-13 03:51:58 -07:00
scrawl	e0a99f104b	settings tab "shadows"	2012-07-11 04:28:45 +02:00
scrawl	485adc8bdc	shader mode button in settingswindow	2012-07-11 03:19:51 +02:00
Marc Zinnschlag	6277e39216	Merge branch 'master' into skillgain	2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson	113457d934	Fixed some windows issues and got rid of a few tiny warnings while at it.	2012-07-07 01:14:18 +02:00
Marc Zinnschlag	d30ba14a17	Issue #324: Finished turning NpcStats into a proper class	2012-07-06 18:23:48 +02:00
scrawl	1a5203749f	fix "error in framelistener" when trying to pick up lights that can't be picked up	2012-07-05 17:13:23 +02:00
scrawl	78efc31641	different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308), fixed some windows not centering when resolution change	2012-07-03 16:51:29 +02:00
scrawl	085891879c	fixed another resolution change bug introduced recently	2012-07-03 16:44:20 +02:00