slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								df99d5a59d 
								
							 
						 
						
							
							
								
								Move setup code for OSG when statically linked  
							
							
							
						 
						
							2015-07-17 09:56:21 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								43b1f15af9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into static-deps-build  
							
							
							
						 
						
							2015-07-17 01:03:19 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								83ef1f7eea 
								
							 
						 
						
							
							
								
								Add support for linking OpenSceneGraph statically  
							
							... 
							
							
							
							Added some basic support for linking to OpenSceneGraph and its plugins
statically. Also added a library necessary to statically link MyGUI
(previously Ogre pulled it in). 
							
						 
						
							2015-07-17 00:56:15 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								e8a9567be3 
								
							 
						 
						
							
							
								
								Move DELE handling to CellRef record  
							
							
							
						 
						
							2015-07-15 19:39:01 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Koncord 
								
							 
						 
						
							
							
							
							
								
							
							
								73731d27e9 
								
							 
						 
						
							
							
								
								Add ${MYGUI_LIBRARIES} to components/CMakeLists.txt  
							
							
							
						 
						
							2015-07-14 23:54:47 +09:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								de6dc21552 
								
							 
						 
						
							
							
								
								Create hardware cursors in advance ( Fixes   #2660 )  
							
							
							
						 
						
							2015-07-13 23:36:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								b55a4999ca 
								
							 
						 
						
							
							
								
								Add NAME handling to DebugProfile and Filter records  
							
							
							
						 
						
							2015-07-13 22:37:14 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c4866bdfc6 
								
							 
						 
						
							
							
								
								Disable mipmaps for GUI textures  
							
							... 
							
							
							
							For some reason, the mipmap generator seems to be broken on Linux Intel graphics (works on Nvidia). This was breaking the scrollbar arrows, which are minified enough to show using a mipmap. 
							
						 
						
							2015-07-13 19:13:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c79dc1ef 
								
							 
						 
						
							
							
								
								Move ID loading into a separate method for Dialogue and DialInfo records  
							
							
							
						 
						
							2015-07-13 11:26:23 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								74a055f3cc 
								
							 
						 
						
							
							
								
								Remove NAME and DELE handling from IdCollection  
							
							
							
						 
						
							2015-07-13 10:40:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								c266315a35 
								
							 
						 
						
							
							
								
								Load/read methods in MWWorld::Store return a pair (record ID, deleted flag)  
							
							
							
						 
						
							2015-07-12 15:20:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								2ed182b144 
								
							 
						 
						
							
							
								
								Update to upstream/master. Resolve merge conflicts in MWWorld::Store  
							
							
							
						 
						
							2015-07-12 12:01:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								adec0cb61d 
								
							 
						 
						
							
							
								
								Add removing of deleted Infos to Dialogue::clearDeletedInfos()  
							
							
							
						 
						
							2015-07-12 00:19:04 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								e0983c815c 
								
							 
						 
						
							
							
								
								Some fixes for ESM Dialogues and Infos  
							
							
							
						 
						
							2015-07-11 22:17:53 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								24ae1d5ace 
								
							 
						 
						
							
							
								
								Fix some issues found by coverity  
							
							
							
						 
						
							2015-07-11 03:34:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								08d2b196bd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'ace/explicit-instantiation'  
							
							
							
						 
						
							2015-07-10 08:58:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								72686c32ae 
								
							 
						 
						
							
							
								
								Fix runtime exceptions on MyGUI debug builds  
							
							
							
						 
						
							2015-07-10 03:03:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								7ecb54a776 
								
							 
						 
						
							
							
								
								Set Deleted flag to false when initializing ESM records  
							
							
							
						 
						
							2015-07-10 00:29:46 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								89e44c8f1f 
								
							 
						 
						
							
							
								
								Remove explicit record ID in load/read methods of MWWorld::Store  
							
							
							
						 
						
							2015-07-10 00:29:36 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								b2f3ccb080 
								
							 
						 
						
							
							
								
								Add NAME handling to GameSetting record  
							
							
							
						 
						
							2015-07-10 00:29:34 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								09a3358017 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to Global record  
							
							
							
						 
						
							2015-07-10 00:29:32 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								30b42bf4c0 
								
							 
						 
						
							
							
								
								Remove redundant code  
							
							
							
						 
						
							2015-07-10 00:29:30 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								8c3654af11 
								
							 
						 
						
							
							
								
								Add NAME handling to Race record  
							
							
							
						 
						
							2015-07-10 00:29:28 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								b667338a8f 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to Cell record  
							
							
							
						 
						
							2015-07-10 00:29:26 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								847614c26f 
								
							 
						 
						
							
							
								
								Add DELE handling to Info record  
							
							
							
						 
						
							2015-07-10 00:29:24 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								0b537186e5 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to Dialogue record  
							
							
							
						 
						
							2015-07-10 00:29:22 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								19ac4e942a 
								
							 
						 
						
							
							
								
								Change DELE sub-record value to 0 (4 bytes)  
							
							
							
						 
						
							2015-07-10 00:29:20 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								d2c15647a3 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to Script record  
							
							
							
						 
						
							2015-07-10 00:29:18 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								9ac20a3355 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to ESM records.  
							
							... 
							
							
							
							Changed records are those where DELE is inserted at the beginning of a
record (before NAME).
The record has all required sub-records in this case. 
							
						 
						
							2015-07-10 00:25:54 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								926c825d0c 
								
							 
						 
						
							
							
								
								Add NAME and DELE handling to ESM records.  
							
							... 
							
							
							
							Changed records are those where DELE is located after NAME sub-record.
And DELE is the last sub-record. 
							
						 
						
							2015-07-10 00:18:00 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander "Ace" Olofsson 
								
							 
						 
						
							
							
							
							
								
							
							
								2bebfea38d 
								
							 
						 
						
							
							
								
								Instantiate struct as a struct  
							
							
							
						 
						
							2015-07-09 22:45:25 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander "Ace" Olofsson 
								
							 
						 
						
							
							
							
							
								
							
							
								3655ef16af 
								
							 
						 
						
							
							
								
								Explicitly instantiate ESM::StatState  
							
							
							
						 
						
							2015-07-07 19:19:37 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								49c07de773 
								
							 
						 
						
							
							
								
								Merge pull request  #643  from ace13/win-build-fix  
							
							... 
							
							
							
							Fix build error and a pair of warnings 
							
						 
						
							2015-07-05 22:24:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Alexander "Ace" Olofsson 
								
							 
						 
						
							
							
							
							
								
							
							
								aaaee74a4d 
								
							 
						 
						
							
							
								
								Fix the comments  
							
							
							
						 
						
							2015-07-05 21:56:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								631cec7304 
								
							 
						 
						
							
							
								
								Take the radius of lights into account when sorting  
							
							
							
						 
						
							2015-07-02 20:46:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								bf9c62fa42 
								
							 
						 
						
							
							
								
								Fix for some coverity scan defects  
							
							
							
						 
						
							2015-07-02 20:46:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a1432b0255 
								
							 
						 
						
							
							
								
								Move attackingOrSpell flag to the CharacterController  
							
							
							
						 
						
							2015-07-02 19:14:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a081d402c5 
								
							 
						 
						
							
							
								
								Use the format field instead of version field  
							
							
							
						 
						
							2015-06-30 17:26:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4637750601 
								
							 
						 
						
							
							
								
								Savegame loading optimization  
							
							
							
						 
						
							2015-06-30 16:47:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								43f9c7f295 
								
							 
						 
						
							
							
								
								Skip the Update traversal for inactive skeletons  
							
							
							
						 
						
							2015-06-30 03:25:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1956e2c988 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt 
							
						 
						
							2015-06-28 00:38:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								502cc852da 
								
							 
						 
						
							
							
								
								Handle encoding conversions when saving TES3 header ( Fixes   #2727 )  
							
							
							
						 
						
							2015-06-26 20:16:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								882e359008 
								
							 
						 
						
							
							
								
								Move attackStrength to the CharacterController, where it should have been to begin with  
							
							... 
							
							
							
							Only relevant for actors in active cells, so doesn't belong in CreatureStats. This change should slightly reduce the game's memory usage. 
							
						 
						
							2015-06-26 05:15:07 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5bc6513e2d 
								
							 
						 
						
							
							
								
								Fix projectile hit bug where the incorrect attackStrength would be used if a new attack has been performed in the meantime  
							
							
							
						 
						
							2015-06-26 02:32:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1d76607005 
								
							 
						 
						
							
							
								
								Add ORI (ObjectReferenceInfo) alias for BetaComment ( Fixes   #2723 )  
							
							
							
						 
						
							2015-06-25 21:48:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ea0339d471 
								
							 
						 
						
							
							
								
								Make the string argument to BetaComment optional  
							
							
							
						 
						
							2015-06-25 21:45:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5ac502d104 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							
							
						 
						
							2015-06-23 05:12:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d3ef075952 
								
							 
						 
						
							
							
								
								Fix an uninitialized variable  
							
							
							
						 
						
							2015-06-23 05:06:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a5670b5133 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp 
							
						 
						
							2015-06-22 20:09:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2ce269c0fc 
								
							 
						 
						
							
							
								
								Werewolf stats compatibility with old save files  
							
							
							
						 
						
							2015-06-21 18:45:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d6a7255391 
								
							 
						 
						
							
							
								
								Loading/saving for player's original skills/attributes (prior to becoming a werewolf)  
							
							
							
						 
						
							2015-06-21 17:36:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								44582fe3b3 
								
							 
						 
						
							
							
								
								Don't use separate werewolf skills/attributes for non-player werewolves  
							
							... 
							
							
							
							Still need to deal with save files. 
							
						 
						
							2015-06-21 17:28:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								efad4efe19 
								
							 
						 
						
							
							
								
								Star fading (Bug  #2693 )  
							
							
							
						 
						
							2015-06-19 20:55:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7a5f220ac5 
								
							 
						 
						
							
							
								
								GlowTexture keeps the alpha channel from the previous texture stage  
							
							
							
						 
						
							2015-06-19 17:43:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								39539603bf 
								
							 
						 
						
							
							
								
								Re-enable a warning message  
							
							
							
						 
						
							2015-06-18 03:03:30 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a7c5beb7c5 
								
							 
						 
						
							
							
								
								Remove redundant allocations for NIF meshes  
							
							
							
						 
						
							2015-06-18 01:26:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								43384596d4 
								
							 
						 
						
							
							
								
								Style fix  
							
							
							
						 
						
							2015-06-18 01:26:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fabc5126f3 
								
							 
						 
						
							
							
								
								Include cleanup  
							
							
							
						 
						
							2015-06-18 00:30:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								81a4a6da6b 
								
							 
						 
						
							
							
								
								Make better use of the available texture units (Bug  #2702 )  
							
							... 
							
							
							
							Nvidia drivers only support a maximum of 4 fixed function texture units. To resolve this problem, bind texture units in order instead of binding to the NiTexturingProperty::TextureType unit. 
							
						 
						
							2015-06-17 20:43:39 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								934166a853 
								
							 
						 
						
							
							
								
								Ignore the alpha value for particle materials (Bug  #2699 )  
							
							
							
						 
						
							2015-06-17 18:04:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b648722d3b 
								
							 
						 
						
							
							
								
								Don't use the ParticleSystem for computing placeable bounds (Bug  #2700 )  
							
							
							
						 
						
							2015-06-17 15:13:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6199c0bbc5 
								
							 
						 
						
							
							
								
								Use osgDB::SharedStateManager for sharing of StateSets across NIF files  
							
							
							
						 
						
							2015-06-16 23:50:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3663511cdb 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	extern/ogre-ffmpeg-videoplayer/CMakeLists.txt 
							
						 
						
							2015-06-16 19:53:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								cccf6c6bdd 
								
							 
						 
						
							
							
								
								Rebuild the list of available content files when opening the open/new dialogues.  Should resolve Bug  #2644 .  
							
							
							
						 
						
							2015-06-16 12:48:45 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								aad8e7b6d0 
								
							 
						 
						
							
							
								
								Light culling fix  
							
							
							
						 
						
							2015-06-15 19:37:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								18f4eaa8dc 
								
							 
						 
						
							
							
								
								Preliminary handling for overflowing light lists  
							
							
							
						 
						
							2015-06-15 18:56:40 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								acf9fc2d37 
								
							 
						 
						
							
							
								
								Enable per-frame light list updates (Bug  #2638 , Bug  #2654 )  
							
							... 
							
							
							
							The performance impact isn't so big anymore since the last commit. 
							
						 
						
							2015-06-15 18:15:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1d198a5592 
								
							 
						 
						
							
							
								
								Keep the light list StateSet cache for more than one frame  
							
							
							
						 
						
							2015-06-15 18:09:01 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8fc0bdfac7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/keep-config-comments'  
							
							
							
						 
						
							2015-06-15 16:22:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d7a4a9fd66 
								
							 
						 
						
							
							
								
								Create NIF root nodes as Group instead of Transform when possible  
							
							
							
						 
						
							2015-06-15 15:25:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								6b28955f31 
								
							 
						 
						
							
							
								
								Fix attempt to erase using a const_iterator.  
							
							
							
						 
						
							2015-06-15 10:26:16 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b79ab1a3b8 
								
							 
						 
						
							
							
								
								Fix InverseWorldMatrix bug introduced by last commit  
							
							
							
						 
						
							2015-06-15 02:22:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ec25f1da95 
								
							 
						 
						
							
							
								
								Fix ParticleSystem bug introduced by last commit  
							
							
							
						 
						
							2015-06-15 02:17:57 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ad46ff7a98 
								
							 
						 
						
							
							
								
								Remove redundant Transform nodes for TriShapes/ParticleSystems with an identity transform  
							
							
							
						 
						
							2015-06-15 02:06:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								36aa4aa9bd 
								
							 
						 
						
							
							
								
								If a removed 'content=' item has comments, keep them in config file for later use.  
							
							
							
						 
						
							2015-06-15 09:53:26 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ab597f672e 
								
							 
						 
						
							
							
								
								State the filename in NIF loader warning messages  
							
							
							
						 
						
							2015-06-15 01:49:46 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6a788c3462 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							
							
						 
						
							2015-06-15 01:29:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a5b72a358b 
								
							 
						 
						
							
							
								
								Prune empty nodes in RemoveDrawableVisitor  
							
							... 
							
							
							
							Gets rid of 28 useless transform nodes in base_anim.1st.nif. 
							
						 
						
							2015-06-14 23:56:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9e049894e8 
								
							 
						 
						
							
							
								
								Reduce the number of StateSets created for NIF scene graphs  
							
							... 
							
							
							
							The Material state is now set on the NiTriShape's node rather than the Geode, thus merged with other state like NiTexturingProperties, etc that are typically attached to the NiTriShape.
Effectively cuts in half the number of StatSets for a NIF file, resulting in big speedup (~10%) in the Cull and Draw phases. 
							
						 
						
							2015-06-14 21:22:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b204396b57 
								
							 
						 
						
							
							
								
								Minor fix  
							
							
							
						 
						
							2015-06-14 21:04:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								98571148b0 
								
							 
						 
						
							
							
								
								Remove custom license for terrain code  
							
							... 
							
							
							
							Now that it's no longer a stand-alone component, there's not much point in custom licensing it. 
							
						 
						
							2015-06-14 20:44:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cad18969e3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp
	apps/openmw/mwmechanics/aitravel.cpp 
							
						 
						
							2015-06-14 16:32:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e17f7ac81a 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/master'  
							
							
							
						 
						
							2015-06-14 12:50:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								c22c9c271d 
								
							 
						 
						
							
							
								
								Allow comments (lines starting with # character) and blank lines in openmw.cfg.  Should resolve Feature  #2535 .  
							
							... 
							
							
							
							- allows moving various config entries up or down
- comment lines above config entries stay as a pair 
							
						 
						
							2015-06-14 14:51:01 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								28caeadef4 
								
							 
						 
						
							
							
								
								Improve error message for not found records  
							
							
							
						 
						
							2015-06-14 02:31:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								de98d991b4 
								
							 
						 
						
							
							
								
								Revert "Allow comments (lines starting with # character) and blank lines in openmw.cfg.  Should resolve Feature #2535."  
							
							... 
							
							
							
							Breaks the saving of content= entry order.
This reverts commit 15fe5d88e2 
							
						 
						
							2015-06-13 23:50:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c54a225467 
								
							 
						 
						
							
							
								
								Revert "Allow space characters in front of comments."  
							
							... 
							
							
							
							This reverts commit 4902c66792 
							
						 
						
							2015-06-13 23:49:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3bfe167bc0 
								
							 
						 
						
							
							
								
								Revert "Fix loop where there was a potential for double entry."  
							
							... 
							
							
							
							This reverts commit a439f49c4d 
							
						 
						
							2015-06-13 23:49:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f70250a296 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/launcher/CMakeLists.txt
	apps/opencs/CMakeLists.txt
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/CMakeLists.txt
	components/CMakeLists.txt
	extern/osg-ffmpeg-videoplayer/CMakeLists.txt 
							
						 
						
							2015-06-13 21:11:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								b81454d226 
								
							 
						 
						
							
							
								
								Fix using wrong bit flag for NPC stats auto-calculation.  Also set the corresponding mNpdtType which is used when determining which data structure to save.  Should resolve Bug  #2668 .  
							
							
							
						 
						
							2015-06-13 14:37:47 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								89c2a7e26b 
								
							 
						 
						
							
							
								
								Fix for possibly missing library on windows  
							
							
							
						 
						
							2015-06-12 15:22:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e13a938896 
								
							 
						 
						
							
							
								
								Add support to build with Qt5 (Task  #2665 )  
							
							... 
							
							
							
							Known issue: the render view doesn't work in Qt5. With the switch to OSG around the corner, this isn't worth fixing. 
							
						 
						
							2015-06-12 15:13:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c04f6cf167 
								
							 
						 
						
							
							
								
								Remove unused code  
							
							
							
						 
						
							2015-06-12 01:58:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cf95d3fc35 
								
							 
						 
						
							
							
								
								Refactor cmake scripts, reducing the amount of find_package(Boost)  
							
							
							
						 
						
							2015-06-12 01:45:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fc5176dc38 
								
							 
						 
						
							
							
								
								Refactor cmake scripts, reducing the amount of find_package(Qt4)  
							
							
							
						 
						
							2015-06-11 23:38:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								712cef36b0 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							
							
						 
						
							2015-06-11 18:01:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cdc47fa874 
								
							 
						 
						
							
							
								
								Remove BulletNifLoader dependency on keyframe manager  
							
							... 
							
							
							
							This will make threaded loading easier. 
							
						 
						
							2015-06-11 17:59:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8d6620b074 
								
							 
						 
						
							
							
								
								Assign an initial bounding box to particle systems  
							
							
							
						 
						
							2015-06-11 02:37:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b5099324d1 
								
							 
						 
						
							
							
								
								Enable ParticleSystem's FreezeOnCull, big speed-up in Vivec  
							
							
							
						 
						
							2015-06-10 20:35:59 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a1e74a35a2 
								
							 
						 
						
							
							
								
								Revert "Use the WorkQueue to update skinning"  
							
							... 
							
							
							
							This reverts commit d52d0d9640 
							
						 
						
							2015-06-10 19:08:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9c86d4f8bc 
								
							 
						 
						
							
							
								
								Race condition fix  
							
							
							
						 
						
							2015-06-10 19:02:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								35b2d91fb3 
								
							 
						 
						
							
							
								
								Throw error when failing to create graphics context  
							
							
							
						 
						
							2015-06-10 18:46:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d52d0d9640 
								
							 
						 
						
							
							
								
								Use the WorkQueue to update skinning  
							
							
							
						 
						
							2015-06-10 18:16:02 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cc71e894e1 
								
							 
						 
						
							
							
								
								Add WorkQueue class  
							
							
							
						 
						
							2015-06-10 18:15:31 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								8e8da724f5 
								
							 
						 
						
							
							
								
								Remove unnecessary comment entry in the config file.  
							
							
							
						 
						
							2015-06-10 08:23:38 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c621d0400c 
								
							 
						 
						
							
							
								
								Fix error handling for out-of-range NIF roots (found in Bosmora, TR)  
							
							
							
						 
						
							2015-06-09 18:22:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								db16cdad02 
								
							 
						 
						
							
							
								
								Add a comment  
							
							
							
						 
						
							2015-06-09 03:16:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5921e70625 
								
							 
						 
						
							
							
								
								Build a kdtree for terrain geometry  
							
							... 
							
							
							
							Improves intersection testing performance, shaving off ~2ms of frame time in exteriors.
Also increases terrain loading time by ~1ms per cell, so will have to look into background loading soon. 
							
						 
						
							2015-06-09 02:29:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								93ee11c5e7 
								
							 
						 
						
							
							
								
								Fix particlesystem nested RenderBin issue (Bug  #2631 )  
							
							
							
						 
						
							2015-06-08 21:21:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fc8e5dde3b 
								
							 
						 
						
							
							
								
								Fix crash when OSG_STEREO is enabled  
							
							
							
						 
						
							2015-06-08 03:26:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								347c9b57b8 
								
							 
						 
						
							
							
								
								Copy constructor signature fix  
							
							
							
						 
						
							2015-06-08 01:59:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								10457c1b28 
								
							 
						 
						
							
							
								
								Include fix  
							
							
							
						 
						
							2015-06-08 01:14:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5edf457ab7 
								
							 
						 
						
							
							
								
								Build fix  
							
							
							
						 
						
							2015-06-08 01:13:23 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9c9b83f8e2 
								
							 
						 
						
							
							
								
								Changes to compile with osg-svn 3.3.8  
							
							
							
						 
						
							2015-06-07 23:51:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ab626ca7b9 
								
							 
						 
						
							
							
								
								Improve MyGUI widget creation performance  
							
							
							
						 
						
							2015-06-07 18:57:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e66e9916db 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/document.cpp
	apps/opencs/model/doc/document.hpp 
							
						 
						
							2015-06-07 15:23:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0a411cbd7c 
								
							 
						 
						
							
							
								
								Enable particle lighting  
							
							
							
						 
						
							2015-06-07 04:41:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								68e322f969 
								
							 
						 
						
							
							
								
								Restore data directory verbose output that got lost  
							
							
							
						 
						
							2015-06-07 01:47:19 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								a439f49c4d 
								
							 
						 
						
							
							
								
								Fix loop where there was a potential for double entry.  
							
							
							
						 
						
							2015-06-07 07:38:52 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								4902c66792 
								
							 
						 
						
							
							
								
								Allow space characters in front of comments.  
							
							
							
						 
						
							2015-06-07 07:21:15 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								15fe5d88e2 
								
							 
						 
						
							
							
								
								Allow comments (lines starting with # character) and blank lines in openmw.cfg.  Should resolve Feature  #2535 .  
							
							... 
							
							
							
							- controlled via a checkbox in launcher settings 
							
						 
						
							2015-06-06 20:35:55 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0afc03b6b7 
								
							 
						 
						
							
							
								
								Build fix  
							
							
							
						 
						
							2015-06-05 16:56:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d8d43f94b9 
								
							 
						 
						
							
							
								
								Fix a typo  
							
							
							
						 
						
							2015-06-05 02:06:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e23775e338 
								
							 
						 
						
							
							
								
								Fix -Woverloaded-virtual clang warnings  
							
							
							
						 
						
							2015-06-04 20:31:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								231b217664 
								
							 
						 
						
							
							
								
								Build fix for MyGUI 3.2.1  
							
							
							
						 
						
							2015-06-04 17:13:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e046119487 
								
							 
						 
						
							
							
								
								Fix for unnecessary terrain texture coordinate arrays  
							
							
							
						 
						
							2015-06-04 16:15:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4bb3cbf0fb 
								
							 
						 
						
							
							
								
								Remove last remains of Ogre  
							
							
							
						 
						
							2015-06-03 23:04:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b70383d127 
								
							 
						 
						
							
							
								
								Remove last remains of Ogre math  
							
							
							
						 
						
							2015-06-03 21:37:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2eec0caca0 
								
							 
						 
						
							
							
								
								Remove dependency on Ogre::StringConverter  
							
							
							
						 
						
							2015-06-03 19:59:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0cc9b1bb40 
								
							 
						 
						
							
							
								
								Remove dependency on OgrePlatform.h  
							
							
							
						 
						
							2015-06-03 18:49:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								dd23981eab 
								
							 
						 
						
							
							
								
								Font workaround for older MyGUI versions, works with 3.2.2 now  
							
							
							
						 
						
							2015-06-03 18:00:45 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								bd0233ce68 
								
							 
						 
						
							
							
								
								Error handling improvement  
							
							
							
						 
						
							2015-06-03 18:00:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e642f20a65 
								
							 
						 
						
							
							
								
								Restore screenshot key functionality  
							
							
							
						 
						
							2015-06-03 17:25:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								974fda5bde 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	extern/sdl4ogre/sdlwindowhelper.cpp 
							
						 
						
							2015-06-03 03:18:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cd47dff196 
								
							 
						 
						
							
							
								
								Minor cleanup  
							
							
							
						 
						
							2015-06-03 03:03:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b978153edb 
								
							 
						 
						
							
							
								
								Enable VBO sharing for terrain geometry  
							
							
							
						 
						
							2015-06-03 02:24:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5666e02546 
								
							 
						 
						
							
							
								
								Fix for dark terrain in some cases  
							
							
							
						 
						
							2015-06-03 02:22:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								cdd0623009 
								
							 
						 
						
							
							
								
								Terrain rendering  
							
							
							
						 
						
							2015-06-03 01:35:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								10f938ff87 
								
							 
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2015-06-03 01:18:03 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5a7f2a4f1f 
								
							 
						 
						
							
							
								
								Restore light attenuation settings  
							
							
							
						 
						
							2015-06-02 17:02:56 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								01944c33f5 
								
							 
						 
						
							
							
								
								Basic water rendering  
							
							
							
						 
						
							2015-06-02 16:35:35 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								67f04e0ba1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master'  
							
							
							
						 
						
							2015-06-02 14:44:27 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ee2763f2d4 
								
							 
						 
						
							
							
								
								Allow 5th parameter for PlaceAtMe (numeric value, ignored) ( Fixes   #2591 )  
							
							
							
						 
						
							2015-06-02 14:43:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								6cb221f8d0 
								
							 
						 
						
							
							
								
								Some minor changes to MWList  
							
							
							
						 
						
							2015-06-02 11:55:09 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								959fe3eb87 
								
							 
						 
						
							
							
								
								Reset the scrollbar position in the topic list when DialogueWindow is closed  
							
							
							
						 
						
							2015-06-01 23:49:40 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								5350ce59ef 
								
							 
						 
						
							
							
								
								MWList doesn't scroll to the very bottom when it's shown for first time  
							
							
							
						 
						
							2015-06-01 22:42:41 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								de8e5f0db1 
								
							 
						 
						
							
							
								
								Restore projectiles  
							
							
							
						 
						
							2015-06-01 21:41:13 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c85764b654 
								
							 
						 
						
							
							
								
								Wireframe mode  
							
							
							
						 
						
							2015-06-01 17:02:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7f9f9a32d2 
								
							 
						 
						
							
							
								
								InitWorldSpaceParticles fix  
							
							
							
						 
						
							2015-06-01 16:29:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b0b55e2037 
								
							 
						 
						
							
							
								
								Delete niftest as it's currently broken  
							
							
							
						 
						
							2015-06-01 02:48:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Stanislav Bas 
								
							 
						 
						
							
							
							
							
								
							
							
								5dc6cdeb99 
								
							 
						 
						
							
							
								
								Scroll to the top of the topic list when dialog is started  
							
							
							
						 
						
							2015-06-01 01:14:11 +03:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a066b24303 
								
							 
						 
						
							
							
								
								Restore WeaponAnimation  
							
							
							
						 
						
							2015-05-31 01:07:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d7cd4203ad 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'k1ll/mingw'  
							
							
							
						 
						
							2015-05-30 11:39:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0f8f19958a 
								
							 
						 
						
							
							
								
								NifLoader: Fix empty StateSets being created in some cases  
							
							
							
						 
						
							2015-05-30 04:26:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fd50be0fb8 
								
							 
						 
						
							
							
								
								Restore various gameplay  
							
							
							
						 
						
							2015-05-30 01:00:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6231cd8557 
								
							 
						 
						
							
							
								
								RigGeometry clone fix  
							
							
							
						 
						
							2015-05-30 00:59:34 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a56d0e9cc3 
								
							 
						 
						
							
							
								
								ControllerVisitor fix  
							
							
							
						 
						
							2015-05-29 23:39:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								668d365ef9 
								
							 
						 
						
							
							
								
								MorphGeometry copy fix  
							
							
							
						 
						
							2015-05-29 21:47:43 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								261ed1f4e5 
								
							 
						 
						
							
							
								
								Revert "Enable culling for particle emitters & programs"  
							
							... 
							
							
							
							This reverts commit 8b206e0aed 
							
						 
						
							2015-05-29 20:31:26 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1cdb440b77 
								
							 
						 
						
							
							
								
								glReadPixels *is* available on OpenGL ES  
							
							
							
						 
						
							2015-05-28 17:23:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9ee63dc3f4 
								
							 
						 
						
							
							
								
								Change stats viewer key to f3  
							
							
							
						 
						
							2015-05-28 16:28:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								025a1a7866 
								
							 
						 
						
							
							
								
								Restore savegame screenshot display  
							
							
							
						 
						
							2015-05-28 02:34:38 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fe439e53ff 
								
							 
						 
						
							
							
								
								Bullet include cleanup  
							
							
							
						 
						
							2015-05-27 22:32:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								5fd107a95c 
								
							 
						 
						
							
							
								
								Fix crash with array out of bounds when refNum index is incorrect.  
							
							
							
						 
						
							2015-05-27 10:19:26 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								723beb1cac 
								
							 
						 
						
							
							
								
								Move IncrementalCompileOperation to SceneManager  
							
							
							
						 
						
							2015-05-26 20:20:18 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5de24552a8 
								
							 
						 
						
							
							
								
								Leak fix  
							
							
							
						 
						
							2015-05-26 19:12:29 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3dcb167066 
								
							 
						 
						
							
							
								
								Map rendering  
							
							
							
						 
						
							2015-05-26 16:40:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								da24e298ee 
								
							 
						 
						
							
							
								
								Fix -Wreorder warnings  
							
							
							
						 
						
							2015-05-23 22:44:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								22f01b1232 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp 
							
						 
						
							2015-05-23 20:33:44 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								396fba7fa9 
								
							 
						 
						
							
							
								
								Silence -Wreorder warnings, and remove -Wno-reorder.  
							
							
							
						 
						
							2015-05-21 22:46:44 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7882c3d7f0 
								
							 
						 
						
							
							
								
								Fix incorrect rotation for meshes with BoneOffset  
							
							
							
						 
						
							2015-05-20 04:09:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8d033f0558 
								
							 
						 
						
							
							
								
								Fix UpdateRigBounds not being copied properly  
							
							
							
						 
						
							2015-05-20 03:12:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8b768f4377 
								
							 
						 
						
							
							
								
								Minor fix for behaviour with non-existing LightManager  
							
							
							
						 
						
							2015-05-18 21:06:42 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								314c1161ae 
								
							 
						 
						
							
							
								
								Minor addition to reading display  
							
							
							
						 
						
							2015-05-18 21:05:17 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								99eb78fc19 
								
							 
						 
						
							
							
								
								Fix $DISPLAY not being accounted for in cursor decompression context  
							
							
							
						 
						
							2015-05-17 22:16:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								737c2114dc 
								
							 
						 
						
							
							
								
								Change viewer stats keybinding to F9  
							
							
							
						 
						
							2015-05-15 19:43:48 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								49df07ea7f 
								
							 
						 
						
							
							
								
								Implement UI scaling factor  
							
							
							
						 
						
							2015-05-15 00:41:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								24bb2e152c 
								
							 
						 
						
							
							
								
								Apply texture filter setting changes  
							
							
							
						 
						
							2015-05-14 21:42:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5442bf23a6 
								
							 
						 
						
							
							
								
								Apply video mode & gamma setting changes  
							
							
							
						 
						
							2015-05-14 20:31:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b6cb73e6e8 
								
							 
						 
						
							
							
								
								Fix deep copying of controllers  
							
							... 
							
							
							
							This fixes the cell loading crash. 
							
						 
						
							2015-05-14 15:07:58 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a18663c8b3 
								
							 
						 
						
							
							
								
								Improve MyGUI texture updates  
							
							
							
						 
						
							2015-05-14 01:26:10 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5dd1b2ae86 
								
							 
						 
						
							
							
								
								Readded HW cursor rotation  
							
							
							
						 
						
							2015-05-14 01:06:33 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c775cbbbaa 
								
							 
						 
						
							
							
								
								Silence an annoying message  
							
							
							
						 
						
							2015-05-14 00:40:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea416b852 
								
							 
						 
						
							
							
								
								Readded HW cursor manager (no image rotation yet)  
							
							
							
						 
						
							2015-05-13 18:56:14 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								39fb46601a 
								
							 
						 
						
							
							
								
								Readded input & event handling  
							
							
							
						 
						
							2015-05-13 16:50:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								298b3ed2ef 
								
							 
						 
						
							
							
								
								Create the GraphicsWindowSDL2 directly  
							
							
							
						 
						
							2015-05-13 15:08:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0498e6e5f0 
								
							 
						 
						
							
							
								
								Readded window icon  
							
							
							
						 
						
							2015-05-13 15:03:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								7f12fc4770 
								
							 
						 
						
							
							
								
								Fix for Bug  #2544 .  Add a default mNpdtType to ESM::Npc::blank().  
							
							
							
						 
						
							2015-05-13 13:39:04 +10:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								375b736e74 
								
							 
						 
						
							
							
								
								Use SDL to create the window  
							
							... 
							
							
							
							No input nor event loop handling yet, so the window will "stop responding" after a few seconds.
Thanks to KittyCat for the GraphicsWindowSDL2 code. 
							
						 
						
							2015-05-13 02:53:09 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								82316105de 
								
							 
						 
						
							
							
								
								BulletShapeManager kf loading fix  
							
							
							
						 
						
							2015-05-12 16:49:53 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								65f0195c71 
								
							 
						 
						
							
							
								
								Readded animated collision shape support  
							
							
							
						 
						
							2015-05-12 16:26:11 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								47758c11cd 
								
							 
						 
						
							
							
								
								Readded collision objects and movement physics  
							
							
							
						 
						
							2015-05-12 03:02:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								107bf818e7 
								
							 
						 
						
							
							
								
								Revert "Use btScaledBvhTriangleMeshShape, bump required bullet version to 2.83"  
							
							... 
							
							
							
							This reverts commit 27751db99a 
							
						 
						
							2015-05-10 13:35:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c31b416ba1 
								
							 
						 
						
							
							
								
								Move physicssystem to a new mwphysics module  
							
							
							
						 
						
							2015-05-10 01:09:00 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fe15f31f3e 
								
							 
						 
						
							
							
								
								Remove strings.h wrapper  
							
							
							
						 
						
							2015-05-10 00:36:04 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c843cfc8e2 
								
							 
						 
						
							
							
								
								Physics stub in preparation for rewrite  
							
							
							
						 
						
							2015-05-10 00:28:51 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								48ffeab191 
								
							 
						 
						
							
							
								
								Remove old BulletShapeManager  
							
							
							
						 
						
							2015-05-09 01:06:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0da1e0e905 
								
							 
						 
						
							
							
								
								Add comment  
							
							
							
						 
						
							2015-05-09 00:17:08 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d432a3ed08 
								
							 
						 
						
							
							
								
								Fix MyGUI rendering not taking DataVariance of textures into account  
							
							
							
						 
						
							2015-05-09 00:13:22 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								af7cbb2e3b 
								
							 
						 
						
							
							
								
								Leak fix  
							
							
							
						 
						
							2015-05-08 17:52:35 +02:00