Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								afa859a6a6 
								
							 
						 
						
							
							
								
								Merge remote branch 'jhooks/clothingarmor'  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/npcanimation.cpp 
							
						 
						
							2012-04-15 22:06:05 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								95f87a8abf 
								
							 
						 
						
							
							
								
								more or less complete list for morrowind.bsa (thanks to artorius)  
							
							
							
						 
						
							2012-04-12 16:33:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a727bcd4a4 
								
							 
						 
						
							
							
								
								override nif transparency settings (part 1)  
							
							
							
						 
						
							2012-04-11 20:13:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2a4fcf42a3 
								
							 
						 
						
							
							
								
								basic shadows  
							
							
							
						 
						
							2012-04-11 18:53:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								74deb5588d 
								
							 
						 
						
							
							
								
								Post merge  
							
							
							
						 
						
							2012-04-08 20:41:49 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cdea19206c 
								
							 
						 
						
							
							
								
								Revert "more accurate fog, TODO: apply this to the terrain"  
							
							... 
							
							
							
							This reverts commit 96c37d3e7c 
							
						 
						
							2012-04-07 22:47:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								96911ada95 
								
							 
						 
						
							
							
								
								restored render queue of transparent objects, they are now part of the mrt textures  
							
							... 
							
							
							
							this fixes some issues with transparent objects not visible in the refraction 
							
						 
						
							2012-04-07 22:37:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								96c37d3e7c 
								
							 
						 
						
							
							
								
								more accurate fog, TODO: apply this to the terrain  
							
							
							
						 
						
							2012-04-07 16:55:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								622fb568cf 
								
							 
						 
						
							
							
								
								removed MRT setting and figure it out automatically  
							
							
							
						 
						
							2012-04-05 19:27:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								006970fd79 
								
							 
						 
						
							
							
								
								add MRT code to shaders  
							
							
							
						 
						
							2012-04-04 19:53:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								57299571d5 
								
							 
						 
						
							
							
								
								Preparing for clothes/armor  
							
							
							
						 
						
							2012-04-02 22:08:46 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6091a0504d 
								
							 
						 
						
							
							
								
								first settings test (config file has to be created manually)  
							
							
							
						 
						
							2012-04-01 16:59:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander "Ace" Olofsson 
								
							 
						 
						
							
							
							
							
								
							
							
								4a9a416d46 
								
							 
						 
						
							
							
								
								Can find files even if no .bsa file exists now  
							
							
							
						 
						
							2012-03-30 14:45:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								f8afc22f04 
								
							 
						 
						
							
							
								
								Issue  #225 : Corrected wrong delete operator introduced by one of previous commit.  
							
							
							
						 
						
							2012-03-26 23:16:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								2b9845a5b6 
								
							 
						 
						
							
							
								
								Issue  #225 : Free memory allocated for sending into HardwareVertexBuffer.  
							
							... 
							
							
							
							Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class. 
							
						 
						
							2012-03-26 19:09:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								118250171d 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/zinnschlag/openmw  into shaders  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/objects.cpp 
							
						 
						
							2012-03-13 17:31:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								3d1cbcd4e7 
								
							 
						 
						
							
							
								
								Merge remote branch 'jhooks/animperform'  
							
							
							
						 
						
							2012-03-07 09:20:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								9848b67174 
								
							 
						 
						
							
							
								
								Fixing errors  
							
							
							
						 
						
							2012-03-05 17:46:29 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f7b706d24e 
								
							 
						 
						
							
							
								
								use the vertex colours that morrowind supplies for a lot of meshes  
							
							
							
						 
						
							2012-03-05 18:50:56 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ff8f95fcca 
								
							 
						 
						
							
							
								
								fix batch lighting, removed the "bumping number of lights" hack  
							
							
							
						 
						
							2012-03-04 23:18:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								332671b43d 
								
							 
						 
						
							
							
								
								lighting fix  
							
							
							
						 
						
							2012-03-04 22:26:40 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b2109a1302 
								
							 
						 
						
							
							
								
								make the vertex colours only affect diffuse, this caused some areas to  
							
							... 
							
							
							
							be darker than they should be 
							
						 
						
							2012-03-04 22:01:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8910b0d471 
								
							 
						 
						
							
							
								
								use shaders for all NIF materials. this has numerous advantages:  
							
							... 
							
							
							
							- vertex colours are now working as they should (and they have a huge impact on the look)
 - the lighting is per pixel and looks a lot better
 - by using shaders, we can use more lights at a time (fixed function has max of 8) 
							
						 
						
							2012-03-04 20:59:23 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								8d7a5f469b 
								
							 
						 
						
							
							
								
								a few changes  
							
							
							
						 
						
							2012-02-26 21:27:54 -05: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									Jason Hooks 
								
							 
						 
						
							
							
							
							
								
							
							
								1da519a914 
								
							 
						 
						
							
							
								
								Some cleanup  
							
							
							
						 
						
							2012-01-29 00:42:55 -05: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 
								
							 
						 
						
							
							
							
							
								
							
							
								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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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