Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e02cba58b1 
								
							 
						 
						
							
							
								
								Merge branch 'master' into next  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwclass/light.cpp 
							
						 
						
							2012-02-20 14:34:27 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								38a0d1d1c5 
								
							 
						 
						
							
							
								
								Merging in master  
							
							
							
						 
						
							2012-02-19 15:39:12 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								e58f2f5363 
								
							 
						 
						
							
							
								
								Eliminating unnecessary data from skeletons and shape saving  
							
							
							
						 
						
							2012-02-19 02:01:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								2217847c57 
								
							 
						 
						
							
							
								
								Fixing a crash  
							
							
							
						 
						
							2012-02-18 15:29:40 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1a6a49b9b8 
								
							 
						 
						
							
							
								
								Merge remote branch 'lgro/fix_warnings'  
							
							
							
						 
						
							2012-02-13 11:06:41 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								273eac12a1 
								
							 
						 
						
							
							
								
								Merge remote branch 'jhooks/animation2' into animation2  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/npcanimation.cpp
	components/nifogre/ogre_nif_loader.cpp 
							
						 
						
							2012-02-12 13:41:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								cb95c82af2 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							
							
						 
						
							2012-01-29 23:39:36 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								1da519a914 
								
							 
						 
						
							
							
								
								Some cleanup  
							
							
							
						 
						
							2012-01-29 00:42:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								0d7f39fcb5 
								
							 
						 
						
							
							
								
								Merge branch 'refdata' into next  
							
							
							
						 
						
							2012-01-28 11:46:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Pieter van der Kloet 
								
							 
						 
						
							
							
							
							
								
							
							
								ea241d85ef 
								
							 
						 
						
							
							
								
								Fixed some issues with the CMake files  
							
							
							
						 
						
							2012-01-28 01:36:17 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c081160591 
								
							 
						 
						
							
							
								
								replaced container store in ref data with new custom data implementation  
							
							
							
						 
						
							2012-01-27 14:55:58 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								6de0847b86 
								
							 
						 
						
							
							
								
								Slightly better performance on animation  
							
							
							
						 
						
							2012-01-25 01:21:30 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								ec6243dd77 
								
							 
						 
						
							
							
								
								fixed compilation problem with llvm clang: constant type explicitly set to float  
							
							
							
						 
						
							2012-01-24 16:01:29 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								bcf3e45ff6 
								
							 
						 
						
							
							
								
								Proper buffer designation  
							
							
							
						 
						
							2012-01-18 22:00:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								0c2de2c00c 
								
							 
						 
						
							
							
								
								Merge branch 'animation2'  
							
							
							
						 
						
							2012-01-17 15:37:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9b910dda94 
								
							 
						 
						
							
							
								
								clean up  
							
							
							
						 
						
							2012-01-17 15:10:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								d1793bc4bd 
								
							 
						 
						
							
							
								
								Animation files in the correct directory  
							
							
							
						 
						
							2012-01-12 20:09:55 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								0712bba49b 
								
							 
						 
						
							
							
								
								Changing a few things around with handleshapes  
							
							
							
						 
						
							2012-01-12 16:03:07 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								eab69f18ac 
								
							 
						 
						
							
							
								
								File output switch  
							
							
							
						 
						
							2012-01-10 00:34:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								295eb27c2d 
								
							 
						 
						
							
							
								
								Better Text Indices; Better file output  
							
							
							
						 
						
							2012-01-06 18:23:41 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								859ac1153e 
								
							 
						 
						
							
							
								
								Basic Text Indices Working  
							
							
							
						 
						
							2012-01-06 02:27:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								0715f9b6ab 
								
							 
						 
						
							
							
								
								Preparing to use text indices  
							
							
							
						 
						
							2012-01-06 00:55:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								595d0b1192 
								
							 
						 
						
							
							
								
								Cleanup; warnings  
							
							
							
						 
						
							2012-01-05 21:45:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								45c57721ff 
								
							 
						 
						
							
							
								
								Turning off hardware skinning2  
							
							
							
						 
						
							2012-01-04 20:30:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								762727308e 
								
							 
						 
						
							
							
								
								Hardware skinning working (YESgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --allgit add components --all)  
							
							
							
						 
						
							2012-01-02 23:06:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								5cfac197d4 
								
							 
						 
						
							
							
								
								Merge branch 'journalfix' of  https://github.com/zinnschlag/openmw.git  into journal  
							
							
							
						 
						
							2011-12-29 17:59:21 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								baa3f51886 
								
							 
						 
						
							
							
								
								Trying to fix errors  
							
							
							
						 
						
							2011-12-28 14:48:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								cef2f5e927 
								
							 
						 
						
							
							
								
								Trying to get code to conform with older c++  
							
							
							
						 
						
							2011-12-27 19:19:45 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								d855bb4fc6 
								
							 
						 
						
							
							
								
								physics reenabled  
							
							
							
						 
						
							2011-12-27 17:52:17 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								022f0fd5bd 
								
							 
						 
						
							
							
								
								link order fix for components  
							
							
							
						 
						
							2011-12-26 22:28:53 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								6d10c76b06 
								
							 
						 
						
							
							
								
								Unique Identifiers for Creatures and NPC Free Parts  
							
							
							
						 
						
							2011-12-17 01:29:08 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								d51dfebde1 
								
							 
						 
						
							
							
								
								NPCs fully rendered  
							
							
							
						 
						
							2011-12-15 00:33:10 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								47112ad7f9 
								
							 
						 
						
							
							
								
								Changing a lot of things  
							
							
							
						 
						
							2011-12-13 23:49:03 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								0902a3db89 
								
							 
						 
						
							
							
								
								Filled out NpcAnimation and CreatureAnimation classes  
							
							
							
						 
						
							2011-12-11 22:40:00 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								28bd9ce362 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/zinnschlag/openmw.git  into journal  
							
							
							
						 
						
							2011-12-11 11:21:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								39338f4be1 
								
							 
						 
						
							
							
								
								NPC bounded parts  
							
							
							
						 
						
							2011-12-09 15:20:35 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								5c48d8fc1e 
								
							 
						 
						
							
							
								
								more stuff  
							
							
							
						 
						
							2011-12-09 03:02:09 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								835c3f2603 
								
							 
						 
						
							
							
								
								Working towards npc rendering  
							
							
							
						 
						
							2011-11-27 02:27:06 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								7bd911b401 
								
							 
						 
						
							
							
								
								Problems with handles  
							
							
							
						 
						
							2011-11-24 23:13:34 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								e8ec9093f8 
								
							 
						 
						
							
							
								
								More NIFLoader code  
							
							
							
						 
						
							2011-11-23 18:18:51 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								828a3904a5 
								
							 
						 
						
							
							
								
								BSAArchive done and some change to NIFLoader  
							
							
							
						 
						
							2011-11-23 02:17:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								7319f7a8c6 
								
							 
						 
						
							
							
								
								Many bugs fixed related to changing cells  
							
							
							
						 
						
							2011-11-19 01:01:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								c25b49d2b6 
								
							 
						 
						
							
							
								
								refdata change  
							
							
							
						 
						
							2011-11-08 22:59:39 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jacob Essex 
								
							 
						 
						
							
							
							
							
								
							
							
								9aac625000 
								
							 
						 
						
							
							
								
								Changes to move the mutable ESM::Position data to RefData  
							
							
							
						 
						
							2011-11-08 00:08:00 +00:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								cb1373a4c7 
								
							 
						 
						
							
							
								
								rewrote cmake scripts for components  
							
							
							
						 
						
							2011-11-06 09:30:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								325250f347 
								
							 
						 
						
							
							
								
								Merge remote branch 'gus/journal' into physicsfix  
							
							... 
							
							
							
							Conflicts:
	components/files/windowspath.cpp 
							
						 
						
							2011-10-29 14:01:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									gugus 
								
							 
						 
						
							
							
							
							
								
							
							
								241cf2555d 
								
							 
						 
						
							
							
								
								Fixe collision shape bug.  
							
							
							
						 
						
							2011-10-29 13:35:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								c52ae6825f 
								
							 
						 
						
							
							
								
								Applying Gus's Windows fix2  
							
							
							
						 
						
							2011-10-18 21:04:31 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								0992f1e903 
								
							 
						 
						
							
							
								
								Applying Gus's Windows fix  
							
							
							
						 
						
							2011-10-18 21:02:42 -04:00