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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								c42e74dadf
								
							
						 | 
						
							
							
								
								make 4 byte record type accessable from record struct
							
							
							
							
							
						 | 
						
							2013-09-24 13:17:28 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								874ce26bef
								
							
						 | 
						
							
							
								
								added missing consts to record save functions
							
							
							
							
							
						 | 
						
							2013-09-16 12:32:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Chris Robinson
								
							 
						 | 
						
							
							
							
							
								
							
							
								73437dfdca
								
							
						 | 
						
							
							
								
								GetEffect can accept an effect ID string as well
							
							
							
							
							
						 | 
						
							2013-08-13 19:18:21 -07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								5f7d349126
								
							
						 | 
						
							
							
								
								several missing includes
							
							
							
							
							
						 | 
						
							2012-11-14 05:32:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								8ccb0907e6
								
							
						 | 
						
							
							
								
								assertion -> exception; added the old effect flags again
							
							
							
							
							
						 | 
						
							2012-10-12 14:26:10 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									scrawl
								
							 
						 | 
						
							
							
							
							
								
							
							
								21493c2dbd
								
							
						 | 
						
							
							
								
								added magic effect flags from Research wiki page
							
							
							
							
							
						 | 
						
							2012-10-01 23:33:07 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								1339787863
								
							
						 | 
						
							
							
								
								remove underscores from filenames in esm
							
							
							
							
							
						 | 
						
							2012-09-23 23:12:10 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								18cc435aa1
								
							
						 | 
						
							
							
								
								resolving conflicts
							
							
							
							
							
						 | 
						
							2012-09-21 13:13:11 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								09195894cf
								
							
						 | 
						
							
							
								
								restore INGR and MGEF
							
							
							
							
							
						 | 
						
							2012-09-21 12:30:08 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								e69880f77e
								
							
						 | 
						
							
							
								
								almost perfect byte copies, has redundant data
							
							
							
							
							
						 | 
						
							2012-09-20 20:33:30 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									greye
								
							 
						 | 
						
							
							
							
							
								
							
							
								7606ebafd6
								
							
						 | 
						
							
							
								
								resolving conflicts, minor update
							
							
							
							
							
						 | 
						
							2012-09-17 11:37:50 +04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Marc Zinnschlag
								
							 
						 | 
						
							
							
							
							
								
							
							
								f2ab4c929d
								
							
						 | 
						
							
							
								
								Issue #356: added hardcoded magic effect flags *grumble*
							
							
							
							
							
						 | 
						
							2012-09-13 09:26:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								a74aeace73
								
							
						 | 
						
							
							
								
								Can now save strings with proper encoding, byte-perfect clones up until land records
							
							
							
							
							
						 | 
						
							2012-04-14 00:14:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander "Ace" Olofsson
								
							 
						 | 
						
							
							
							
							
								
							
							
								ba602929ef
								
							
						 | 
						
							
							
								
								Adding basic save functions to all record types.
							
							
							
							
							
						 | 
						
							2012-04-06 21:04:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nikolay Kasyanov
								
							 
						 | 
						
							
							
							
							
								
							
							
								fcfe267fc9
								
							
						 | 
						
							
							
								
								Refactored remaining headers in components/esm except defs.hpp.
							
							
							
							
							
							
							
							Removed obsolete *.cpp files. 
							
						 | 
						
							2011-04-28 21:55:05 +02:00 | 
						
						
							
							
							
								
							
							
						 |