325 commits

Author	SHA1	Message	Date
scrawl	a6259a1b0d	bugfixes	2012-03-23 17:37:56 +01:00
scrawl	7a3034701f	functional HUD map	2012-03-23 16:51:56 +01:00
scrawl	a1f80e029e	abstracted some code to be reused for hud	2012-03-23 16:16:31 +01:00
scrawl	789fbb460f	move implementation to .cpp	2012-03-23 15:34:54 +01:00
scrawl	ce63d29d4a	rotate hud player arrow	2012-03-23 15:26:24 +01:00
scrawl	06fa310e29	player arrow rotated correctly	2012-03-23 15:00:48 +01:00
scrawl	770b0f2106	gui changes	2012-03-23 10:25:55 +01:00
scrawl	9c3e1f48f0	player arrow	2012-03-23 09:00:00 +01:00
scrawl	8e299bd25b	remove unuseful std::cout	2012-03-23 08:16:32 +01:00
scrawl	2dd329938a	automatically zoom in on the player while moving	2012-03-23 08:16:04 +01:00
scrawl	cf3515a898	it is now possible to drag the minimap with the mouse	2012-03-22 21:27:21 +01:00
scrawl	cc9f20a04f	MW_MapView skin	2012-03-22 20:25:41 +01:00
scrawl	ab9aa1ba74	Merge branch 'next' into minimap ... Conflicts: files/mygui/openmw_map_window_layout.xml	2012-03-22 19:36:37 +01:00
scrawl	d1508f5a59	List -> ListBox	2012-03-22 15:28:06 +01:00
scrawl	560e702973	fixed scroll bars	2012-03-22 15:23:23 +01:00
scrawl	26aae9d2ce	fix class name typo	2012-03-22 15:10:29 +01:00
scrawl	161d519206	fixed the dialogue history topic selection	2012-03-22 15:01:37 +01:00
scrawl	9b31b6272f	fixed the mouse cursors and fixed MWAttribute & MWSkill	2012-03-21 16:07:56 +01:00
scrawl	64212c0ee6	replaced all the StaticImage and StaticText in code	2012-03-21 14:54:02 +01:00
scrawl	b0b41a9199	should now compile warning free	2012-03-21 13:48:57 +01:00
scrawl	97ab48993e	more deprecated fixes	2012-03-21 13:32:32 +01:00
scrawl	deeb21a131	switched to the new multi-delegates system	2012-03-21 13:27:08 +01:00
scrawl	d451d7bb67	compile fixes for mygui 3.2	2012-03-20 20:24:36 +01:00
Marc Zinnschlag	4d0d941c2e	Merge remote branch 'kromgart/master'	2012-03-20 10:17:35 +01:00
Marc Zinnschlag	6a0474a977	removed some cout spam	2012-03-20 10:15:22 +01:00
Roman Melnik	88979577db	Change 'nullptr' to 'NULL' (after fixing bug#192 in previous commit)	2012-03-19 21:45:53 +02:00
Roman Melnik	a9759c3f33	Fix bug #192: Remove the focus from the console when console is closed ... (set current keyFocusWidget to nullptr)	2012-03-19 21:01:00 +02:00
Marc Zinnschlag	f2a47d421b	some cleanup	2012-03-19 19:21:08 +01:00
gugus	2707391535	fix for questions	2012-03-19 18:30:52 +01:00
gugus	7ca0503205	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-19 00:20:43 +01:00
gugus	f87bd65ae1	Merge branch 'DialogueSystem' of github.com:scrawl/openmw into DialogueSystem	2012-03-17 17:00:28 +01:00
gugus	846196d048	fixed a crash	2012-03-17 16:56:22 +01:00
scrawl	21143f006b	fix several warnings	2012-03-17 15:47:22 +01:00
Michael Papageorgiou	dbbf50a184	Journal sounds, close sound will be added later	2012-03-17 15:52:57 +02:00
scrawl	5e939e4818	map window now works for interiors	2012-03-17 13:59:51 +01:00
gugus	10321ff51a	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into DialogueSystem	2012-03-16 17:58:23 +01:00
gugus	042d87f77f	a lot of clean up	2012-03-16 17:53:34 +01:00
gugus	56a84b6a1a	choices works. The only thing remaining is the script arguments problems. ... Need a lot of clean up too.	2012-03-16 17:30:59 +01:00
scrawl	c885ec1bd1	Merge branch 'master' into minimap	2012-03-16 17:10:27 +01:00
scrawl	91d2031eb7	first attempt at map window	2012-03-16 17:09:31 +01:00
Marc Zinnschlag	5b378e820d	warning level adjustments and some related fixes	2012-03-15 16:01:41 +01:00
gugus	07d8d654cd	one step toward function filters and end choices.	2012-03-14 18:47:29 +01:00
scrawl	fa68be2b19	set map window cell name	2012-03-10 16:05:12 +01:00
gugus	6f7752633a	there was no extension in the compiler context. Corrected. But Choice doesn't work.	2012-03-07 18:44:09 +01:00
Marc Zinnschlag	65756db49e	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-03-05 11:34:16 +01:00
Marc Zinnschlag	4bdfbb6d4f	Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-03-05 11:34:06 +01:00
Marc Zinnschlag	e02cba58b1	Merge branch 'master' into next ... Conflicts: apps/openmw/mwclass/light.cpp	2012-02-20 14:34:27 +01:00
gugus	232e478768	Fix for prefix/suffix stuff	2012-02-15 13:23:59 +01:00
gugus	bc72b2d535	fixed text color	2012-02-12 22:24:23 +01:00
Lukasz Gromanowski	8829d46bda	Clean up compilation warnings. ... Clan up compilation warnings like "variable ... set but not used" introduced in some older and recent commits. Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>	2012-02-12 15:45:08 +01:00
Marc Zinnschlag	d9945a976d	Merge remote branch 'gus/DialogueSystem' into dialogue	2012-02-12 13:47:04 +01:00
gugus	4658ec276f	increased the max size of the text of the dialogue	2012-02-11 12:18:47 +01:00
gugus	94ab65f8bb	fixe a compiling error?	2012-02-10 16:21:04 +01:00
gugus	c65c160e7b	finished connecting the dialogue GUI and the dialogue manager	2012-02-05 12:25:23 +01:00
gugus	abe38e5f87	Started to weire the dialogue manager and the dialogue GUI	2012-02-05 10:54:56 +01:00
Marc Zinnschlag	52a6605f10	Merge remote branch 'mirc/refactor_wm' into refactor_wm ... - changed the way dynamics stats are passed to the character creation object - some more clean up Conflicts: .gitignore apps/openmw/mwgui/window_manager.cpp apps/openmw/mwgui/window_manager.hpp	2012-02-03 11:24:28 +01:00
Cris Mihalache	4bc7051741	Finished refactoring, brought CharacterCreation up to standards	2012-02-02 18:31:28 +02:00
Cris Mihalache	ed5892eb5c	Finished moving the bulk of character creation code	2012-01-30 21:53:17 +02:00
Cris Mihalache	d17ba6ce19	Forgot the CharacterCreation files	2012-01-30 19:27:49 +02:00
Cris Mihalache	4b758376be	Created a class for char gen, and starting moving code to it	2012-01-30 16:38:43 +02:00
Marc Zinnschlag	5a70f28f47	removed a warning	2012-01-29 20:29:02 +01:00
Cris Mihalache	6d4fa9274e	Moved OpenEngine systems into their appropriate classes	2012-01-29 17:31:18 +02:00
gugus	5cbd256e1c	"full" question support. Now needs to be linked with the dialogue Manager.	2012-01-28 16:16:49 +01:00
gugus	debec44b51	better colors (not perfect yet), and some basic question support (not finished yet).	2012-01-28 16:08:22 +01:00
gugus	f7cf5f9bef	improved the dialogue GUI. Questions are still missing.	2012-01-27 14:50:13 +01:00
Marc Zinnschlag	e3631003e9	Merge remote branch 'yacoby/detailed_fps'	2012-01-17 14:04:00 +01:00
Marc Zinnschlag	f5a82931b6	some cleanup	2012-01-17 13:53:27 +01:00
Jacob Essex	e73640e720	Improved code, added labels to the counter	2012-01-17 11:58:06 +00:00
gugus	484b8a95f0	removed useless std::cout	2012-01-16 21:58:18 +01:00
Jacob Essex	3b15170d09	Cleaned up and simplified the code relating to the fps display	2012-01-16 18:16:33 +00:00
gugus	eb4dea3d87	Previous/Next button implemented	2012-01-16 17:46:25 +01:00
Jacob Essex	18e4b73a86	Added a more detailed fps counter displaying the triangle and batch count	2012-01-16 15:33:21 +00:00
gugus	9031f62962	The journal is now in the center of the screen.	2012-01-11 12:58:39 +01:00
gugus	428d0ce820	journal formating. Problems with french accents.	2011-12-30 11:39:17 +01:00
gugus	d59284a096	first attempt to read the journal	2011-12-29 17:58:58 +01:00
gugus	28bd9ce362	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal	2011-12-11 11:21:57 +01:00
gugus	4087ab3cda	correct CMake and add some text formating attempt.	2011-12-01 13:44:34 +01:00
gugus	62946cc79d	can now clear text.	2011-11-28 17:00:32 +01:00
gugus	bc51ba5a38	Add the journal window (J key). It's still not in the right position.	2011-11-28 16:51:11 +01:00
Marc Zinnschlag	39af941d6f	Issue #19: Moved code from Engine to WindowManager and ScriptManager	2011-10-09 12:05:13 +02:00
k1ll	0ece722ff3	Added handling of quotation marks and search for matches now ignores the case of input and keywords. When completing and there are matching or partly matching uppercase keywords the output will be upercase too. If this is a problem i'll change it.	2011-07-19 18:42:34 +02:00
k1ll	ac43d482c5	Basic tab-completition seems to be finished. It's working like requested in the old thread.	2011-07-18 18:49:38 +02:00
Sebastian Wick	317c920e03	everything works, also the readPressedButton function should do the job	2011-07-12 20:05:04 +02:00
Sebastian Wick	16ed02baeb	all MessageBoxes look good; next: make them do something ;)	2011-07-12 19:17:07 +02:00
Sebastian Wick	0fc77dc1c3	everything looks good if buttons are on one line	2011-07-12 18:05:46 +02:00
Sebastian Wick	537b2bf963	set position on interactive MessageBox'es	2011-07-12 17:57:16 +02:00
Sebastian Wick	9c2bb76869	disigned the interactive messagebox. Have to center it and add button events	2011-06-19 22:56:51 +02:00
Sebastian Wick	23194a932f	creating the buttons on the fly	2011-06-19 19:41:42 +02:00
Sebastian Wick	5db8e8c449	InterMessageBox game mode	2011-06-19 19:10:44 +02:00
Sebastian Wick	e77240dceb	basics for InteractiveMessageBox	2011-06-18 15:50:41 +02:00
Sebastian Wick	d74f834735	make to boxes apear on the correct place even if the oldest is erased	2011-06-16 18:12:50 +02:00
Sebastian Wick	315f4078c6	make them behave like the MessageBox in the original game	2011-06-16 17:11:50 +02:00
Sebastian Wick	b72e9d3b2b	non-interactive MessageBox is finished. Didn't find any bugs.	2011-06-16 13:02:49 +02:00
Sebastian Wick	4d1db13c8f	MessageBoxmangerTimer is now working properly	2011-06-16 12:12:50 +02:00
Sebastian Wick	a4217f8fb8	Everything should work fine but deleting the existing MessageBox'es.	2011-06-15 22:53:05 +02:00
Sebastian Wick	94e010b790	delete all non-interactive MessageBox'es when creating an interactive MessageBox	2011-06-15 19:53:32 +02:00
Sebastian Wick	6dc35247da	Word wrap for MessageBox	2011-06-15 19:42:20 +02:00
Sebastian Wick	9c56031ee2	rudimental implementation of non-interactive MessageBox	2011-06-15 13:58:57 +02:00
Sebastian Wick	fc25ccef4e	MW_Dialog set ro right propertys	2011-06-14 22:11:36 +02:00
Sebastian Wick	56dc9ffcf3	now, realy deleted needless code.	2011-06-14 18:29:55 +02:00