|  | 4acf6804d4 | Merge branch 'master' into 'lighting' # Conflicts:
#   squirrelbattle/display/mapdisplay.py
#   squirrelbattle/interfaces.py | 2021-01-07 16:36:54 +01:00 |  | 
			
				
					|  | d49c138257 | Merge branch 'master' into 'ladders' # Conflicts:
#   squirrelbattle/game.py
#   squirrelbattle/interfaces.py
#   squirrelbattle/tests/game_test.py | 2021-01-06 17:29:26 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 9a56b4d7e9   | Navigate through different maps while climbing ladders | 2020-12-26 01:08:43 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 8636d571b5   | Add ladders in the map | 2020-12-26 00:52:47 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | 4b174f26e4 | Better colors | 2020-12-18 23:36:08 +01:00 |  | 
			
				
					| 
							
							
								 eichhornchen | ea5f5c1428 | Added an original text art to serve as the project's logo. | 2020-12-18 21:30:16 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Margulies | 762bed888a | Working visibility (at least relatively good), but a few lines untested | 2020-12-18 21:21:00 +01:00 |  | 
			
				
					| 
							
							
								 Yohann D'ANELLO | d0ee9ec562 | Rename dungeonbattle to squirrelbattle | 2020-11-19 02:18:16 +01:00 |  |