Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c995533e07 
								
							 
						 
						
							
							
								
								Merge branch 'dialogue' into saving  
							
							 
							
							... 
							
							
							
							Conflicts:
	apps/opencs/model/world/columnimp.hpp
	apps/opencs/model/world/columns.cpp
	apps/opencs/model/world/columns.hpp
	apps/opencs/model/world/data.cpp
	components/esm/loaddial.hpp 
							
						 
						
							2013-10-21 16:45:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								adf3a41a83 
								
							 
						 
						
							
							
								
								added topic and journal tables  
							
							 
							
							
							
						 
						
							2013-10-20 17:15:32 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								3c580fbc59 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jordan-ayers/topic/MagicEffectDisplayFormat'  
							
							 
							
							
							
						 
						
							2013-10-12 13:40:29 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								296b2ab870 
								
							 
						 
						
							
							
								
								Magic Effect:  Recognize other display types.  
							
							 
							
							... 
							
							
							
							Fill out the list of effects which use percentage formatting.
Add in types which use Feet and level labels. 
							
						 
						
							2013-10-08 23:55:14 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Jordan Ayers 
								
							 
						 
						
							
							
							
							
								
							
							
								6ab7002908 
								
							 
						 
						
							
							
								
								MagicEffect:  Put magnitude type into ESM::MagicEffect helper.  
							
							 
							
							
							
						 
						
							2013-10-07 22:28:55 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Emanuel Guevel 
								
							 
						 
						
							
							
							
							
								
							
							
								496f786c2a 
								
							 
						 
						
							
							
								
								Implement Disable/EnableLevitation script functions  
							
							 
							
							... 
							
							
							
							Totally copied on Disable/EnableTeleporting implementation.
Thanks KittyCat! 
							
						 
						
							2013-10-02 15:33:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								baae548106 
								
							 
						 
						
							
							
								
								added project scope filter saving  
							
							 
							
							
							
						 
						
							2013-09-27 13:56:40 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								4ea5191d7d 
								
							 
						 
						
							
							
								
								fixed write function for ESM variant type  
							
							 
							
							
							
						 
						
							2013-09-27 13:17:04 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								5779f799ab 
								
							 
						 
						
							
							
								
								create project file when saving content file  
							
							 
							
							
							
						 
						
							2013-09-27 11:36:06 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								c42e74dadf 
								
							 
						 
						
							
							
								
								make 4 byte record type accessable from record struct  
							
							 
							
							
							
						 
						
							2013-09-24 13:17:28 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								d4b2a6b9f1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'graffy76/esxSelector' into saving  
							
							 
							
							
							
						 
						
							2013-09-23 10:09:43 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								513f0c4b3e 
								
							 
						 
						
							
							
								
								Implemented file/adjuster widgets into new addon creation dialog  
							
							 
							
							
							
						 
						
							2013-09-22 23:52:53 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Xethik 
								
							 
						 
						
							
							
							
							
								
							
							
								9f533dbbe4 
								
							 
						 
						
							
							
								
								Fixed "most vexing parse" issue.  
							
							 
							
							
							
						 
						
							2013-09-22 04:57:01 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								cfdc19c427 
								
							 
						 
						
							
							
								
								Renamed esxSelector to contentSelector  
							
							 
							
							... 
							
							
							
							Fixed datafilespage model implementation in launcher
Filtered addons in table view by selected game file 
							
						 
						
							2013-09-21 23:06:29 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								7b7dfa122d 
								
							 
						 
						
							
							
								
								Merge branch 'master' into esxSelector  
							
							 
							
							
							
						 
						
							2013-09-19 16:24:28 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								244e581952 
								
							 
						 
						
							
							
								
								Finished implementing drag / drop  
							
							 
							
							... 
							
							
							
							refactored datafilesmodel (now contentmodel)
