Mark Siewert
								
							 
						 | 
						
							
							
							
							
								
							
							
								713d324eeb
								
							
						 | 
						
							
							
								
								- Minor code cleanup
							
							
							
							
							
						 | 
						
							2013-01-20 19:07:33 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Siewert
								
							 
						 | 
						
							
							
							
							
								
							
							
								1f961d575e
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
							
							
							
							
							
							
							
							Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp 
							
						 | 
						
							2012-10-07 20:35:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mark Siewert
								
							 
						 | 
						
							
							
							
							
								
							
							
								28d4d7ea3f
								
							
						 | 
						
							
							
								
								Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
							
							
							
							
							
							
							
							- Remove check for 255 master/plugin files. 
							
						 | 
						
							2012-10-07 20:00:55 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								31f7325e1f
								
							
						 | 
						
							
							
								
								fix land loading
							
							
							
							
							
						 | 
						
							2012-10-01 15:46:32 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								1339787863
								
							
						 | 
						
							
							
								
								remove underscores from filenames in esm
							
							
							
							
							
						 | 
						
							2012-09-23 23:12:10 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								2d5ddd104b
								
							
						 | 
						
							
							
								
								Land::loadData rework
							
							
							
							
							
						 | 
						
							2012-09-21 12:12:16 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd94f257bf
								
							
						 | 
						
							
							
								
								a bit formatting
							
							
							
							
							
						 | 
						
							2012-09-21 09:36:18 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								e69880f77e
								
							
						 | 
						
							
							
								
								almost perfect byte copies, has redundant data
							
							
							
							
							
						 | 
						
							2012-09-20 20:33:30 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								e8bba2b833
								
							
						 | 
						
							
							
								
								disabled loading of land normals again, didn't need them after all
							
							
							
							
							
						 | 
						
							2012-09-20 14:06:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								86cfc91ef3
								
							
						 | 
						
							
							
								
								global map rendering
							
							
							
							
							
						 | 
						
							2012-09-20 13:56:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								7606ebafd6
								
							
						 | 
						
							
							
								
								resolving conflicts, minor update
							
							
							
							
							
						 | 
						
							2012-09-17 11:37:50 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								76c4aa41bb
								
							
						 | 
						
							
							
								
								More land and cell work
							
							
							
							
							
						 | 
						
							2012-06-11 20:02:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c9dfcc017
								
							
						 | 
						
							
							
								
								Some changes
							
							
							
							
							
						 | 
						
							2012-04-29 09:26:03 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								fc8c75ab89
								
							
						 | 
						
							
							
								
								Esmtool can now clone an esm file in such a way that it can read it back again afterwards.
							
							
							
							
							
						 | 
						
							2012-04-08 17:04:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								b81ac363fc
								
							
						 | 
						
							
							
								
								Write names with a small sanity check
							
							
							
							
							
						 | 
						
							2012-04-06 21:28:58 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba602929ef
								
							
						 | 
						
							
							
								
								Adding basic save functions to all record types.
							
							
							
							
							
						 | 
						
							2012-04-06 21:04:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukasz Gromanowski
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd2789b15a
								
							
						 | 
						
							
							
								
								Revert "Issue #225: Correction to commit ae98904."
							
							
							
							
							
							
							
							This reverts commit 0e5c90d3e7. 
							
						 | 
						
							2012-04-04 21:05:19 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukasz Gromanowski
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e5c90d3e7
								
							
						 | 
						
							
							
								
								Issue #225: Correction to commit ae98904.
							
							
							
							
							
							
							
							Changed pointer to LandData struct to simple member variable. 
							
						 | 
						
							2012-04-02 23:50:53 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lukasz Gromanowski
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae989040e5
								
							
						 | 
						
							
							
								
								Issue #225: Fix for memleak when loading terrain.
							
							
							
							
							
						 | 
						
							2012-04-01 21:29:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								b76b62e5e4
								
							
						 | 
						
							
							
								
								Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
							
							
							
							
							
						 | 
						
							2012-03-27 09:20:22 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								6924348696
								
							
						 | 
						
							
							
								
								Fixed some texture splatting issues with loading empty terrain cells
							
							
							
							
							
						 | 
						
							2012-02-29 23:33:54 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								1d0ae9c8d1
								
							
						 | 
						
							
							
								
								Start of a basic implementation of fake vertex colours
							
							
							
							
							
						 | 
						
							2012-02-29 23:05:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								637302fc87
								
							
						 | 
						
							
							
								
								Added blended textures to the terrain
							
							
							
							
							
						 | 
						
							2012-01-21 17:59:12 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Jacob Essex
								
							 
						 | 
						
							
							
							
							
								
							
							
								18108c02a7
								
							
						 | 
						
							
							
								
								Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
							
							
							
							
							
						 | 
						
							2012-01-21 16:59:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolay Kasyanov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7168795ae6
								
							
						 | 
						
							
							
								
								components/esm header refactoring in progress. Refactored:
							
							
							
							
							
							
							
							esm_reader.hpp
loadacti.hpp
loadalch.hpp
loadappa.hpp
loadarmo.hpp
loadbody.hpp
loadbook.hpp
loadbsgn.hpp
loadcell.hpp
loadclas.hpp
loadclot.hpp
loadland.hpp
Updated code style in defs.hpp 
							
						 | 
						
							2011-04-28 21:55:05 +02:00 | 
						
						
							
							
							
								
							
							
						 |