Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								766e782aae 
								
							 
						 
						
							
							
								
								Merge remote branch 'greye/cross_cell-borders'  
							
							 
							
							
							
						 
						
							2012-08-11 12:05:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f3edea77b2 
								
							 
						 
						
							
							
								
								MSCV compatibility fix  
							
							 
							
							
							
						 
						
							2012-08-11 12:03:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								b53b27533a 
								
							 
						 
						
							
							
								
								fixes some include guards  
							
							 
							
							
							
						 
						
							2012-08-11 12:02:51 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								6eb9f15b6d 
								
							 
						 
						
							
							
								
								fixed time stamp operator  
							
							 
							
							
							
						 
						
							2012-08-11 11:38:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								45306e4bc3 
								
							 
						 
						
							
							
								
								fixed rotation adjustment  
							
							 
							
							
							
						 
						
							2012-08-11 13:23:54 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								5018db3332 
								
							 
						 
						
							
							
								
								removed some redundant code, added some comments  
							
							 
							
							
							
						 
						
							2012-08-11 12:13:16 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								11fadf4a07 
								
							 
						 
						
							
							
								
								forgot something  
							
							 
							
							
							
						 
						
							2012-08-10 16:25:27 +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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								38b06aee6c 
								
							 
						 
						
							
							
								
								resolving conflicts  
							
							 
							
							
							
						 
						
							2012-08-09 21:49:00 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								aca08eb4c2 
								
							 
						 
						
							
							
								
								Merge branch 'decouple' into player_control  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwsound/soundmanagerimp.hpp 
							
						 
						
							2012-08-09 16:12:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								b5bc7bc424 
								
							 
						 
						
							
							
								
								SoundManager dependency on camera pos/dir  
							
							 
							
							
							
						 
						
							2012-08-09 17:01:03 +04: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 
								
							 
						 
						
							
							
							
							
								
							
							
								a84145a087 
								
							 
						 
						
							
							
								
								Issue  #107 : minor corrections  
							
							 
							
							
							
						 
						
							2012-08-09 12:05:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								181d45661f 
								
							 
						 
						
							
							
								
								fix rotation angles  
							
							 
							
							
							
						 
						
							2012-08-09 13:43:52 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								6b996d8c34 
								
							 
						 
						
							
							
								
								fix disabled camera on start  
							
							 
							
							
							
						 
						
							2012-08-09 13:29:13 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								df60f4bf92 
								
							 
						 
						
							
							
								
								stub for soundmanager, adjust rotation mode  
							
							 
							
							
							
						 
						
							2012-08-09 13:27:32 +04: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  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e6ede480c7 
								
							 
						 
						
							
							
								
								Issue  #107 : fixed up some interfaces  
							
							 
							
							
							
						 
						
							2012-08-09 09:41:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								378fcc2460 
								
							 
						 
						
							
							
								
								fix DisablePlayerControl logic  
							
							 
							
							
							
						 
						
							2012-08-09 11:10:18 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								1511eb3549 
								
							 
						 
						
							
							
								
								implemented enable/disable player looking switch  
							
							 
							
							
							
						 
						
							2012-08-09 10:55:49 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								a2d87d5f5b 
								
							 
						 
						
							
							
								
								added camera flip control, fixed input rotation axis  
							
							 
							
							
							
						 
						
							2012-08-09 10:24:18 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								ec9cf4d3c6 
								
							 
						 
						
							
							
								
								rotateObject() added, input system rewritten  
							
							 
							
							
							
						 
						
							2012-08-09 00:15:52 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								28ecfb4290 
								
							 
						 
						
							
							
								
								Issue  #107 : ScriptManager is accessed only through the interface class from now on  
							
							 
							
							
							
						 
						
							2012-08-08 15:18:55 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9b567e4ba6 
								
							 
						 
						
							
							
								
								Issue  #107 : Removed a redundant function in world interface; added a comment  
							
							 
							
							
							
						 
						
							2012-08-08 14:54:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								b6f7f21bcf 
								
							 
						 
						
							
							
								
								fix player cell assertion fail, moveObject(Ptr&, CellStore&, f, f, f) added  
							
							 
							
							
							
						 
						
							2012-08-08 14:51:33 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								79b7487c87 
								
							 
						 
						
							
							
								
								fix using deleted objects  
							
							 
							
							
							
						 
						
							2012-08-07 22:21:46 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								d32a61b928 
								
							 
						 
						
							
							
								
								fix object moving  
							
							 
							
							
							
						 
						
							2012-08-06 18:20:48 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								ee97a204f2 
								
							 
						 
						
							
							
								
								fix npc animation key update  
							
							 
							
							
							
						 
						
							2012-08-06 15:26:37 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f5ee5a5414 
								
							 
						 
						
							
							
								
								Merge remote branch 'edmondo/master'  
							
							 
							
							
							
						 
						
							2012-08-05 00:03:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1db7978361 
								
							 
						 
						
							
							
								
								silenced a warning  
							
							 
							
							
							
						 
						
							2012-08-04 22:03:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								0c5f886683 
								
							 
						 
						
							
							
								
								Merge remote branch 'greye/player_control'  
							
							 
							
							
							
						 
						
							2012-08-04 21:55:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								16ad97610d 
								
							 
						 
						
							
							
								
								add support for some scripting player control switches  
							
							 
							
							
							
						 
						
							2012-08-04 11:54:42 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								994e33e3d2 
								
							 
						 
						
							
							
								
								fixed object rotation code  
							
							 
							
							
							
						 
						
							2012-08-04 09:34:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e4dc01832b 
								
							 
						 
						
							
							
								
								fixing object rotation script instructions (wrong argument type and missing error handling)  
							
							 
							
							
							
						 
						
							2012-08-04 09:18:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Edmondo Tommasina 
								
							 
						 
						
							
							
							
							
								
							
							
								11d0761528 
								
							 
						 
						
							
							
								
								terrainmaterial.cpp: fix std::runtime_error compile error  
							
							 
							
							
							
						 
						
							2012-08-03 22:42:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								ff62770657 
								
							 
						 
						
							
							
								
								World::isUnderwater(), World::isSwimming()  
							
							 
							
							
							
						 
						
							2012-08-03 14:42:09 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c251fbdf23 
								
							 
						 
						
							
							
								
								Merge branch 'master' into HEAD  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
	libs/openengine/ogre/renderer.cpp 
							
						 
						
							2012-08-02 14:57:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								e9aac4512b 
								
							 
						 
						
							
							
								
								Build fix for Windows  
							
							 
							
							... 
							
							
							
							Fixes a number of places where uint was used and not defined. This commit
