Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f671227a8b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2022-01-10 16:01:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7ecb677d97
							
						
					 | 
					
						
						
							
							ok ca se lance
						
						
						
						
						
					 | 
					
						2022-01-10 16:01:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f40fb1727f
							
						
					 | 
					
						
						
							
							score during gameplay + multiplayer
						
						
						
						
						
					 | 
					
						2022-01-10 15:55:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							209e1289ab
							
						
					 | 
					
						
						
							
							score during gameplay
						
						
						
						
						
					 | 
					
						2022-01-10 15:54:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdaa535b29
							
						
					 | 
					
						
						
							
							merge
						
						
						
						
						
					 | 
					
						2022-01-10 15:32:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1e6892f6b1
							
						
					 | 
					
						
						
							
							end menu score display
						
						
						
						
						
					 | 
					
						2022-01-10 15:31:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aea1502487
							
						
					 | 
					
						
						
							
							debug msgs
						
						
						
						
						
					 | 
					
						2022-01-10 15:03:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							04e7b7da94
							
						
					 | 
					
						
						
							
							a
						
						
						
						
						
					 | 
					
						2022-01-10 14:52:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7e3de18419
							
						
					 | 
					
						
						
							
							config defaults updated
						
						
						
						
						
					 | 
					
						2022-01-10 14:48:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							53f0785fee
							
						
					 | 
					
						
						
							
							Config debugged
						
						
						
						
						
					 | 
					
						2022-01-10 14:36:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5b7a673b6f
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2022-01-10 14:32:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							cd27832eed
							
						
					 | 
					
						
						
							
							improved yaml error reporting
						
						
						
						
						
					 | 
					
						2022-01-10 14:32:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							17a4019759
							
						
					 | 
					
						
						
							
							merge
						
						
						
						
						
					 | 
					
						2022-01-10 14:32:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							98358bba05
							
						
					 | 
					
						
						
							
							config def + true config file warning : cant lunch game
						
						
						
						
						
					 | 
					
						2022-01-10 14:29:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7b52545501
							
						
					 | 
					
						
						
							
							new sprite files
						
						
						
						
						
					 | 
					
						2022-01-10 14:27:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							36d6b21613
							
						
					 | 
					
						
						
							
							Async sprites loading
						
						
						
						
						
					 | 
					
						2022-01-10 14:27:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							3dcdcadff3
							
						
					 | 
					
						
						
							
							new config + patch
						
						
						
						
						
					 | 
					
						2022-01-10 09:49:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							9dc5a03427
							
						
					 | 
					
						
						
							
							removed last TODO
						
						
						
						
						
					 | 
					
						2022-01-10 09:40:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b7632df576
							
						
					 | 
					
						
						
							
							removed some TODOs
						
						
						
						
						
					 | 
					
						2022-01-10 09:39:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2675dc9e71
							
						
					 | 
					
						
						
							
							yeet size_t
						
						
						
						
						
					 | 
					
						2022-01-10 09:38:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8e6a206770
							
						
					 | 
					
						
						
							
							fixed some warnings
						
						
						
						
						
					 | 
					
						2022-01-10 09:36:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							2642ff2e69
							
						
					 | 
					
						
						
							
							AHHHHHH
						
						
						
						
						
					 | 
					
						2022-01-10 09:27:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a2379f9af7
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2022-01-10 09:23:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7a816b5f71
							
						
					 | 
					
						
						
							
							I'm depressed help
						
						
						
						
						
					 | 
					
						2022-01-10 09:23:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								imuny
							
						 
					 | 
					
						
						
						
						
							
						
						
							db9e0877c0
							
						
					 | 
					
						
						
							
							config
						
						
						
						
						
					 | 
					
						2022-01-10 09:19:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a10a1e67c5
							
						
					 | 
					
						
						
							
							fatigué
						
						
						
						
						
					 | 
					
						2022-01-10 09:13:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							8f24a307f8
							
						
					 | 
					
						
						
							
							flm
						
						
						
						
						
					 | 
					
						2022-01-10 08:50:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							31033a7d53
							
						
					 | 
					
						
						
							
							OSKOUR
						
						
						
						
						
					 | 
					
						2022-01-09 21:49:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							947665d306
							
						
					 | 
					
						
						
							
							b
						
						
						
						
						
					 | 
					
						2022-01-09 21:13:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f2984fffb8
							
						
					 | 
					
						
						
							
							preconditions
						
						
						
						
						
					 | 
					
						2022-01-09 20:40:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							aad76d162b
							
						
					 | 
					
						
						
							
							a
						
						
						
						
						
					 | 
					
						2022-01-09 18:47:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							e9b2a64e43
							
						
					 | 
					
						
						
							
							a
						
						
						
						
						
					 | 
					
						2022-01-09 18:45:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							04a7a63a25
							
						
					 | 
					
						
						
							
							push
						
						
						
						
						
					 | 
					
						2022-01-09 18:41:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a81ec496a6
							
						
					 | 
					
						
						
							
							push
						
						
						
						
						
					 | 
					
						2022-01-09 18:30:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							15dc67c348
							
						
					 | 
					
						
						
							
							save commit
						
						
						
						
						
					 | 
					
						2022-01-09 17:25:33 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							7b2eda8549
							
						
					 | 
					
						
						
							
							things
						
						
						
						
						
					 | 
					
						2022-01-09 16:44:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							f2822815dd
							
						
					 | 
					
						
						
							
							Did things
						
						
						
						
						
					 | 
					
						2022-01-09 16:32:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							09bce989d2
							
						
					 | 
					
						
						
							
							isopen
						
						
						
						
						
					 | 
					
						2022-01-09 15:58:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4978e8ab18
							
						
					 | 
					
						
						
							
							name menu
						
						
						
						
						
					 | 
					
						2022-01-09 15:53:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							338df7af3d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
					 | 
					
						2022-01-09 14:48:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c00c7361e9
							
						
					 | 
					
						
						
							
							lol
						
						
						
						
						
					 | 
					
						2022-01-09 14:48:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4c8bbef006
							
						
					 | 
					
						
						
							
							end of game menu done
						
						
						
						
						
					 | 
					
						2022-01-09 14:28:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ea6b489126
							
						
					 | 
					
						
						
							
							forgot some files
						
						
						
						
						
					 | 
					
						2022-01-09 04:27:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f1709acbe2
							
						
					 | 
					
						
						
							
							little changes
						
						
						
						
						
					 | 
					
						2022-01-09 04:24:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							19dd72a9f6
							
						
					 | 
					
						
						
							
							why the fuck was this here
						
						
						
						
						
					 | 
					
						2022-01-09 00:43:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1b46599598
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master'
						
						
						
						
						
						
						
						# Conflicts:
#	src/game/display.cpp
#	src/game/gameManagers.cpp 
						
					 | 
					
						2022-01-09 00:37:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c5f08c8bcc
							
						
					 | 
					
						
						
							
							beta heart system
						
						
						
						
						
					 | 
					
						2022-01-09 00:35:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							4737d9dcb3
							
						
					 | 
					
						
						
							
							life interaction? i guess
						
						
						
						
						
					 | 
					
						2022-01-09 00:22:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6faffb7baf
							
						
					 | 
					
						
						
							
							main title almost screen done
						
						
						
						
						
					 | 
					
						2022-01-09 00:10:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Thomas
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							b8c29cad9d
							
						
					 | 
					
						
						
							
							tmp commit
						
						
						
						
						
					 | 
					
						2022-01-08 14:38:46 +01:00 | 
					
					
						
						
							
							
							
						
					 |