| 
							
							
								 Tobydrama | 0772e9cda0 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 19:21:42 +01:00 |  | 
			
				
					|  | 6ba5c05813 | Fjerner ubrukt debugging variabel | 2020-02-27 19:17:03 +01:00 |  | 
			
				
					|  | 8f416baf51 | Merge remote-tracking branch 'origin/master' | 2020-02-27 19:13:31 +01:00 |  | 
			
				
					|  | e15992647a | Merge branch 'player-and-zoom' | 2020-02-27 19:10:04 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | 6db064ad5d | Merge branch 'master' of https://github.com/inf112-v20/Fiasko
						
						
						
						
						
						
							
 v0.2-alpha | 2020-02-27 19:04:28 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | cc94201dc6 | La til nødvendig new line | 2020-02-27 19:04:17 +01:00 |  | 
			
				
					|  | 13df764ed4 | Oppdaterer spillversjon | 2020-02-27 19:02:43 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | f4e70c95b6 | Fixet new line problemer | 2020-02-27 18:58:44 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | 18ba86e3ed | Endret formulering | 2020-02-27 18:54:08 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | 98d822c35d | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:51:59 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | d556f20fbb | Rettet formatering | 2020-02-27 18:51:51 +01:00 |  | 
			
				
					|  | 80fdfb0256 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:51:19 +01:00 |  | 
			
				
					|  | 481db78242 | Fjerner unødvendige importeringer i PositionTest | 2020-02-27 18:51:02 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 90bb82abaf | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:47:37 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | ccc5f3af17 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:45:46 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | 639798cdbe | Fixed typos. | 2020-02-27 18:45:40 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | 1b6175f632 | Lagt møtereferat for andre møte 27/02/2020 | 2020-02-27 18:43:06 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 7e73eb09fc | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:41:01 +01:00 |  | 
			
				
					|  | 2ec9da5396 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:36:27 +01:00 |  | 
			
				
					|  | 8549ce2f17 | Flytter private metoder nedover i koden | 2020-02-27 18:36:10 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | a48baff9f0 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 18:34:34 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | ad3ec780be | Fixed typos. | 2020-02-27 18:34:27 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 874d00c461 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 17:58:58 +01:00 |  | 
			
				
					|  | 9f08c585cc | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 17:16:40 +01:00 |  | 
			
				
					|  | 4bde85e2dc | Fikser noen feil i texture_sheet_tile_mapping.txt | 2020-02-27 17:15:43 +01:00 |  | 
			
				
					|  | a63b0716b7 | Legger til en debug modus til spillet | 2020-02-27 16:44:06 +01:00 |  | 
			
				
					|  | 0d90e2047e | Fikser noen feil i texture_sheet_tile_mapping.txt | 2020-02-27 16:43:30 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 996ac0c1b1 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 16:26:49 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | 3add3fa487 | Fixed typo and imports. | 2020-02-27 12:30:25 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | cd8905abd9 | More tests for equals. | 2020-02-27 12:27:35 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | 27250fffec | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 12:19:29 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | 726efa3cb4 | Made tests for the position.equals method. | 2020-02-27 12:19:18 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | b3e6cc6901 | Litt småfiksing i Oblig2.md og README.md | 2020-02-27 12:12:48 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | f459c42b27 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 12:09:49 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | d4b26fb429 | Litt småfiksing i Oblig2.md | 2020-02-27 12:09:42 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | 61ec28f6ad | Lagt til kjøredetaljer | 2020-02-27 12:00:53 +01:00 |  | 
			
				
					| 
							
							
								 GabrielMagnus | c9a04928b9 | Lagt til spillstatus | 2020-02-27 12:00:26 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | c993ae18b2 | Fikset på referat. | 2020-02-27 11:59:32 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 34b69fb527 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:48:37 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | 59c8501ec0 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:47:49 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | cac4ddfec6 | Fikset på referat. | 2020-02-27 11:47:39 +01:00 |  | 
			
				
					| 
							
							
								 Steinar Aalstad Lillesund | bb35fb9763 | Referat fra møte. | 2020-02-27 11:43:31 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | bb0a61ab60 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:42:57 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | 8712f3184e | Fikser markdown issues med spacing | 2020-02-27 11:40:43 +01:00 |  | 
			
				
					|  | 3c532c6c99 | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:39:48 +01:00 |  | 
			
				
					|  | 33abf1a853 | Legger til språk for kodeblokker | 2020-02-27 11:39:27 +01:00 |  | 
			
				
					| 
							
							
								 Tobydrama | 0a0bd717cd | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:37:46 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | c1d8d02b0d | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:28:34 +01:00 |  | 
			
				
					| 
							
							
								 torlunjen | ab0b620f1f | Legger til klassediagram i Oblig2.md | 2020-02-27 11:28:09 +01:00 |  | 
			
				
					|  | cd10ade89b | Merge branch 'master' of https://github.com/inf112-v20/Fiasko | 2020-02-27 11:23:55 +01:00 |  |