was originally authored by gus. It rebased by Michael Mc Donnell to take
recent commit fixes into account. 
							
						 
						
							2012-08-01 11:47:36 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								ebd8b064f6 
								
							 
						 
						
							
							
								
								getStartingAngle script instruction  
							
							 
							
							
							
						 
						
							2012-08-01 12:21:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f6d657a5f4 
								
							 
						 
						
							
							
								
								Merge branch 'osx_fix'  
							
							 
							
							
							
						 
						
							2012-08-01 09:09:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								15a16aeba1 
								
							 
						 
						
							
							
								
								Fixed DirectX HLSL shaders and re-enabled them in the gui  
							
							 
							
							
							
						 
						
							2012-08-01 04:11:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								f2a2e5f57d 
								
							 
						 
						
							
							
								
								remove MWWorld::Player::setPos()  
							
							 
							
							
							
						 
						
							2012-07-31 19:30:24 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								0e3f70413e 
								
							 
						 
						
							
							
								
								a very little comments  
							
							 
							
							
							
						 
						
							2012-07-31 16:52:21 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								288b63350c 
								
							 
						 
						
							
							
								
								fixed objects update, local script handling  
							
							 
							
							
							
						 
						
							2012-07-31 11:46:57 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								defab0e4b5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into osx_fix  
							
							 
							
							... 
							
							
							
							Conflicts:
	CMakeLists.txt 
							
						 
						
							2012-07-31 01:06:18 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								b05dfeae70 
								
							 
						 
						
							
							
								
								bug  #348 : cleanup  
							
							 
							
							... 
							
							
							
							moved files to appropriate component, moved function to namespace,
added docs 
							
						 
						
							2012-07-31 01:01:00 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								37990b5133 
								
							 
						 
						
							
							
								
								fix player update  
							
							 
							
							
							
						 
						
							2012-07-30 23:54:26 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								d6150b7482 
								
							 
						 
						
							
							
								
								high-level implementation, unstable  
							
							 
							
							
							
						 
						
							2012-07-30 23:28:14 +04:00