scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4e5462bc19 
								
							 
						 
						
							
							
								
								Don't attempt to create a collision shape for an empty TriShape  
							
							
							
						 
						
							2016-02-19 14:23:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								eb92b853fe 
								
							 
						 
						
							
							
								
								BulletNifLoader: preallocate the btTriangleMesh's vertices/indices  
							
							
							
						 
						
							2015-12-10 00:05:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								4c0c20b1a0 
								
							 
						 
						
							
							
								
								Changed relative includes to library header format  
							
							
							
						 
						
							2015-11-27 21:01:28 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8cf57ef6ac 
								
							 
						 
						
							
							
								
								Move BulletShapeManager and BulletShape to resource/  
							
							
							
						 
						
							2015-11-17 00:20:15 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								eb2f16d682 
								
							 
						 
						
							
							
								
								Support for loading .osg mesh format  
							
							
							
						 
						
							2015-11-16 23:26:43 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b3f5ac5dbb 
								
							 
						 
						
							
							
								
								Include cleanup  
							
							
							
						 
						
							2015-07-25 02:11:49 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a7c5beb7c5 
								
							 
						 
						
							
							
								
								Remove redundant allocations for NIF meshes  
							
							
							
						 
						
							2015-06-18 01:26:45 +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 
								
							 
						 
						
							
							
							
							
								
							
							
								fe439e53ff 
								
							 
						 
						
							
							
								
								Bullet include cleanup  
							
							
							
						 
						
							2015-05-27 22:32:11 +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 
							
								 
							
						 
					 
				
					
						
							
								
								
									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 
								
							 
						 
						
							
							
							
							
								
							
							
								604580d75d 
								
							 
						 
						
							
							
								
								Move toMatrix to Nif::Node  
							
							
							
						 
						
							2015-05-07 21:17:15 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e1f4a7f647 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  into osg  
							
							... 
							
							
							
							Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp 
							
						 
						
							2015-05-04 02:41:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								83a7eea2a9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2015-05-03 09:54:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d9d84bd7b2 
								
							 
						 
						
							
							
								
								Remove bullet raycasting shapes, to be replaced with OSG ray casts  
							
							
							
						 
						
							2015-05-01 21:43:21 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								997347b01e 
								
							 
						 
						
							
							
								
								Silence -Wreorder warnings.  
							
							
							
						 
						
							2015-04-28 18:48:02 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7bc0d41bb0 
								
							 
						 
						
							
							
								
								Marker collision fix ( Fixes   #2461 )  
							
							
							
						 
						
							2015-03-19 15:51:45 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									dteviot 
								
							 
						 
						
							
							
							
							
								
							
							
								407cd50890 
								
							 
						 
						
							
							
								
								fixed warning C4099:  
							
							... 
							
							
							
							type name first seen using 'class' now seen using 'struct' 
							
						 
						
							2015-03-06 21:36:42 +13:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0ad514b29b 
								
							 
						 
						
							
							
								
								Fix collision for nodes with MRK extra data ( Fixes   #2415 )  
							
							
							
						 
						
							2015-03-02 01:03:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d387c207d1 
								
							 
						 
						
							
							
								
								Fix initial scaling for btCompoundShape children ( Fixes   #2234 )  
							
							
							
						 
						
							2015-01-14 18:49:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f11ec653d0 
								
							 
						 
						
							
							
								
								Add setting for showing MRK nodes to NIF loaders  
							
							... 
							
							
							
							This makes marker objects show up in OpenCS. 
							
						 
						
							2015-01-13 17:29:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								883f7ec7ce 
								
							 
						 
						
							
							
								
								Move workaround for hiding markers from NIF loader to Scene  
							
							
							
						 
						
							2015-01-13 17:19:39 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								41b3a9dba9 
								
							 
						 
						
							
							
								
								Rewrite animated collision shape support ( Fixes   #2123 )  
							
							
							
						 
						
							2015-01-13 05:37:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								04d6cead3b 
								
							 
						 
						
							
							
								
								Autogenerated collision should only be disabled if RootCollisionNode is a child of the root node ( Fixes   #2133 )  
							
							
							
						 
						
							2015-01-12 23:29:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5fa7536427 
								
							 
						 
						
							
							
								
								Fix incorrect box shape translation reset  
							
							... 
							
							
							
							Fixes incorrect placement of collision box for "azura spirit_trib" 
							
						 
						
							2014-11-29 16:50:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6b82e3665b 
								
							 
						 
						
							
							
								
								Remove old nifbullet test  
							
							
							
						 
						
							2014-09-26 16:10:55 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Rohit Nirmal 
								
							 
						 
						
							
							
							
							
								
							
							
								b5eb16b663 
								
							 
						 
						
							
							
								
								Silence some scan-build warnings.  
							
							
							
						 
						
							2014-08-28 20:55:32 -05:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2b407a9995 
								
							 
						 
						
							
							
								
								Refactor NIF cache  
							
							... 
							
							
							
							- Remove broken cache locking mechanism
This was supposed to unload NIFFiles after a cell transition completes, but it was never working due to a mistake on the line if (--sLockLevel), should have been if (--sLockLevel == 0). Repairing this would increase load times (NIF files would have to be reloaded more frequently), so just removed it for now.
 - Decouple cache from NIFFile (now a new nifcache component)
 - Add API for future background loading
 - Provide a reliable way (SharedPtr) to hold on to loaded NIFFiles. This will be useful to avoid deep copies of keyframe and text key data, which is currently a performance bottleneck. 
							
						 
						
							2014-08-24 02:37:50 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1ab02d8072 
								
							 
						 
						
							
							
								
								Fix exception for box shapes ( Fixes   #1580 )  
							
							
							
						 
						
							2014-06-28 00:10:36 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2bcbc6ab7d 
								
							 
						 
						
							
							
								
								Potential crash fix, either way should have a better error message now  
							
							
							
						 
						
							2014-06-25 14:52:12 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0b34d8d2fd 
								
							 
						 
						
							
							
								
								Add support for animated collision shapes ( Fixes   #1549 )  
							
							
							
						 
						
							2014-06-23 20:43:24 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0bed6d9d56 
								
							 
						 
						
							
							
								
								Physics: Recognize BBoxCollision flag, but don't use it for raycasting ( Fixes   #1349 )  
							
							
							
						 
						
							2014-06-22 00:16:47 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e002acdeae 
								
							 
						 
						
							
							
								
								Physics: Create actor shapes outside of BulletNifLoader  
							
							... 
							
							
							
							This will allow to create a specialised shape instead, such as a capsule, which tends to work better for character controllers. 
							
						 
						
							2014-06-21 23:37:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0a8c61a7fe 
								
							 
						 
						
							
							
								
								Bug  #1107 : Reverted previous fix, which caused problems with some actors not using a box shape as expected. Instead, do not create a bounding box collision shape for hidden nodes.  
							
							
							
						 
						
							2014-01-15 14:53:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								79a6ffd216 
								
							 
						 
						
							
							
								
								Closes   #1107 : Do not create box shapes unless the box collision flag is enabled  
							
							
							
						 
						
							2014-01-15 14:53:29 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7dc30a01cd 
								
							 
						 
						
							
							
								
								Some changes suggested by cppcheck  
							
							
							
						 
						
							2013-07-31 18:46:32 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								4cedf0fbab 
								
							 
						 
						
							
							
								
								Avoid colliding with AvoidNodes  
							
							... 
							
							
							
							These are placed under the RootCollisionNode hierarchy, but the shapes they
hold aren't collided with. Their exact function is unknown, but seems to be
related to lava? Maybe damage avoidance info for the AI. 
							
						 
						
							2013-04-28 11:12:55 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								36170c5374 
								
							 
						 
						
							
							
								
								Use flag enums instead of hard-coded hex values  
							
							
							
						 
						
							2013-04-16 01:20:32 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								ebcb4c66c3 
								
							 
						 
						
							
							
								
								Properly read and use the NIF root record list  
							
							
							
						 
						
							2013-04-06 10:17:09 -07:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e30af28860 
								
							 
						 
						
							
							
								
								Markers should still have collision if they have a NiRootCollisionNode  
							
							
							
						 
						
							2013-03-14 19:03:42 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								84afd87321 
								
							 
						 
						
							
							
								
								Placeable objects should not collide unless they have a NiRootCollisionNode  
							
							
							
						 
						
							2013-03-14 03:04:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								14964e9fcd 
								
							 
						 
						
							
							
								
								Only build a box shape for collision nodes; use StringUtils  
							
							
							
						 
						
							2013-03-09 10:28:10 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d7c4a622cf 
								
							 
						 
						
							
							
								
								Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack  
							
							
							
						 
						
							2013-03-08 23:46:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nathan Jeffords 
								
							 
						 
						
							
							
							
							
								
							
							
								109dff2d29 
								
							 
						 
						
							
							
								
								renamed high level NIF files...  
							
							
							
						 
						
							2013-03-02 13:23:09 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Nathan Jeffords 
								
							 
						 
						
							
							
							
							
								
							
							
								d3c1f5e7b2 
								
							 
						 
						
							
							
								
								renamed low-level NIF related files and include guards to conform to naming convention  
							
							
							
						 
						
							2013-03-02 10:46:12 -08:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								5f2c897001 
								
							 
						 
						
							
							
								
								Better handle which collision shapes to load  
							
							
							
						 
						
							2013-02-25 10:29:48 -08:00