Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d024c1a93f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2014-08-24 09:14:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1a8acac40a 
								
							 
						 
						
							
							
								
								Share keyframe data in NIF resource ( Fixes   #908 )  
							
							
							
						 
						
							2014-08-24 02:37:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2b407a9995 
								
							 
						 
						
							
							
								
								Refactor NIF cache  
							
							... 
							
							
							
							- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
 - Decouple cache from NIFFile (now a new nifcache component)
 - Add API for future background loading
 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck. 
							
						 
						
							2014-08-24 02:37:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								7c1b32ae62 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'miroslavr/corprus'  
							
							
							
						 
						
							2014-08-23 09:15:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								85aa237baf 
								
							 
						 
						
							
							
								
								Implement removal of corprus spells  
							
							
							
						 
						
							2014-08-22 03:34:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								96e7ff666d 
								
							 
						 
						
							
							
								
								Implement saving/loading of corprus stats, remove redundant code  
							
							
							
						 
						
							2014-08-19 03:17:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Bret Curtis 
								
							 
						 
						
							
							
							
							
								
							
							
								feb0ef8390 
								
							 
						 
						
							
							
								
								fixes building on systems with kFreeBSD kernel  
							
							
							
						 
						
							2014-08-18 17:19:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								83037a1a91 
								
							 
						 
						
							
							
								
								Move fast-forward of particle systems outside of OgreNifLoader ( Fixes   #1830 )  
							
							... 
							
							
							
							Particle systems were being fast-forwarded before the skeleton base was attached, so particles without the LocalSpace flag would spawn at an incorrect position. 
							
						 
						
							2014-08-18 16:37:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								360c7f863c 
								
							 
						 
						
							
							
								
								Store magic effect Base values in savegame ( Fixes   #1489 )  
							
							
							
						 
						
							2014-08-17 05:38:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2db50da8dd 
								
							 
						 
						
							
							
								
								Implement magic effect script instructions (Feature  #1489 )  
							
							
							
						 
						
							2014-08-17 05:09:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6c6b3bd890 
								
							 
						 
						
							
							
								
								Remove extra setVisibilityFlags on SkelBase  
							
							... 
							
							
							
							SkelBase is already contained in mEntities. 
							
						 
						
							2014-08-15 22:46:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								77a4e38c49 
								
							 
						 
						
							
							
								
								Remove -Wno-ignored-qualifiers and fix caused warnings  
							
							
							
						 
						
							2014-08-14 19:18:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								28e61c9834 
								
							 
						 
						
							
							
								
								Add default values for fDifficultyMult and sDifficulty ( Fixes   #1742 )  
							
							... 
							
							
							
							Also added values for some other GMSTs added in a Morrowind patch or Tribunal/BM 
							
						 
						
							2014-08-13 17:32:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e2ee3b2497 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/terrainstorage.cpp 
							
						 
						
							2014-08-12 19:53:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								40a33eb9f0 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'miroslavr/master'  
							
							
							
						 
						
							2014-08-12 17:49:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								baa14511cf 
								
							 
						 
						
							
							
								
								Use ResourceHelpers to replace DDS hacks scattered throughout the code, fix prefix comparision  
							
							
							
						 
						
							2014-08-12 12:18:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								28fe81df90 
								
							 
						 
						
							
							
								
								Make Lights with OffDefault flag not emit light nor particles when placed in a cell ( Fixes   #1796 )  
							
							
							
						 
						
							2014-08-11 20:39:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								4d403ed747 
								
							 
						 
						
							
							
								
								Rename and move functions for texture path correction  
							
							
							
						 
						
							2014-08-11 20:04:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4138c3e966 
								
							 
						 
						
							
							
								
								Reuse health of previous level rather than recalculating initial health ( Fixes   #1787 )  
							
							
							
						 
						
							2014-08-10 17:09:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ee3acc31a8 
								
							 
						 
						
							
							
								
								minor correction to previous commit  
							
							
							
						 
						
							2014-08-10 10:09:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								c43bd3c345 
								
							 
						 
						
							
							
								
								Continue loading esm after detecting string table overflow condition.  Should resolve bug  #1774 .  
							
							
							
						 
						
							2014-08-10 12:54:54 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								4873c4bd31 
								
							 
						 
						
							
							
								
								Generalize function for texture path correction ( Fixes   #1779 )  
							
							
							
						 
						
							2014-08-09 18:59:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8c26f802e6 
								
							 
						 
						
							
							
								
								Move terrain grid implementation to a component so the editor can use it (Feature  #1597 )  
							
							
							
						 
						
							2014-08-08 15:46:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								982453d4f6 
								
							 
						 
						
							
							
								
								Move ESM terrain data handler to esmterrain component so it can be used by the editor (Feature  #1597 )  
							
							
							
						 
						
							2014-08-08 15:46:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								22d7d8a466 
								
							 
						 
						
							
							
								
								Implement Command creature/humanoid magic effects ( Fixes   #1120 )  
							
							
							
						 
						
							2014-08-07 17:21:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7b5fde7c 
								
							 
						 
						
							
							
								
								Fix uninitialized QuestStatus in DialInfo ( Fixes   #1694 )  
							
							
							
						 
						
							2014-08-06 20:13:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f4ddf2a7b9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'sandstranger/android'  
							
							
							
						 
						
							2014-08-06 08:04:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								32ebc90ba4 
								
							 
						 
						
							
							
								
								fix v9  
							
							
							
						 
						
							2014-08-06 07:52:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								713787d92f 
								
							 
						 
						
							
							
								
								fix v7  
							
							
							
						 
						
							2014-08-06 07:48:16 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								8978f9bcc6 
								
							 
						 
						
							
							
								
								fix v6  
							
							
							
						 
						
							2014-08-06 02:10:47 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								3cd98e5259 
								
							 
						 
						
							
							
								
								fix code v5  
							
							
							
						 
						
							2014-09-06 02:02:39 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								e27ca878a1 
								
							 
						 
						
							
							
								
								fixed v 4  
							
							
							
						 
						
							2014-08-06 01:01:43 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								174b528082 
								
							 
						 
						
							
							
								
								fixe v 3  
							
							
							
						 
						
							2014-08-06 00:54:53 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								d8772156a7 
								
							 
						 
						
							
							
								
								fixe all code v 2  
							
							
							
						 
						
							2014-08-06 00:46:21 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								8a8b91dfe1 
								
							 
						 
						
							
							
								
								fixed all code for building on all platforms inlcudng ANDROID  
							
							
							
						 
						
							2014-09-04 22:47:03 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								7cd2d4809c 
								
							 
						 
						
							
							
								
								android-build  
							
							
							
						 
						
							2014-08-04 19:50:53 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								33c36bf0df 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2014-08-03 22:23:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Digmaster 
								
							 
						 
						
							
							
							
							
								
							
							
								a32ab842ae 
								
							 
						 
						
							
							
								
								Added ForceJump/ForceMoveJump commands  
							
							
							
						 
						
							2014-08-02 22:42:40 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1e6d557089 
								
							 
						 
						
							
							
								
								Merge branch 'visibility'  
							
							
							
						 
						
							2014-07-31 14:34:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								a25758c3b1 
								
							 
						 
						
							
							
								
								fixed visibility flags setting  
							
							
							
						 
						
							2014-07-31 14:02:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0c1c468f70 
								
							 
						 
						
							
							
								
								Accept a useless extra integer argument for addItem ( Fixes   #1726 )  
							
							
							
						 
						
							2014-07-31 01:18:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								45af34d189 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							
							
						 
						
							2014-07-29 19:35:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								543bb22e8f 
								
							 
						 
						
							
							
								
								Implement collision script instructions ( Fixes   #1111 )  
							
							
							
						 
						
							2014-07-29 19:01:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ccde462308 
								
							 
						 
						
							
							
								
								Fix typo (RefId -> RefNum)  
							
							
							
						 
						
							2014-07-29 19:01:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7dfb624ee2 
								
							 
						 
						
							
							
								
								Support loading text keys for objects without a skeleton  
							
							... 
							
							
							
							This means we can no longer map them to bone IDs, but they are unused anyway.
Required to load text keys from the default head models (such as Talk: Start/Stop and Blink: Start/Stop) 
							
						 
						
							2014-07-29 00:23:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									bogglez 
								
							 
						 
						
							
							
							
							
								
							
							
								c006393178 
								
							 
						 
						
							
							
								
								Fix  http://bugs.openmw.org/issues/768  
							
							... 
							
							
							
							Changes application_name in configuration manager to OpenMW instead of
openmw, if on windows. This shouldn't break anything since Windows uses
case-insensitive filesystems. Strictly speaking the installation
directory must be OpenMW now though (not sure whether this is the case) 
							
						 
						
							2014-07-28 21:52:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4773d754c6 
								
							 
						 
						
							
							
								
								Remove redundant isHostile flag ( Fixes   #1652 )  
							
							
							
						 
						
							2014-07-28 16:41:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								7991dfb907 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2014-07-28 09:03:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c9cd7fb6b7 
								
							 
						 
						
							
							
								
								Merge branch 'scripts'  
							
							
							
						 
						
							2014-07-28 09:02:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ad50b926f5 
								
							 
						 
						
							
							
								
								reducing some stray arguments again  
							
							
							
						 
						
							2014-07-28 09:01:44 +02:00