cc9cii
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1a58994c6
								
							
						 | 
						
							
							
								
								Merge branch 'master' into moveref
							
							
							
							
							
							
							
							Conflicts:
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/commands.cpp
	apps/opencs/model/world/commands.hpp
	apps/opencs/model/world/ref.cpp
	apps/opencs/view/world/dialoguesubview.cpp
	apps/opencs/view/world/dialoguesubview.hpp
	apps/opencs/view/world/util.cpp
	components/esm/cellref.hpp 
							
						 | 
						
							2015-04-25 06:52:53 +10:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									cc9cii
								
							 
						 | 
						
							
							
							
							
								
							
							
								fd86076db3
								
							
						 | 
						
							
							
								
								More warning fixes.
							
							
							
							
							
						 | 
						
							2015-03-14 08:09:19 +11:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								e32402a040
								
							
						 | 
						
							
							
								
								handle moved references on load
							
							
							
							
							
						 | 
						
							2015-01-09 12:05:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba7b74217b
								
							
						 | 
						
							
							
								
								added original cell column to reference table
							
							
							
							
							
						 | 
						
							2015-01-05 15:20:47 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0ba9a4bf2
								
							
						 | 
						
							
							
								
								added reference collection stage to saving operation (preparation for cell saving)
							
							
							
							
							
						 | 
						
							2014-05-27 12:39:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								d8440e1fdc
								
							
						 | 
						
							
							
								
								implemented reference record merging
							
							
							
							
							
						 | 
						
							2014-05-20 09:02:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9d7695ea88
								
							
						 | 
						
							
							
								
								added missing columns to topic info table
							
							
							
							
							
						 | 
						
							2013-11-05 11:41:48 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a39f32c32
								
							
						 | 
						
							
							
								
								store ID of cell in reference struct
							
							
							
							
							
						 | 
						
							2013-07-06 17:06:06 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								94ec05c2c6
								
							
						 | 
						
							
							
								
								Revert "simplifying CSMWorld::CellRef"
							
							
							
							
							
							
							
							With the refactored collection class we can now handle the more complex load function
This reverts commit 97f421df8a. 
							
						 | 
						
							2013-06-18 11:27:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								97f421df8a
								
							
						 | 
						
							
							
								
								simplifying CSMWorld::CellRef
							
							
							
							
							
						 | 
						
							2013-06-08 15:50:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								1e60ad3cd6
								
							
						 | 
						
							
							
								
								Promoted references to a top level record internally.
							
							
							
							
							
							
							
							Note: This does not change the structure of the ESX format. 
							
						 | 
						
							2013-06-08 12:45:13 +02:00 | 
						
						
							
							
							
								
							
							
						 |