refactored esmfil 
							
						 
						
							2013-09-19 06:53:09 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								0eb06ada39 
								
							 
						 
						
							
							
								
								Implemneting drag and drop  
							
							 
							
							
							
						 
						
							2013-09-18 02:36:23 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bf0fba68af 
								
							 
						 
						
							
							
								
								added save stage for globals  
							
							 
							
							
							
						 
						
							2013-09-16 12:51:57 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								874ce26bef 
								
							 
						 
						
							
							
								
								added missing consts to record save functions  
							
							 
							
							
							
						 
						
							2013-09-16 12:32:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								1ee228a566 
								
							 
						 
						
							
							
								
								fix for the ESMWriter fix  
							
							 
							
							
							
						 
						
							2013-09-15 15:30:17 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bcd36bd378 
								
							 
						 
						
							
							
								
								various ESMWriter fixes  
							
							 
							
							
							
						 
						
							2013-09-15 15:00:15 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								bf8a25c2c6 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'mckibbenta/tgm'  
							
							 
							
							
							
						 
						
							2013-09-12 19:07:35 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								25b7cd33ea 
								
							 
						 
						
							
							
								
								added FileWidget; fixed OpenCS configuration  
							
							 
							
							
							
						 
						
							2013-09-08 14:31:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a6e7cf9a8c 
								
							 
						 
						
							
							
								
								Implementing drag and drop  
							
							 
							
							
							
						 
						
							2013-09-07 15:57:40 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								9332684335 
								
							 
						 
						
							
							
								
								allow the use of value types in string filters  
							
							 
							
							
							
						 
						
							2013-09-05 15:05:49 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								188df341c3 
								
							 
						 
						
							
							
								
								Replaced log2 to make VC happy  
							
							 
							
							
							
						 
						
							2013-08-27 16:08:58 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								839d251cc5 
								
							 
						 
						
							
							
								
								Renamed Terrain::Terrain to Terrain::World to make VC happy  
							
							 
							
							
							
						 
						
							2013-08-27 16:01:16 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d3d6dfbde8 
								
							 
						 
						
							
							
								
								Refactored loading screen  
							
							 
							
							... 
							
							
							
							- Add loading progress for data files, global map, terrain
 - Refactored and improved cell loading progress 
							
						 
						
							2013-08-27 15:48:13 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mckibbenta 
								
							 
						 
						
							
							
							
							
								
							
							
								06701467ab 
								
							 
						 
						
							
							
								
								Merge branch 'master' into tgm  
							
							 
							
							
							
						 
						
							2013-08-24 21:28:26 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									mckibbenta 
								
							 
						 
						
							
							
							
							
								
							
							
								8998b90e8b 
								
							 
						 
						
							
							
								
								initial do-nothing implementation; registered opcode  
							
							 
							
							
							
						 
						
							2013-08-24 21:19:12 -04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								f605dcdd24 
								
							 
						 
						
							
							
								
								Merge branch 'filter'  
							
							 
							
							
							
						 
						
							2013-08-24 14:51:05 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Nikolay Kasyanov 
								
							 
						 
						
							
							
							
							
								
							
							
								dc6e15f38e 
								
							 
						 
						
							
							
								
								Replaced std::pow with shift since clang doesn't like int as a first argument  
							
							 
							
							... 
							
							
							
							(reports that call is ambiguous) 
							
						 
						
							2013-08-21 23:59:33 +04:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Marc Zinnschlag 
								
							 
						 
						
							
							
							
							
								
							
							
								e03e2f0817 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'scrawl/master'  
							
							 
							
							
							
						 
						
							2013-08-21 19:50:08 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								d086346b07 
								
							 
						 
						
							
							
								
								Fix loading of some cells in TR  
							
							 
							
							
							
						 
						
							2013-08-21 17:26:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								5f7e6f7b10 
								
							 
						 
						
							
							
								
								Fix a material issue, layers per pass wasn't entirely correct  
							
							 
							
							
							
						 
						
							2013-08-21 17:26:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								43313437dc 
								
							 
						 
						
							
							
								
								Fix composite map for cells without land data  
							
							 
							
							
							
						 
						
							2013-08-21 17:26:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ce5ea6d7d2 
								
							 
						 
						
							
							
								
								Use a proper node hierarchy; disconnect the root when entering interior  
							
							 
							
							
							
						 
						
							2013-08-21 17:26:11 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Chris Robinson 
								
							 
						 
						
							
							
							
							
								
							
							
								602be9bbe7 
								
							 
						 
						
							
							
								
								Avoid swimming into the air from underwater  
							
							 
							
							
							
						 
						
							2013-08-21 07:24:54 -07:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								e6fdc7e7fd 
								
							 
						 
						
							
							
								
								...  
							
							 
							
							
							
						 
						
							2013-08-20 12:34:39 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								6898321676 
								
							 
						 
						
							
							
								
								Reenabling features  
							
							 
							
							... 
							
							
							
							Profile functions enabled
New/load file functions partially enabled
Layout reorganized 
							
						 
						
							2013-08-20 08:16:56 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								fa76d1631b 
								
							 
						 
						
							
							
								
								Some terrain fixes  
							
							 
							
							
							
						 
						
							2013-08-20 12:08:46 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								b52645bf2a 
								
							 
						 
						
							
							
								
								Fixes to accommodate master/plugin loading  
							
							 
							
							
							
						 
						
							2013-08-20 03:23:32 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								8c8653160d 
								
							 
						 
						
							
							
								
								Crash fix, material fix  
							
							 
							
							
							
						 
						
							2013-08-20 09:52:27 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								b92da9ae93 
								
							 
						 
						
							
							
								
								Neighbour fix  
							
							 
							
							
							
						 
						
							2013-08-19 21:08:44 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								ebf9debb80 
								
							 
						 
						
							
							
								
								Enabled terrain self shadows, implemented getHeightAt, some optimizations  
							
							 
							
							
							
						 
						
							2013-08-19 20:39:37 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								e27437f8ed 
								
							 
						 
						
							
							
								
								New terrain renderer - improvements:  
							
							 
							
							... 
							
							
							
							- Consistent triangle alignment, fixes a noticable crack near the census and excise office. Note that alignment is still not the same as vanilla. Vanilla uses a weird diagonal pattern. I hope there aren't more trouble spots that will force us to replicate vanilla, but at least we can do that now.
 - Fixes several blending issues and cell border seams
 - Fix map render to use the terrain bounding box instead of an arbitrary height
 - Different LODs are now properly connected instead of using skirts
 - Support self shadowing
 - Normals and colors are stored in the vertices instead of a texture, this enables per-vertex lighting which should improve performance, fix compatibility issues due to the PS getting too large and mimic vanilla better
 - Support a fixed function fallback (though the splatting shader usually performs better)
 - Designed for distant land support - test: https://www.youtube.com/watch?v=2wnd9EuPJIY  - we can't really enable this yet due to depth precision issues when using a large view distance 
							
						 
						
							2013-08-19 20:34:20 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									scrawl 
								
							 
						 
						
							
							
							
							
								
							
							
								a41a23c90a 
								
							 
						 
						
							
							
								
								Deleted old code  
							
							 
							
							
							
						 
						
							2013-08-19 20:34:19 +02:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								e614ec3353 
								
							 
						 
						
							
							
								
								Fixing profile code in progress...  
							
							 
							
							
							
						 
						
							2013-08-18 17:11:23 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								f6217f9c6a 
								
							 
						 
						
							
							
								
								Moved esx selector classes out of global namespace  
							
							 
							
							
							
						 
						
							2013-08-18 15:11:29 -05:00  
						
						
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									graffy76 
								
							 
						 
						
							
							
							
							
								
							
							
								a14e0b32d8 
								
							 
						 
						
							
							
								
								Restructured esxselector directory  
							
							 
							
							... 
							
							
							
							Added ./view
Removed ./utils and ./model/esm
Relocated code accordingly. 
							
						 
						
							2013-08-18 09:48:13 -05:00