Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								0649373d2e 
								
							 
						 
						
							
							
								
								Merge branch 'report'  
							
							
							
						 
						
							2014-12-08 19:01:38 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								109fbab546 
								
							 
						 
						
							
							
								
								changed column/row numbering in script compiler error messages from being starting at 0 to starting at 1  
							
							
							
						 
						
							2014-12-07 16:02:28 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9a1b7cbe52 
								
							 
						 
						
							
							
								
								Add SharedStateButton, used in spell window and controls box to apply mouseover effect to all buttons within one row ( Fixes   #1986 )  
							
							
							
						 
						
							2014-12-06 16:50:09 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3f0bc6eecb 
								
							 
						 
						
							
							
								
								Ignore extra bytes after the SCVR string list ( Fixes   #2184 )  
							
							
							
						 
						
							2014-12-05 23:36:06 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5a25649076 
								
							 
						 
						
							
							
								
								Implement XYZ rotation keys support ( Fixes   #1067 )  
							
							
							
						 
						
							2014-12-05 20:58:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								65536f0857 
								
							 
						 
						
							
							
								
								Load initial particle system state from NIF files ( Fixes   #2178 )  
							
							
							
						 
						
							2014-12-05 18:00:30 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								eb6e1576be 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							
							
						 
						
							2014-12-03 20:17:34 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b650338d69 
								
							 
						 
						
							
							
								
								Implement drawMode of NiStencilProperty (Feature  #1057 )  
							
							
							
						 
						
							2014-12-03 18:28:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e6c59f5585 
								
							 
						 
						
							
							
								
								Revert "Allow NIF rotation matrices that include scale values"  
							
							... 
							
							
							
							This reverts commit f57ddec6a2Fixes  #2168 ) 
							
						 
						
							2014-12-03 18:28:35 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								85b8fca1f0 
								
							 
						 
						
							
							
								
								fixes  
							
							
							
						 
						
							2014-12-03 01:11:50 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									root 
								
							 
						 
						
							
							
							
							
								
							
							
								4e756a2f4a 
								
							 
						 
						
							
							
								
								path to game get through jni  
							
							
							
						 
						
							2014-12-03 01:03:27 +04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								59cde9b431 
								
							 
						 
						
							
							
								
								Don't use transparency override if there's no transparency (rug fix for Bug  #2050 )  
							
							
							
						 
						
							2014-12-01 23:09:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								077c619611 
								
							 
						 
						
							
							
								
								Implement Clamp mode for NiTexturingProperty ( Fixes   #2050 )  
							
							
							
						 
						
							2014-12-01 23:09:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								dffa8c6c14 
								
							 
						 
						
							
							
								
								Re-insert existing DialInfo records when they are modified by another content file ( Fixes   #2170 )  
							
							
							
						 
						
							2014-11-30 22:02:25 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								4c1906b999 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/master'  
							
							
							
						 
						
							2014-11-29 21:00:59 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								5ae1554a75 
								
							 
						 
						
							
							
								
								Simplify skipping moved references (thanks scrawl)  
							
							
							
						 
						
							2014-11-30 04:00:06 +11: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 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								33c454e073 
								
							 
						 
						
							
							
								
								Check whether any subrecords remain after skipping moved references.  Should resolve bug  #2070 .  
							
							
							
						 
						
							2014-11-29 20:39:25 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c1e6b8608b 
								
							 
						 
						
							
							
								
								Always create a skeleton if there's an "ArrowBone" node ( Fixes   #2117 )  
							
							
							
						 
						
							2014-11-23 16:37:31 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								cd5d02402f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/wizard'  
							
							
							
						 
						
							2014-11-21 09:48:57 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e11bec1a37 
								
							 
						 
						
							
							
								
								Fix the launcher not properly reloading data directories  
							
							
							
						 
						
							2014-11-20 22:36:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								31fab533fe 
								
							 
						 
						
							
							
								
								OSX build fix  
							
							
							
						 
						
							2014-11-20 18:14:49 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								86037149cd 
								
							 
						 
						
							
							
								
								add optional string argument for activate instruction (ignored)  
							
							
							
						 
						
							2014-11-20 11:06:32 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c6558fe487 
								
							 
						 
						
							
							
								
								Fix Ogre being initialised twice  
							
							
							
						 
						
							2014-11-19 13:19:02 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								751211351c 
								
							 
						 
						
							
							
								
								Fix multi-line comment warning  
							
							
							
						 
						
							2014-11-18 17:54:24 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4fa303d7c4 
								
							 
						 
						
							
							
								
								Merge branch 'master' into HEAD  
							
							... 
							
							
							
							Conflicts:
	CMakeLists.txt
	apps/launcher/CMakeLists.txt 
							
						 
						
							2014-11-18 17:43:51 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								95dfb07816 
								
							 
						 
						
							
							
								
								make [ a whitespace character in scripts ( Fixes   #2126 )  
							
							
							
						 
						
							2014-11-15 09:53:08 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								273a80e2c0 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							
							
						 
						
							2014-11-11 15:43:46 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								92ab292e18 
								
							 
						 
						
							
							
								
								Make MODL subrecord for light records optional ( Fixes   #2114 )  
							
							
							
						 
						
							2014-11-09 04:50:54 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									MiroslavR 
								
							 
						 
						
							
							
							
							
								
							
							
								b8d5a9486a 
								
							 
						 
						
							
							
								
								Make Restore/Damage Attribute/Skill effects continuous  
							
							
							
						 
						
							2014-11-08 00:57:03 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								4a9a9855bf 
								
							 
						 
						
							
							
								
								NIFStream getUInt should return an unsigned integer  
							
							
							
						 
						
							2014-10-31 05:01:26 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								4583dc05db 
								
							 
						 
						
							
							
								
								Move NIFStream functions into a cpp file where they belong  
							
							
							
						 
						
							2014-10-31 04:54:16 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ccab8b1a92 
								
							 
						 
						
							
							
								
								Fix bug in TerrainGrid::getWorldBoundingBox ( Fixes   #2075 )  
							
							
							
						 
						
							2014-10-29 16:01:55 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f7ba1dbfc8 
								
							 
						 
						
							
							
								
								Add error handling for getPcRank and similar defines ( Fixes   #2071 )  
							
							
							
						 
						
							2014-10-28 16:07:37 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f57ddec6a2 
								
							 
						 
						
							
							
								
								Allow NIF rotation matrices that include scale values ( Fixes   #2052 )  
							
							
							
						 
						
							2014-10-27 21:53:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fc1a897fbf 
								
							 
						 
						
							
							
								
								Add comment to WNAM in ESM::Land  
							
							
							
						 
						
							2014-10-27 21:53:00 +01:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4047e3c928 
								
							 
						 
						
							
							
								
								Properly handle DialInfo records that were marked as Deleted ( Fixes   #2035 )  
							
							
							
						 
						
							2014-10-19 17:46:28 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								38bcff2622 
								
							 
						 
						
							
							
								
								Moved base NIF classes into a separate file.  
							
							... 
							
							
							
							This resolves the dependency mess, and makes things more readable.
The dependency tree for nif records now looks like this:
Record.hpp
--base.hpp
----controlled.hpp
----controller.hpp
----data.hpp
----effect.hpp
----extra.hpp
----node.hpp
Node.hpp has many extra dependencies because nifogre only includes it instead of each of these files.
That should be fixed. 
							
						 
						
							2014-10-19 03:01:30 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								5abed1c32a 
								
							 
						 
						
							
							
								
								Print a NIF file's version information when an error occurs  
							
							
							
						 
						
							2014-10-19 02:54:27 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								9ebf3f2f10 
								
							 
						 
						
							
							
								
								Provide more data when nifstream throws a runtime_error  
							
							
							
						 
						
							2014-10-19 02:42:28 -04:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								bf0669e18c 
								
							 
						 
						
							
							
								
								Ignore some extra string arguments to ShowMap ( Fixes   #2029 )  
							
							... 
							
							
							
							Required for a dialogue result script in Morrowind.esm ("ShowMap Dren Plantation").
This must do the same as "ShowMap Dren", which actually does work properly, since ShowMap supports partial string matching. 
							
						 
						
							2014-10-18 00:56:41 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6d7f4085a5 
								
							 
						 
						
							
							
								
								Add shader implementation of alpha test  
							
							
							
						 
						
							2014-10-17 19:11:06 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								a3c894c1e2 
								
							 
						 
						
							
							
								
								Merge branch 'cellmarker'  
							
							
							
						 
						
							2014-10-17 14:26:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								86280df55a 
								
							 
						 
						
							
							
								
								DialInfo: Clear SelectStructs from previous loadings when a record is overwritten ( Fixes   #2017 )  
							
							
							
						 
						
							2014-10-16 19:35:20 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								313aed078e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/master' into QtOgre  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt 
							
						 
						
							2014-10-13 20:45:30 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Thoronador 
								
							 
						 
						
							
							
							
							
								
							
							
								4d62541b62 
								
							 
						 
						
							
							
								
								fix usage of numeric_limits static functions min() and max()  
							
							... 
							
							
							
							Functions min() and max() of std::numeric_limits<T> are static
and can therefore be accessed via class name and :: operator. 
							
						 
						
							2014-10-12 23:28:16 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								809b8c6d5b 
								
							 
						 
						
							
							
								
								Conflicts:  
							
							... 
							
							
							
							apps/opencs/view/render/pagedworldspacewidget.cpp 
							
						 
						
							2014-10-12 05:54:21 +11:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								a0dbb40c8e 
								
							 
						 
						
							
							
								
								Allow script names starting with digits ( Fixes   #1730 )  
							
							
							
						 
						
							2014-10-11 14:48:52 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								21b16f8425 
								
							 
						 
						
							
							
								
								Merge branch 'tables'  
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/world/data.cpp
	apps/opencs/model/world/data.hpp 
							
						 
						
							2014-10-10 16:11:54 +02:00 
							
								 
							
						 
					 
				
					
						
							
								
								
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								406135ee96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into terrain  
							
							
							
						 
						
							2014-10-09 23:47:30 +01:00