Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	dd9420fc38
						 | 
						
							
							
								
								
								move at_guard into guard module as well
							
							
							
							
							
						 | 
						
							2015-09-12 23:38:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	8fa3234159
						 | 
						
							
							
								
								
								Merge branch 'master' into develop
							
							
							
							
							
							
							
							Conflicts:
	tests/runtests.bat 
							
						 | 
						
							2015-09-12 21:00:28 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	a027139057
						 | 
						
							
							
								
								
								remove global variable verbosity in favor of static in main.c (use log_* functions everywhere)
							
							
							
							
							
						 | 
						
							2015-09-12 20:58:09 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	c731edbfed
						 | 
						
							
							
								
								
								remove prefixes.xml from E4, too
							
							
							
							
							
						 | 
						
							2015-09-12 13:38:31 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	3003b7fc61
						 | 
						
							
							
								
								
								remove prefixes from E3
							
							
							
							
							
							
							
							move prefix test to common.lua 
							
						 | 
						
							2015-09-12 13:37:43 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	84aa0beee5
						 | 
						
							
							
								
								
								create a more complex integration test for a unit that sails with a
							
							
							
							
							
							
							
							ship (and sees more regions along the way). 
							
						 | 
						
							2015-09-07 16:11:58 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	aa394feb80
						 | 
						
							
							
								
								
								make test data humans, not vampunicorn (what happened there?)
							
							
							
							
							
						 | 
						
							2015-09-07 15:57:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	75235a11fc
						 | 
						
							
							
								
								
								update test data to include ships and buildings
							
							
							
							
							
						 | 
						
							2015-08-05 18:03:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Enno Rehling
								
							 
						 | 
						
							
							
								
							
							
	88f454e1f7
						 | 
						
							
							
								
								
								failed tests abort runtests and return an error code
							
							
							
							
							
							
							
							small test world for (future) valgrind tests. 
							
						 | 
						
							2015-05-21 08:29:22 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |