MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						979172f0e2
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:51:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						ad5bb7542a
					 | 
					
						
						
							
							sons
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:51:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						c3c13089c1
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:49:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						19b5075a3a
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:49:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						4412d5bbd8
					 | 
					
						
						
							
							Chatter
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:45:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						19847bd56c
					 | 
					
						
						
							
							some environnement and water stuff
						
						
						
						
						
						
					 | 
					
						2023-06-11 10:44:54 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						d83ea3c6fc
					 | 
					
						
						
							
							?
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:51:41 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						85f79ab5f2
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:49:01 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						7db945eb07
					 | 
					
						
						
							
							music
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:47:15 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						5614495e12
					 | 
					
						
						
							
							water texture
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:46:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						e59fb05a96
					 | 
					
						
						
							
							monke
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:38:52 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						fd0294f8ae
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:38:48 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						e7d5747a7c
					 | 
					
						
						
							
							Kinda can put buildings
						
						
						
						
						
						
					 | 
					
						2023-06-11 09:10:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						82a2d84dc7
					 | 
					
						
						
							
							pray
						
						
						
						
						
						
					 | 
					
						2023-06-10 19:44:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						0bb76b9893
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 18:41:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						69393115af
					 | 
					
						
						
							
							esfsfs
						
						
						
						
						
						
					 | 
					
						2023-06-10 18:41:49 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						eaee26025c
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 18:36:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						fb1d8ea190
					 | 
					
						
						
							
							basic factory and capitol scenes
						
						
						
						
						
						
					 | 
					
						2023-06-10 18:36:39 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						9749b1ca22
					 | 
					
						
						
							
							Update player.cs
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:18:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						a11b661a01
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:18:28 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						8f177ffa0e
					 | 
					
						
						
							
							Les fleches c'est pour les noobs.
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:18:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						b5201b3c16
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:14:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						3f3e39a40f
					 | 
					
						
						
							
							basic building structures
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:14:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						25fe5ee634
					 | 
					
						
						
							
							Danger mouse
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:10:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						b982ffb7c4
					 | 
					
						
						
							
							No more KSP
						
						
						
						
						
						
					 | 
					
						2023-06-10 17:00:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						100bac9f97
					 | 
					
						
						
							
							Movin'
						
						
						
						
						
						
					 | 
					
						2023-06-10 16:53:33 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						cbe4523af4
					 | 
					
						
						
							
							Text => Line
						
						
						
						
						
						
					 | 
					
						2023-06-10 15:08:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						73dc6d5c1e
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 15:02:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						99475b822d
					 | 
					
						
						
							
							Netwoorkin is woorkin
						
						
						
						
						
						
					 | 
					
						2023-06-10 15:02:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						e028b544c5
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 15:01:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						e3fd33dc90
					 | 
					
						
						
							
							added collision to tileset/gridmap
						
						
						
						
						
						
					 | 
					
						2023-06-10 15:01:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						0c6838e710
					 | 
					
						
						
							
							Update start_game_menu.cs
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:49:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						f86013b117
					 | 
					
						
						
							
							Update start_game_menu.cs
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:40:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						754ad355e6
					 | 
					
						
						
							
							cleanup
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:38:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						0137bbfd31
					 | 
					
						
						
							
							Neutvoorking Mennu
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:38:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						59eca4500c
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:25:47 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						213d22d925
					 | 
					
						
						
							
							Netvoork
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:25:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						69a1132362
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:15:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						1ba0dfb1a2
					 | 
					
						
						
							
							tileset in godot and island tests
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:15:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						d7328fe437
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:01:35 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						00a5104758
					 | 
					
						
						
							
							MENNU!
						
						
						
						
						
						
					 | 
					
						2023-06-10 14:01:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						114e7d8ceb
					 | 
					
						
						
							
							tileset blender
						
						
						
						
						
						
					 | 
					
						2023-06-10 13:21:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						915ee415fe
					 | 
					
						
						
							
							texture organisation
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:31:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						ad156a0f5c
					 | 
					
						
						
							
							normal maps
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:30:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						e702784f63
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/MarcEricMartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:23:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Victor Turgeon
							
						 
					 | 
					
						
						
							
						
						68c5a2aeec
					 | 
					
						
						
							
							some more sources and textures
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:23:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						48b08c26c2
					 | 
					
						
						
							
							Menu stuff
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:13:57 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						69ad100698
					 | 
					
						
						
							
							Merge branch 'main' of https://github.com/marcericmartel/MAD
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:05:30 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						c395acd829
					 | 
					
						
						
							
							Update .gitignore
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:05:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcEricMartel
							
						 
					 | 
					
						
						
							
						
						e0dc6f75f0
					 | 
					
						
						
							
							mennu
						
						
						
						
						
						
					 | 
					
						2023-06-10 12:04:03 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |