scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								73d48a95f6
								
							
						 | 
						
							
							
								
								Add message box when the player tries to move when being overencumbered.
							
							
							
							
							
						 | 
						
							2013-02-25 16:31:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Tom Mason
								
							 
						 | 
						
							
							
							
							
								
							
							
								158c6fc9fa
								
							
						 | 
						
							
							
								
								pressing enter when a messagebox is prompting for "ok", will activate ok button
							
							
							
							
							
						 | 
						
							2013-02-10 14:58:46 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lazydev
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd5d95ed22
								
							
						 | 
						
							
							
								
								1. Dialogs in Russian version now works.
							
							
							
							
							
							
							
							2. Destination names it travel window are now translated 
							
						 | 
						
							2012-12-31 04:15:47 +04: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
								
							 
						 | 
						
							
							
							
							
								
							
							
								ff2c2d2b96
								
							
						 | 
						
							
							
								
								Merge branch 'master' into spellcreation
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwbase/windowmanager.hpp 
							
						 | 
						
							2012-10-01 17:54:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d1c4559abe
								
							
						 | 
						
							
							
								
								fixed GMST string handling in GUI
							
							
							
							
							
						 | 
						
							2012-10-01 10:03:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c6ad13364
								
							
						 | 
						
							
							
								
								WakeUpPc instruction
							
							
							
							
							
						 | 
						
							2012-09-29 09:41:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gugus
								
							 
						 | 
						
							
							
							
							
								
							
							
								4f5c4bf89a
								
							
						 | 
						
							
							
								
								Merge branch 'spellcreation' of git@github.com:scrawl/openmw.git into Travel_Dialogue
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwgui/dialogue.hpp
	apps/openmw/mwgui/mode.hpp
	apps/openmw/mwgui/windowmanagerimp.cpp 
							
						 | 
						
							2012-09-28 17:09:15 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									gugus
								
							 
						 | 
						
							
							
							
							
								
							
							
								3060fbee60
								
							
						 | 
						
							
							
								
								TravelGUI, not completly finished.
							
							
							
							
							
						 | 
						
							2012-09-26 18:30:47 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d7c35ae48
								
							
						 | 
						
							
							
								
								and go
							
							
							
							
							
						 | 
						
							2012-09-23 00:36:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								98c1dc1151
								
							
						 | 
						
							
							
								
								ShowMap & FillMap commands, merged next
							
							
							
							
							
						 | 
						
							2012-09-20 18:02:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								be44810623
								
							
						 | 
						
							
							
								
								implemented GetPCSleep
							
							
							
							
							
						 | 
						
							2012-09-19 03:11:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								896428c129
								
							
						 | 
						
							
							
								
								enableRestMenu & enableLevelupMenu
							
							
							
							
							
						 | 
						
							2012-09-15 20:18:41 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								76b494100e
								
							
						 | 
						
							
							
								
								finished?
							
							
							
							
							
						 | 
						
							2012-09-15 17:12:42 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								2f0b47fc38
								
							
						 | 
						
							
							
								
								test
							
							
							
							
							
						 | 
						
							2012-09-13 00:21:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								2b339f6c0f
								
							
						 | 
						
							
							
								
								loading screen
							
							
							
							
							
						 | 
						
							2012-09-11 16:37:54 +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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								760f05c454
								
							
						 | 
						
							
							
								
								the HUD can be toggled with F12 key; useful for screenshots
							
							
							
							
							
						 | 
						
							2012-08-30 20:47:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								6ad08dfd33
								
							
						 | 
						
							
							
								
								added settings for crosshair & subtitles
							
							
							
							
							
						 | 
						
							2012-08-29 11:15:17 +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
								
							 
						 | 
						
							
							
							
							
								
							
							
								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
								
							 
						 | 
						
							
							
							
							
								
							
							
								bc6e4feedc
								
							
						 | 
						
							
							
								
								hotkey window first version
							
							
							
							
							
						 | 
						
							2012-08-13 01:26:15 +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 | 
						
						
							
							
							
								
							
							
						 |