scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2b7287cbd2 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into joystick  
							
							... 
							
							
							
							Conflicts:
	CMakeLists.txt 
							
						 
						
							2015-02-27 22:37:22 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								84ff11d0ab 
								
							 
						 
						
							
							
								
								check if v2 exists before attemping to copy it  
							
							
							
						 
						
							2015-02-27 22:21:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								464bbe4d6f 
								
							 
						 
						
							
							
								
								if v2 doesn't exist, don't erroneously set keyboardUserExists to true.  
							
							
							
						 
						
							2015-02-27 22:21:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								5d77ebdc60 
								
							 
						 
						
							
							
								
								If v3 doesn't exist, copy from v2  
							
							
							
						 
						
							2015-02-27 22:21:07 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								97cc2522c0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwgui/settingswindow.cpp
	extern/oics/ICSInputControlSystem_joystick.cpp
	files/mygui/openmw_settings_window.layout 
							
						 
						
							2015-02-27 22:21:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								df5513da7c 
								
							 
						 
						
							
							
								
								uses v3 input bindings, not v2  
							
							
							
						 
						
							2015-02-27 22:19:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								a192836582 
								
							 
						 
						
							
							
								
								(hopefully) correct gamecontrollerdb.txt behavior  
							
							
							
						 
						
							2015-02-27 22:19:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								796b4b01b0 
								
							 
						 
						
							
							
								
								Fix activating every frame when action is bound to a trigger  
							
							
							
						 
						
							2015-02-27 22:19:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								e3e6190b85 
								
							 
						 
						
							
							
								
								Added multiple joystick support in ICS. Will fix other issues shortly  
							
							
							
						 
						
							2015-02-27 22:19:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								1e4a845b6f 
								
							 
						 
						
							
							
								
								Minor code cleanup  
							
							
							
						 
						
							2015-02-27 22:19:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								44d1f43b2b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'sandstranger/fixes-for-android'  
							
							
							
						 
						
							2015-02-27 10:34:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								093c577895 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'dteviot/Bug2344'  
							
							
							
						 
						
							2015-02-26 19:05:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sylar 
								
							 
						 
						
							
							
							
							
								
							
							
								cda3782cf2 
								
							 
						 
						
							
							
								
								fix crash game on Android after start loading  
							
							
							
						 
						
							2015-02-26 18:30:38 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									sylar 
								
							 
						 
						
							
							
							
							
								
							
							
								1bb29f610f 
								
							 
						 
						
							
							
								
								enable mipmapping for Android again  
							
							
							
						 
						
							2015-02-26 18:29:38 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								70a482b3e8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'dteviot/Bug2346'  
							
							
							
						 
						
							2015-02-26 13:26:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								80e6df6092 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/opencs'  
							
							
							
						 
						
							2015-02-26 13:25:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								281e0042ab 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2015-02-26 13:23:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								72e94380be 
								
							 
						 
						
							
							
								
								fix: boost::filesystem::canonical() available from version 1.48.  
							
							
							
						 
						
							2015-02-26 20:07:23 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e7989a197d 
								
							 
						 
						
							
							
								
								Add defaults for some required globals ( Fixes   #2397 )  
							
							
							
						 
						
							2015-02-25 20:35:11 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3158d34abb 
								
							 
						 
						
							
							
								
								Fix for incorrect OpenCS verifier warning: pcvampire and pcwerewolf are not required, pcyear does not exist at all.  
							
							
							
						 
						
							2015-02-25 20:25:41 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								a77fbdc965 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jordan-ayers/bugfix/2400'  
							
							
							
						 
						
							2015-02-25 20:14:33 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								931c95d0b1 
								
							 
						 
						
							
							
								
								workaround for not building on Linux version of Travis.  
							
							
							
						 
						
							2015-02-26 06:17:29 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								659a8ba279 
								
							 
						 
						
							
							
								
								Correction to teleportation changes.  
							
							... 
							
							
							
							OMW Bug #2400 
Related to OMW Bug #1533 
Don't crash on confiscating items if a prison marker cannot be found. 
							
						 
						
							2015-02-24 21:10:01 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								691ebd2372 
								
							 
						 
						
							
							
								
								Correction to teleportation changes.  
							
							... 
							
							
							
							OMW Bug #2400 
Related to OMW Bug #1533 
Don't crash when finding the closest marker to an exterior position. 
							
						 
						
							2015-02-24 20:51:57 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bret Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								5672c86924 
								
							 
						 
						
							
							
								
								Rename window title for OpenMW-CS  
							
							
							
						 
						
							2015-02-24 23:37:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								24de6ba27e 
								
							 
						 
						
							
							
								
								Fix crash for LAND records without data  
							
							
							
						 
						
							2015-02-24 21:42:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								cc815c63f1 
								
							 
						 
						
							
							
								
								Fix: no longer loose changes when run install wizard or iniimport.  
							
							
							
						 
						
							2015-02-24 20:14:18 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								da9bd09a8c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'miroslavr/master'  
							
							
							
						 
						
							2015-02-23 20:53:44 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9109162030 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2015-02-23 20:51:18 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								77bb77b367 
								
							 
						 
						
							
							
								
								Fix for instant restore effects ( Fixes   #2392 )  
							
							
							
						 
						
							2015-02-23 19:07:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								84762c4eb8 
								
							 
						 
						
							
							
								
								Progress bar at 0% shows no text.  
							
							
							
						 
						
							2015-02-23 19:30:46 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								47c053444f 
								
							 
						 
						
							
							
								
								Make the jail progress last one second  
							
							
							
						 
						
							2015-02-23 00:23:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8e007c91fd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jordan-ayers/bugfix/1533'  
							
							
							
						 
						
							2015-02-22 21:58:01 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								07c27065d6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'slothlife/msvc-warning-fixes'  
							
							
							
						 
						
							2015-02-22 21:34:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								5edafc2a4c 
								
							 
						 
						
							
							
								
								Cleanup:  Add const to read-only CellRefList access.  
							
							... 
							
							
							
							OMW Bug #1533  
							
						 
						
							2015-02-22 12:25:10 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								399259a95c 
								
							 
						 
						
							
							
								
								Improve CellStore exception messages.  
							
							
							
						 
						
							2015-02-22 12:12:54 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								f6128a85b2 
								
							 
						 
						
							
							
								
								resolve symlinks when searching for file's last modified time.  
							
							
							
						 
						
							2015-02-22 13:48:44 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								c21b59ecff 
								
							 
						 
						
							
							
								
								Teleportation:  Avoid marking searched cells as changed.  
							
							... 
							
							
							
							OMW Bug #1533 
Only mark cells with the target marker / evidence chest as 'changed'. 
							
						 
						
							2015-02-21 17:55:05 -06:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5eadffd0c4 
								
							 
						 
						
							
							
								
								Make launcher's version label selectable so it can be copy-pasted into issue reports  
							
							
							
						 
						
							2015-02-22 00:13:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								514fba5f73 
								
							 
						 
						
							
							
								
								On Windows content list imported from morrowind.ini is sorted by file modified time stamps.  
							
							
							
						 
						
							2015-02-22 10:02:25 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								9708e8529f 
								
							 
						 
						
							
							
								
								Removed unneeded include.  
							
							
							
						 
						
							2015-02-22 08:58:17 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								accc078e0e 
								
							 
						 
						
							
							
								
								Morrowind.ini import progress bar.  ( Fixes   #2344 )  
							
							... 
							
							
							
							1. Show a "bouncing ball" Progress bar when importing from morrowind.ini.
2. Removed dialog that asks for content list name when import game files from morrowind.ini. Instead, name is time stamp.
3. Removed commented out code.
4. Additional bugfix. No longer create a empty content list when OpenMW.cfg has no content files. 
							
						 
						
							2015-02-22 08:46:12 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a5847afdac 
								
							 
						 
						
							
							
								
								Fix ignored clicks on HUD mini-map ( Fixes   #2388 )  
							
							
							
						 
						
							2015-02-20 00:00:13 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6d62aa7544 
								
							 
						 
						
							
							
								
								Don't prompt for spell deletion when using cycling keys ( Fixes   #2382 )  
							
							
							
						 
						
							2015-02-18 19:06:36 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								4c5bba2947 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'dteviot/SpellCastingFixes'  
							
							
							
						 
						
							2015-02-17 16:44:14 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8686ffcedb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2015-02-17 11:55:12 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								6e2d6a0282 
								
							 
						 
						
							
							
								
								Minor correction, MWWorld::getMaxActivationDistance() is now public.  
							
							
							
						 
						
							2015-02-17 22:51:30 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								8d7de7d1ec 
								
							 
						 
						
							
							
								
								Telekinesis allows safe opening of traps ( Fixes   #1916 )  
							
							... 
							
							
							
							When trap activated at beyond normal activation distance, assume telekinesis used and detonate trap at trapped object's location.
Also some minor code refactoring of spellcasting.
1. Corrected parameter passed to explodeSpell().
2. For loop now correctly does an early exit.
3. Removed duplicated tests. 
							
						 
						
							2015-02-17 22:14:25 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1b91bc73f6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/suppress-msvc-warning'  
							
							
							
						 
						
							2015-02-16 15:54:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								efdee19477 
								
							 
						 
						
							
							
								
								Suppress warning about the lack of virtual destructor.  
							
							
							
						 
						
							2015-02-16 16:41:53 +11:00