Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								acb728195f 
								
							 
						 
						
							
							
								
								improved documentation of ESM::Script member variables  
							
							 
							
							
							
						 
						
							2014-07-25 10:37:34 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								2e355df8b3 
								
							 
						 
						
							
							
								
								removed function ScriptManager::getLocalIndex (was redundant and was also depending on precompiled scripts)  
							
							 
							
							
							
						 
						
							2014-07-25 07:59:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								75abe8db31 
								
							 
						 
						
							
							
								
								Ignore FLTV from old savegames  
							
							 
							
							
							
						 
						
							2014-07-24 20:52:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d4ff17f1c5 
								
							 
						 
						
							
							
								
								Remove unused FLTV and NAM0 from CellRef  
							
							 
							
							
							
						 
						
							2014-07-24 02:20:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4e0c133fb3 
								
							 
						 
						
							
							
								
								Add comment to Cell NAM0 (it's a RefId counter)  
							
							 
							
							
							
						 
						
							2014-07-24 02:19:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								75366b2e37 
								
							 
						 
						
							
							
								
								Implement CellRef's faction rank (rank requirement to use item)  
							
							 
							
							
							
						 
						
							2014-07-24 02:17:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								19f4c46fe4 
								
							 
						 
						
							
							
								
								alllow (and ignore) explicit references for StopScript and ScriptRunning  
							
							 
							
							
							
						 
						
							2014-07-23 12:33:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								aa8c0bccb4 
								
							 
						 
						
							
							
								
								added new argument type: z (optional, any)  
							
							 
							
							
							
						 
						
							2014-07-23 09:44:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2b57c7fa67 
								
							 
						 
						
							
							
								
								Use CellRef's global variable to disable owner ( Fixes   #1677 )  
							
							 
							
							
							
						 
						
							2014-07-22 17:06:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									gus 
								
							 
						 
						
							
							
							
							
								
							
							
								2092e5fe22 
								
							 
						 
						
							
							
								
								compile fixes  
							
							 
							
							
							
						 
						
							2014-07-22 11:49:45 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								11a2c767cc 
								
							 
						 
						
							
							
								
								some argument parsing cleanup  
							
							 
							
							
							
						 
						
							2014-07-21 12:50:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1320ac6983 
								
							 
						 
						
							
							
								
								Ensure non-negative particle life time, add size assertion  
							
							 
							
							
							
						 
						
							2014-07-18 16:11:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e33ee52b91 
								
							 
						 
						
							
							
								
								make stray names in the begin line a warning instead of an error  
							
							 
							
							
							
						 
						
							2014-07-18 12:29:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								192d5ca08f 
								
							 
						 
						
							
							
								
								Allow overriding OGRE_PLUGIN_DIR in cmake command line  
							
							 
							
							
							
						 
						
							2014-07-17 22:31:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4d39d77eaa 
								
							 
						 
						
							
							
								
								Fix incompatible encoding names in ContentModel (bug uncovered by  41c17bccb6)  
							
							 
							
							
							
						 
						
							2014-07-17 20:40:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2a510573b8 
								
							 
						 
						
							
							
								
								Remove unused implementation file  
							
							 
							
							
							
						 
						
							2014-07-17 16:16:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								41c17bccb6 
								
							 
						 
						
							
							
								
								Exit if an unknown encoding option is specified  
							
							 
							
							
							
						 
						
							2014-07-17 16:16:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								876af8f529 
								
							 
						 
						
							
							
								
								Fix not saved Attacked flag ( Fixes   #1657 )  
							
							 
							
							
							
						 
						
							2014-07-17 16:16:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								8952154488 
								
							 
						 
						
							
							
								
								inherit target ID when starting a script from another script  
							
							 
							
							
							
						 
						
							2014-07-17 13:37:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								27c84d6cb7 
								
							 
						 
						
							
							
								
								the reference for a targeted script is now determined when needed instead of at the start of the script execution  
							
							 
							
							
							
						 
						
							2014-07-17 13:36:55 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								35b27ea8cb 
								
							 
						 
						
							
							
								
								ignore stray string argument after GetDisabled  
							
							 
							
							
							
						 
						
							2014-07-17 11:29:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e8322da663 
								
							 
						 
						
							
							
								
								added support for targeted scripts to script compiler  
							
							 
							
							
							
						 
						
							2014-07-17 08:36:34 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								75ab8de3d2 
								
							 
						 
						
							
							
								
								added opcode for running scripts with explicit references (targeted scripts)  
							
							 
							
							
							
						 
						
							2014-07-15 13:26:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e9377ad5c4 
								
							 
						 
						
							
							
								
								include targeted script data in saved games  
							
							 
							
							
							
						 
						
							2014-07-15 13:05:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								563c2e5730 
								
							 
						 
						
							
							
								
								be a bit more relaxed about allowing - in names ( Fixes   #1593 )  
							
							 
							
							
							
						 
						
							2014-07-15 10:39:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								41d73377b0 
								
							 
						 
						
							
							
								
								Use explicit C locale in Misc::StringUtils ( Fixes   #1216 )  
							
							 
							
							
							
						 
						
							2014-07-12 18:53:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1c41ce9b9d 
								
							 
						 
						
							
							
								
								Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)  
							
							 
							
							
							
						 
						
							2014-07-12 18:53:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ad90d20ad8 
								
							 
						 
						
							
							
								
								Don't silently skip unknown NPC subrecords  
							
							 
							
							
							
						 
						
							2014-07-08 10:30:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1ce60fa13b 
								
							 
						 
						
							
							
								
								Merge branch 'tables'  
							
							 
							
							
							
						 
						
							2014-07-03 12:03:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d96ed38d49 
								
							 
						 
						
							
							
								
								added body part table  
							
							 
							
							
							
						 
						
							2014-07-01 12:37:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e97fd35ae6 
								
							 
						 
						
							
							
								
								added enchantments table  
							
							 
							
							
							
						 
						
							2014-06-30 20:40:34 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2506c16bf5 
								
							 
						 
						
							
							
								
								Add a dummy GetStat function returning 0 ( Fixes   #1589 )  
							
							 
							
							
							
						 
						
							2014-06-30 17:49:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e25fa6c157 
								
							 
						 
						
							
							
								
								Refactor non-distant land terrain path to a grid based implementation ( Fixes   #1562 )  
							
							 
							
							
							
						 
						
							2014-06-29 02:42:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4949aa1fbb 
								
							 
						 
						
							
							
								
								Add hack required for unnamed animated collision shapes (in_dagoth_bridge00.nif)  
							
							 
							
							
							
						 
						
							2014-06-28 18:21:56 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1ab02d8072 
								
							 
						 
						
							
							
								
								Fix exception for box shapes ( Fixes   #1580 )  
							
							 
							
							
							
						 
						
							2014-06-28 00:10:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7b1e1d03d8 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/sky.hpp 
							
						 
						
							2014-06-26 04:29:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2bcbc6ab7d 
								
							 
						 
						
							
							
								
								Potential crash fix, either way should have a better error message now  
							
							 
							
							
							
						 
						
							2014-06-25 14:52:12 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								85965bfd47 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-06-25 09:58:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ee098de0a6 
								
							 
						 
						
							
							
								
								Don't ignore lighting values of particles not attached to a character  
							
							 
							
							
							
						 
						
							2014-06-25 01:14:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b259c5def2 
								
							 
						 
						
							
							
								
								Make GetFactionReaction garbage argument optional  
							
							 
							
							
							
						 
						
							2014-06-25 01:12:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8a8ecce1e5 
								
							 
						 
						
							
							
								
								Fix some uninitialized data written to savegames  
							
							 
							
							
							
						 
						
							2014-06-25 00:11:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e274314548 
								
							 
						 
						
							
							
								
								Ignore alpha modifier for particle materials  
							
							 
							
							... 
							
							
							
							This makes the tx_ash_flake.dds particles from ashcloud.nif appear. 
							
						 
						
							2014-06-24 19:51:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b52977e44c 
								
							 
						 
						
							
							
								
								Add dummy Face implementation for now (Bug  #1541 )  
							
							 
							
							
							
						 
						
							2014-06-24 15:09:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								30be59c029 
								
							 
						 
						
							
							
								
								Implement auto-adjusting of particle emit rate  
							
							 
							
							... 
							
							
							
							This makes ashcloud.nif and blightcloud.nif work properly. 
							
						 
						
							2014-06-24 03:07:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								750d8b5589 
								
							 
						 
						
							
							
								
								Allow garbage integer argument for addSpell ( Fixes   #1539 )  
							
							 
							
							
							
						 
						
							2014-06-23 22:02:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0b34d8d2fd 
								
							 
						 
						
							
							
								
								Add support for animated collision shapes ( Fixes   #1549 )  
							
							 
							
							
							
						 
						
							2014-06-23 20:43:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								9ea22324f7 
								
							 
						 
						
							
							
								
								Fix some MSVC warnings.  
							
							 
							
							... 
							
							
							
							Several fixes are warnings about truncations on 64-bit, while others are
complaints about mixed signed / unsigned integer operations. 
							
						 
						
							2014-06-23 01:13:30 -05: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 
								
							 
						 
						
							
							
							
							
								
							
							
								7bf7daa846 
								
							 
						 
						
							
							
								
								Fix exception (getline will trigger failbit on the last line)  
							
							 
							
							
							
						 
						
							2014-06-20 21:33:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9a26cf22e6 
								
							 
						 
						
							
							
								
								Implement toggleMenus  
							
							 
							
							
							
						 
						
							2014-06-20 18:51:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								218f916d6d 
								
							 
						 
						
							
							
								
								Savegame: Don't write stat modifiers that are zero  
							
							 
							
							
							
						 
						
							2014-06-19 17:17:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c69a311ad8 
								
							 
						 
						
							
							
								
								Disable lighting for particles  
							
							 
							
							... 
							
							
							
							Fixes magic cast visuals being too dark depending on the environment. 
							
						 
						
							2014-06-19 04:57:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4e71db7081 
								
							 
						 
						
							
							
								
								Savegame: Don't load/save deleted container items. This is currently pointless, and also causes new garbage being added on each load/save cycle: Container stores are first filled from ESM records, then cleared and filled from the savegame. The items from ESM records remain as deleted refs.  
							
							 
							
							
							
						 
						
							2014-06-18 21:39:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5645c9185b 
								
							 
						 
						
							
							
								
								Fix location of local data path  
							
							 
							
							
							
						 
						
							2014-06-18 17:18:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1dc9e151cb 
								
							 
						 
						
							
							
								
								Count werewolf kills ( Fixes   #1525 )  
							
							 
							
							
							
						 
						
							2014-06-18 16:56:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2477456f99 
								
							 
						 
						
							
							
								
								Implement Murder crimes and OnMurder instruction ( Fixes   #1315 )  
							
							 
							
							
							
						 
						
							2014-06-17 04:05:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ec66484472 
								
							 
						 
						
							
							
								
								Fix forceGreeting with explicit references ( Fixes   #1518 )  
							
							 
							
							
							
						 
						
							2014-06-17 04:05:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d5b97005ab 
								
							 
						 
						
							
							
								
								Make ESM::Faction skills optional ( Fixes   #1508 )  
							
							 
							
							... 
							
							
							
							Also increased size of mSkills array to 7. Some factions with 7 skills can be found in the vanilla CS. The previously "mUnknown" int appears to be the 7th element of the skills array. 
							
						 
						
							2014-06-16 02:52:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ee2b81763e 
								
							 
						 
						
							
							
								
								Savegame: Store AiSettings and summoned creatures  
							
							 
							
							... 
							
							
							
							CreatureStats state is now completely stored (Closes  #1174 )
Also play VFX_Summon_Start and VFX_Summon_End visual effects. 
							
						 
						
							2014-06-15 21:19:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fd59a4a79e 
								
							 
						 
						
							
							
								
								Fix some doxygen typos  
							
							 
							
							
							
						 
						
							2014-06-15 16:11:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								77388fe2ce 
								
							 
						 
						
							
							
								
								Implement BetaComment instruction (dumps reference info)  
							
							 
							
							
							
						 
						
							2014-06-15 16:11:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c45d4923 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'lgro/valgrind_fixes'  
							
							 
							
							
							
						 
						
							2014-06-15 10:57:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukasz Gromanowski 
								
							 
						 
						
							
							
							
							
								
							
							
								abeb1d4ab3 
								
							 
						 
						
							
							
								
								Valgrind: Added constructor for KeyListT class, and added initialziation of ver member field in NIFFile class.  
							
							 
							
							... 
							
							
							
							Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com> 
							
						 
						
							2014-06-15 09:39:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4f742fd468 
								
							 
						 
						
							
							
								
								Allow INFO records with no subrecords following DATA ( Fixes   #1486 )  
							
							 
							
							
							
						 
						
							2014-06-13 21:54:03 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e458cf1df2 
								
							 
						 
						
							
							
								
								Savegame: Store death counter ( Fixes   #1477 )  
							
							 
							
							
							
						 
						
							2014-06-13 02:26:53 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a54ac579a5 
								
							 
						 
						
							
							
								
								Savegame: Store AiSequence  
							
							 
							
							
							
						 
						
							2014-06-13 02:26:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b158919c4b 
								
							 
						 
						
							
							
								
								Fix uninitialized variable use  
							
							 
							
							
							
						 
						
							2014-06-13 02:26:52 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								029e438c11 
								
							 
						 
						
							
							
								
								Don't check mInterpolationType each iteration  
							
							 
							
							
							
						 
						
							2014-06-11 23:57:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								73be457805 
								
							 
						 
						
							
							
								
								Merge ESM::Cell fields by subrecord  
							
							 
							
							... 
							
							
							
							Fixes an issue with the Morrowind Patched mod where cell ambient values would become black due to the new cell records not including an AMBI subrecord.
Also fixes a bug where mLeasedRefs was incorrectly cleared when overwriting a cell (*oldcell = *cell;) 
							
						 
						
							2014-06-11 16:13:33 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								47172fb8a2 
								
							 
						 
						
							
							
								
								ContentModel: Don't confuse file path with file name ( Fixes   #1352 )  
							
							 
							
							
							
						 
						
							2014-06-10 19:23:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3788fb042e 
								
							 
						 
						
							
							
								
								Implement MenuTest script instruction ( Fixes   #1454 )  
							
							 
							
							
							
						 
						
							2014-06-10 18:49:42 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2dd54dbcfc 
								
							 
						 
						
							
							
								
								Implement ClearInfoActor script instruction ( Fixes   #1422 )  
							
							 
							
							
							
						 
						
							2014-06-10 18:49:41 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								98d7b6672a 
								
							 
						 
						
							
							
								
								Make MODL subrecord optional for potions ( Fixes   #1419 )  
							
							 
							
							
							
						 
						
							2014-06-08 11:22:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								823ccb1b3d 
								
							 
						 
						
							
							
								
								Don't batch statics that have "references persist" set (temporary fix for Arkngthand door -  Fixes   #1386 )  
							
							 
							
							
							
						 
						
							2014-06-08 11:22:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a0bff03560 
								
							 
						 
						
							
							
								
								Fix not handling failbit/badbit in ifstream (Bug  #1355 )  
							
							 
							
							
							
						 
						
							2014-06-08 11:22:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								f9f278f645 
								
							 
						 
						
							
							
								
								Fixed a capitalization error.  
							
							 
							
							... 
							
							
							
							Changed Interpolations to unsigned.
Also explained what's happening in the comments. 
							
						 
						
							2014-06-06 07:00:04 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								b90e4db871 
								
							 
						 
						
							
							
								
								Actually read in XYZ_ROTATION_KEY data instead of discarding it.  
							
							 
							
							
							
						 
						
							2014-06-06 01:26:28 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									dreamer-dead 
								
							 
						 
						
							
							
							
							
								
							
							
								e772bb88da 
								
							 
						 
						
							
							
								
								Remove RTTI usage in NIF reader.  
							
							 
							
							
							
						 
						
							2014-06-05 20:22:20 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5313862a46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-06-04 15:14:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7376cb9b61 
								
							 
						 
						
							
							
								
								Fix loading ESX files cleaned with testool ( Fixes   #1382 )  
							
							 
							
							
							
						 
						
							2014-06-03 22:49:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ce14a6413b 
								
							 
						 
						
							
							
								
								Small optimization to ESM::Variant  
							
							 
							
							
							
						 
						
							2014-06-03 22:40:09 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								577ed3943b 
								
							 
						 
						
							
							
								
								Show wallpaper when loading a savegame  
							
							 
							
							
							
						 
						
							2014-06-02 23:26:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								576c06d791 
								
							 
						 
						
							
							
								
								Fix Bug  #1371  
							
							 
							
							... 
							
							
							
							Not properly reading in the NIF file's QuaternionKeyList. 
							
						 
						
							2014-06-01 18:01:44 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c018319940 
								
							 
						 
						
							
							
								
								Addition to  7c9c0830a9: don't create useless BaseWhite clones  
							
							 
							
							
							
						 
						
							2014-06-01 02:21:47 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7c9c0830a9 
								
							 
						 
						
							
							
								
								Fix errors due to BaseWhite material being removed  
							
							 
							
							
							
						 
						
							2014-05-31 19:50:01 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								16ac6e7aac 
								
							 
						 
						
							
							
								
								Merge DialInfo objects by subrecord instead of overwriting the object  
							
							 
							
							... 
							
							
							
							Fixes  #1360  
							
						 
						
							2014-05-31 13:01:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								ecf3d52b46 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/crash-fix-cg-shader'  
							
							 
							
							
							
						 
						
							2014-05-30 12:07:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f5e587f566 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'puppykevin/master'  
							
							 
							
							
							
						 
						
							2014-05-30 11:42:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								11ce093a9e 
								
							 
						 
						
							
							
								
								Fix crashes caused when terrain materials don't get created (e.g. due to cg shader bug on Windows/D3D9).  Should resolve Bug  #1284 .  
							
							 
							
							
							
						 
						
							2014-05-30 18:46:18 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								be7f344eca 
								
							 
						 
						
							
							
								
								Merge branch 'refs'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/opencs/model/doc/savingstate.cpp
	components/esm/cellref.hpp 
							
						 
						
							2014-05-30 10:38:38 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								be88168e91 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-05-30 10:07:18 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								50a72ed710 
								
							 
						 
						
							
							
								
								Fix ghosts in Cavern Of The Incarnate having -1 health  
							
							 
							
							
							
						 
						
							2014-05-29 18:09:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kevin Poitra 
								
							 
						 
						
							
							
							
							
								
							
							
								18314b1707 
								
							 
						 
						
							
							
								
								We use spaces, not tabs.  
							
							 
							
							
							
						 
						
							2014-05-28 14:56:50 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kevin Poitra 
								
							 
						 
						
							
							
							
							
								
							
							
								8e55eb8009 
								
							 
						 
						
							
							
								
								Fix some formatting.  
							
							 
							
							
							
						 
						
							2014-05-28 13:06:43 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Kevin Poitra 
								
							 
						 
						
							
							
							
							
								
							
							
								545c3c312c 
								
							 
						 
						
							
							
								
								Remove a superfluous clear.  
							
							 
							
							
							
						 
						
							2014-05-28 13:03:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f112c78858 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-05-28 19:47:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e68600eda2 
								
							 
						 
						
							
							
								
								Make Activate instruction work properly even when onActivate was not called in the same frame.  
							
							 
							
							... 
							
							
							
							There are two major differences to the old implementation:
 - Activate can now be called on its own, e.g. in the console. In Vanilla this appears to be a no-op, so it is unlikely to be used and the potential for breakage is low.
 - The Action to execute is now determined when Activate is called, not when OnActivate is called. This however makes sense, since there may be a time difference between the two, and the object (or the player) could have changed in the meantime, requiring a different Action.
Fixes  #1166  and #1346 . 
							
						 
						
							2014-05-28 19:23:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bb011f278e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'cc9cii/master'  
							
							 
							
							
							
						 
						
							2014-05-28 14:45:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								bbe77d656a 
								
							 
						 
						
							
							
								
								Minor fixes from static analysis.  
							
							 
							
							
							
						 
						
							2014-05-28 21:15:50 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Arthur Moore 
								
							 
						 
						
							
							
							
							
								
							
							
								50a4d175da 
								
							 
						 
						
							
							
								
								Read NIF interpolation type 4 (XYZ_ROTATION_KEY)  
							
							 
							
							... 
							
							
							
							Don't actually do anything with it yet, but without this the "MW Containers Animated" mod made containers inaccessible.
Partly implements Feature #1067  
							
						 
						
							2014-05-28 03:42:26 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								be39395ce7 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-05-27 21:09:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								12fc0aaecb 
								
							 
						 
						
							
							
								
								removed an unused parser settings (implicitly fixing a case were this setting was not applied correctly)  
							
							 
							
							
							
						 
						
							2014-05-27 21:08:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3e2eed9269 
								
							 
						 
						
							
							
								
								Implement getFactionReaction function  
							
							 
							
							... 
							
							
							
							Strange bug when using value != 0 for the garbage argument? 
							
						 
						
							2014-05-27 15:23:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e266c39c5d 
								
							 
						 
						
							
							
								
								Implement modFactionReaction instruction ( Closes   #1347 )  
							
							 
							
							
							
						 
						
							2014-05-27 14:54:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0966755a0c 
								
							 
						 
						
							
							
								
								Store death animation index in CreatureStats  
							
							 
							
							
							
						 
						
							2014-05-26 20:52:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3cd835e61a 
								
							 
						 
						
							
							
								
								Fix bsa file loading not being case insensitive ( Fixes   #1178 )  
							
							 
							
							
							
						 
						
							2014-05-26 17:34:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								039398c8ae 
								
							 
						 
						
							
							
								
								Basic RefData and CellRef change tracking  
							
							 
							
							... 
							
							
							
							Wrapped item charge handling in getItemHealth function 
							
						 
						
							2014-05-25 14:30:07 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b47b2b84f3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp 
							
						 
						
							2014-05-23 08:39:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								244eb11651 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'greye/widechar'  
							
							 
							
							
							
						 
						
							2014-05-23 07:48:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e51300989c 
								
							 
						 
						
							
							
								
								Handle NiBSPArrayController as alias for NiParticleSystemController  
							
							 
							
							... 
							
							
							
							The differences (if any) are unknown.
NiBSPArrayController is used by the Atronach_Fire.nif model. Its particles are now visible, but they don't look right yet. Need to handle NiAutoNormalParticlesData? 
							
						 
						
							2014-05-22 23:07:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								663d5c314e 
								
							 
						 
						
							
							
								
								be more verbose on change reasons  
							
							 
							
							
							
						 
						
							2014-05-22 16:35:57 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								4346e3b4d0 
								
							 
						 
						
							
							
								
								try to load plugins from relative paths  
							
							 
							
							
							
						 
						
							2014-05-20 21:42:51 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d8440e1fdc 
								
							 
						 
						
							
							
								
								implemented reference record merging  
							
							 
							
							
							
						 
						
							2014-05-20 09:02:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								444a07c01b 
								
							 
						 
						
							
							
								
								workaround OgreLog Unicode path handling  
							
							 
							
							
							
						 
						
							2014-05-19 18:12:13 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								493f8c6050 
								
							 
						 
						
							
							
								
								fix opening BSA on Unicode path  
							
							 
							
							
							
						 
						
							2014-05-19 13:39:07 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								417e07fbce 
								
							 
						 
						
							
							
								
								fix irrelevant error reporting  
							
							 
							
							
							
						 
						
							2014-05-19 10:59:36 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								6cb795ef7d 
								
							 
						 
						
							
							
								
								attempt to fix LowLevelFile, minor code reuse  
							
							 
							
							
							
						 
						
							2014-05-19 10:47:02 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								2c82da8e6e 
								
							 
						 
						
							
							
								
								load Ogre::ConfigFile from DataStream  
							
							 
							
							
							
						 
						
							2014-05-19 10:07:43 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								3dceb7ee4f 
								
							 
						 
						
							
							
								
								Fix overwriting DialInfo  
							
							 
							
							
							
						 
						
							2014-05-18 18:58:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								0aa1042fd7 
								
							 
						 
						
							
							
								
								Optimized dialogue merging with a lookup map  
							
							 
							
							
							
						 
						
							2014-05-18 16:01:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1677fcf324 
								
							 
						 
						
							
							
								
								Dialogue merging  
							
							 
							
							
							
						 
						
							2014-05-18 15:25:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5b76c0893a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							 
							
							... 
							
							
							
							Conflicts:
	components/esm/inventorystate.hpp 
							
						 
						
							2014-05-18 12:55:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								e02b04536f 
								
							 
						 
						
							
							
								
								fix most vexing parse issue  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								424d06a6f8 
								
							 
						 
						
							
							
								
								open fstreams from boost::filesystem::path, vol.2  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								2236216344 
								
							 
						 
						
							
							
								
								minor simplification  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								a22ec223d8 
								
							 
						 
						
							
							
								
								open fstreams from boost::filesystem::path, vol.1  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								b4950509bc 
								
							 
						 
						
							
							
								
								use converted widechars in ini importer  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								eafdefe999 
								
							 
						 
						
							
							
								
								using WindowsPath implies utf-8 for boost fs::path  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:05 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									greye 
								
							 
						 
						
							
							
							
							
								
							
							
								584c121f33 
								
							 
						 
						
							
							
								
								fix windows unicode path handling  
							
							 
							
							
							
						 
						
							2014-05-18 14:55:04 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a872c9f83a 
								
							 
						 
						
							
							
								
								Feature  #1323 : handle restocking levelled items  
							
							 
							
							
							
						 
						
							2014-05-18 12:53:21 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									cc9cii 
								
							 
						 
						
							
							
							
							
								
							
							
								b36bb58e8c 
								
							 
						 
						
							
							
								
								Bug  #1324 : Artem's solution  
							
							 
							
							
							
						 
						
							2014-05-18 07:34:13 +10:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f7c89015f9 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-05-17 11:50:31 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ae66d28c87 
								
							 
						 
						
							
							
								
								Feature  #32 : Implement respawn for containers, creatures and NPCs  
							
							 
							
							
							
						 
						
							2014-05-17 09:09:00 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e266aff561 
								
							 
						 
						
							
							
								
								Savegame: store projectiles  
							
							 
							
							
							
						 
						
							2014-05-17 05:24:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b3735981d6 
								
							 
						 
						
							
							
								
								Remove unused file_finder  
							
							 
							
							
							
						 
						
							2014-05-15 21:36:24 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								3b2ba4f6cd 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-05-15 14:25:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a76e391ad0 
								
							 
						 
						
							
							
								
								Savegame: store door movement state ( Closes   #747 )  
							
							 
							
							
							
						 
						
							2014-05-15 09:54:10 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								471bbd0021 
								
							 
						 
						
							
							
								
								Savegame: store levelled creature state and move to actorIds  
							
							 
							
							... 
							
							
							
							(Closes  #1332 ) 
							
						 
						
							2014-05-15 09:54:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d08869a25d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'slothlife/msvc_warning_cleanup'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwrender/localmap.cpp 
							
						 
						
							2014-05-15 08:13:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								f33559fead 
								
							 
						 
						
							
							
								
								Fixes for MSVC warnings, less overall changes  
							
							 
							
							... 
							
							
							
							Kept some fixes from the first round of review. Found out that several
targets weren't being built with the same basic warnings disabled.
Disabled a few warnings for external libraries specifically, rather than
applying them to all targets. 
							
						 
						
							2014-05-14 20:12:52 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9b67fcc4d7 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/OpenMW/openmw  
							
							 
							
							
							
						 
						
							2014-05-14 23:54:25 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								9052cc4a57 
								
							 
						 
						
							
							
								
								Savegame: store ActiveSpells  
							
							 
							
							
							
						 
						
							2014-05-14 23:54:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								61187c2fef 
								
							 
						 
						
							
							
								
								Savegame: store actorIds  
							
							 
							
							
							
						 
						
							2014-05-14 09:47:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								51020fdb5f 
								
							 
						 
						
							
							
								
								Fix a bug for NpcStats::mUsedIds in savegames, and added a compile-time guard to prevent similar errors in the future.  
							
							 
							
							
							
						 
						
							2014-05-14 09:17:30 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								cbcf0f6039 
								
							 
						 
						
							
							
								
								Changed AiEScort to use new PathTo function  
							
							 
							
							
							
						 
						
							2014-05-14 01:44:11 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								c160a04ede 
								
							 
						 
						
							
							
								
								Revert "Fixes for warnings when building with MSVC"  
							
							 
							
							... 
							
							
							
							This reverts commit 46eb20b98c . 
							
						 
						
							2014-05-14 00:03:30 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								085fb2c5a2 
								
							 
						 
						
							
							
								
								Simplified documentation a bit  
							
							 
							
							
							
						 
						
							2014-05-13 14:13:05 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								a61d804de6 
								
							 
						 
						
							
							
								
								now that I've found the documentation, fixed some stuff for extensions  
							
							 
							
							
							
						 
						
							2014-05-13 13:53:06 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								77d365e196 
								
							 
						 
						
							
							
								
								Forced some function arguments to take in a specific array size  
							
							 
							
							
							
						 
						
							2014-05-13 13:25:22 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								9dbe53c722 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							
							
						 
						
							2014-05-13 04:11:07 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								2c74ea381e 
								
							 
						 
						
							
							
								
								Moved pathfinding code to aiPackage, implemented it's use with aiFollow and aiPursue  
							
							 
							
							
							
						 
						
							2014-05-12 21:05:32 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6cc691115b 
								
							 
						 
						
							
							
								
								Savegame: store most of CreatureStats  
							
							 
							
							
							
						 
						
							2014-05-12 21:37:36 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								645d174a96 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwmechanics/aisequence.hpp 
							
						 
						
							2014-05-12 14:49:08 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a4a9794417 
								
							 
						 
						
							
							
								
								Savegame: store fog of war ( Closes   #1177 )  
							
							 
							
							
							
						 
						
							2014-05-11 02:07:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								041319c43e 
								
							 
						 
						
							
							
								
								Fixes   #1234 : Store dynamic record counter in savegame to prevent name clashes  
							
							 
							
							
							
						 
						
							2014-05-11 00:32:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								46eb20b98c 
								
							 
						 
						
							
							
								
								Fixes for warnings when building with MSVC  
							
							 
							
							... 
							
							
							
							Most warnings are innocuous (wrong type-specifier for forward
declarations, conversion of literals into unsigned integers, warnings
about methods optimized out), but I believe actual bugs were revealed in
vartypedelegate.cpp and combat.cpp. 
							
						 
						
							2014-05-09 08:32:52 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								dbf06d8c8b 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwmechanics/aipursue.hpp
	apps/openmw/mwmechanics/aisequence.hpp 
							
						 
						
							2014-05-04 02:06:43 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								7bddfc0025 
								
							 
						 
						
							
							
								
								Fix some spelling mistakes.  
							
							 
							
							
							
						 
						
							2014-05-03 12:23:22 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								122e606e30 
								
							 
						 
						
							
							
								
								Crime: improvement to arrest on sight for large bounties  
							
							 
							
							... 
							
							
							
							iCrimeThreshold controls the needed bounty to have guards run to the player and force dialogue. In vanilla, the greeting dialogue is scripted to either arrest the player (< 5000 bounty) or present a death sentence and attack (>= 5000 bounty). 
							
						 
						
							2014-05-03 12:17:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8560b43464 
								
							 
						 
						
							
							
								
								Move to esm component  
							
							 
							
							
							
						 
						
							2014-05-02 12:48:07 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								17bb8d7f9a 
								
							 
						 
						
							
							
								
								Fixes   #1252 : Add item/magic keybindings to savegame  
							
							 
							
							
							
						 
						
							2014-05-01 21:16:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6f7fbc867f 
								
							 
						 
						
							
							
								
								Fix several leaks  
							
							 
							
							
							
						 
						
							2014-05-01 16:55:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								8f90dd43ec 
								
							 
						 
						
							
							
								
								Changed things to use typedef ScriptARgs/ScriptReturn, which makes finding out what those weird strings meant much much easier  
							
							 
							
							
							
						 
						
							2014-04-29 12:52:08 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								885228ec02 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/mwmechanics/actors.cpp 
							
						 
						
							2014-04-28 12:27:57 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								27a05027f4 
								
							 
						 
						
							
							
								
								Fixes   #1172 : Added basic loading/saving progress bar  
							
							 
							
							... 
							
							
							
							The progress is not particularly accurate. It simply uses the current / total number of records written/read as indication. Cell records are currently the largest by far, but there is a good chance that could be optimized using a change tracking system. 
							
						 
						
							2014-04-28 11:29:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								c2127845af 
								
							 
						 
						
							
							
								
								Added onKnockdown command  
							
							 
							
							
							
						 
						
							2014-04-27 20:54:22 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								30666f2cce 
								
							 
						 
						
							
							
								
								Fixes   #1297 : Store global map markers in savegame  
							
							 
							
							
							
						 
						
							2014-04-26 13:42:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								f921f2e7db 
								
							 
						 
						
							
							
								
								Make PcRaiseRank, PcLowerRank and PcJoinFaction properly accept references instead of using the actor that the player talked to last.  
							
							 
							
							... 
							
							
							
							This also solves a potential crash when no actor has been talked to yet, e.g. immediately after loading a savegame. 
							
						 
						
							2014-04-26 12:04:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								45d2a00717 
								
							 
						 
						
							
							
								
								Fixes   #1293 : Allow interpolation type 0 in case of 0 keys  
							
							 
							
							
							
						 
						
							2014-04-26 11:36:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								f6deca7c80 
								
							 
						 
						
							
							
								
								Fixed various issues caused by late-night coding. Also added "unlock" message to unlocked doors  
							
							 
							
							
							
						 
						
							2014-04-23 13:02:51 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								61341d4206 
								
							 
						 
						
							
							
								
								Removed mLocked, kept it as "Negative lock level means unlocked"  
							
							 
							
							
							
						 
						
							2014-04-23 10:00:18 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Thomas 
								
							 
						 
						
							
							
							
							
								
							
							
								420163d35f 
								
							 
						 
						
							
							
								
								Small changes to lock command (If no valid lockLevel exists, defaults to 100)  
							
							 
							
							
							
						 
						
							2014-04-23 05:19:34 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6929e541dd 
								
							 
						 
						
							
							
								
								Fix texture name issue with Vality's Bitter Coast Mod  
							
							 
							
							
							
						 
						
							2014-04-21 05:30:14 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								2cb9f38a45 
								
							 
						 
						
							
							
								
								Changed crime IDs for legacy savegames. Not an issue, but it was inconsistent.  
							
							 
							
							
							
						 
						
							2014-04-20 19:34:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								262e959699 
								
							 
						 
						
							
							
								
								Remove unused slice_array  
							
							 
							
							
							
						 
						
							2014-04-20 19:28:39 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d0b7362f 
								
							 
						 
						
							
							
								
								Fix older savegame compatibility regarding new crime feature.  
							
							 
							
							
							
						 
						
							2014-04-18 12:34:26 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								86e65944b8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jeffreyhaines/master'  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/openmw/CMakeLists.txt 
							
						 
						
							2014-04-15 11:31:48 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								300eb6f444 
								
							 
						 
						
							
							
								
								make FNAM sub-record optional for all record types  
							
							 
							
							
							
						 
						
							2014-04-13 13:23:50 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jeffrey Haines 
								
							 
						 
						
							
							
							
							
								
							
							
								a274b48f2f 
								
							 
						 
						
							
							
								
								States are saved. Crime is reacted to.  
							
							 
							
							... 
							
							
							
							Issues where some crime is ignored. Needs a lot more work 
							
						 
						
							2014-04-05 22:45:40 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									megaton 
								
							 
						 
						
							
							
							
							
								
							
							
								50af9bc0d3 
								
							 
						 
						
							
							
								
								General perfomance optimizations.  
							
							 
							
							
							
						 
						
							2014-03-30 19:45:27 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								2c2106205d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2014-03-28 09:56:35 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d7df9cae21 
								
							 
						 
						
							
							
								
								Bug  #1224 : Changed fix to potentially allow for language independent saves  
							
							 
							
							
							
						 
						
							2014-03-27 22:32:42 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								53ba23e303 
								
							 
						 
						
							
							
								
								Fixes   #1224 : Store class name instead of id in savegame header  
							
							 
							
							
							
						 
						
							2014-03-26 19:56:12 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1b6b4e3442 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'slothlife/weather_save'  
							
							 
							
							
							
						 
						
							2014-03-23 08:36:45 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								452b522bc3 
								
							 
						 
						
							
							
								
								Fix typos  
							
							 
							
							
							
						 
						
							2014-03-22 19:01:41 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								00eac7d53a 
								
							 
						 
						
							
							
								
								Fixed header include guard to match filename  
							
							 
							
							
							
						 
						
							2014-03-21 01:22:54 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								6eab9c5179 
								
							 
						 
						
							
							
								
								Move weather state save/load to a new class  
							
							 
							
							
							
						 
						
							2014-03-21 01:19:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									slothlife 
								
							 
						 
						
							
							
							
							
								
							
							
								1acd1bd913 
								
							 
						 
						
							
							
								
								Feature  #1173 : Saved Game: include weather state  
							
							 
							
							... 
							
							
							
							Removed some unused state in and changed Ogre::String to std::string in
WeatherManager. 
							
						 
						
							2014-03-20 01:25:52 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marek Kochanowicz 
								
							 
						 
						
							
							
							
							
								
							
							
								6416ae90d2 
								
							 
						 
						
							
							
								
								Merge branch 'preview' of  https://github.com/zinnschlag/openmw  into Editor-Dialog  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/view/world/subviews.cpp 
							
						 
						
							2014-03-19 10:23:15 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								c8c0e5de38 
								
							 
						 
						
							
							
								
								Fixed code issues found with unity build. Missing include guards, duplicated functions, ...  
							
							 
							
							
							
						 
						
							2014-03-16 23:49:06 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b0a1e1198a 
								
							 
						 
						
							
							
								
								Yet another terrain fix  
							
							 
							
							
							
						 
						
							2014-03-16 16:30:17 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a9dcc90970 
								
							 
						 
						
							
							
								
								Another terrain fix  
							
							 
							
							
							
						 
						
							2014-03-09 11:59:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								2de862126a 
								
							 
						 
						
							
							
								
								moved resources group creation from Engine to bsa component  
							
							 
							
							
							
						 
						
							2014-03-09 11:42:39 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b8ca067730 
								
							 
						 
						
							
							
								
								Small fix for terrain  
							
							 
							
							
							
						 
						
							2014-03-09 03:21:34 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f1353dc84f 
								
							 
						 
						
							
							
								
								Merge branch 'scene'  
							
							 
							
							
							
						 
						
							2014-03-06 16:46:44 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d0f98103e4 
								
							 
						 
						
							
							
								
								Terrain: re-added "distant land=off" path  
							
							 
							
							... 
							
							
							
							Still a hack, but the overhead of building and traversing the quad tree appears negligible. 
							
						 
						
							2014-03-06 03:04:23 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								1d926816b5 
								
							 
						 
						
							
							
								
								Terrain: background load blendmaps & layer textures. Refactor QuadTree update.  
							
							 
							
							
							
						 
						
							2014-03-05 21:46:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								4328e08162 
								
							 
						 
						
							
							
								
								Terrain: get rid of unneeded members  
							
							 
							
							
							
						 
						
							2014-03-05 21:46:37 +01:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								6a002d19b3 
								
							 
						 
						
							
							
								
								Terrain: destroy no longer used materials  
							
							 
							
							
							
						 
						
							2014-03-05 21:46:37 +01:00