| 
						
					 | 
					
						
						
							
						
						ff1863182e
					 | 
					
						
						
							
							Merge Conflicts Resolved
						
						
						
						
						
						
					 | 
					
						2023-08-12 15:02:40 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1cbc8cbbc0
					 | 
					
						
						
							
							All asset paths corrected to use Boost::FS
						
						
						
						
						
						
					 | 
					
						2023-08-12 14:44:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f449eda43f
					 | 
					
						
						
							
							Some paths to assets fixed with Boost::FS
						
						
						
						
						
						
					 | 
					
						2023-08-12 13:52:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a0c06ebe6a
					 | 
					
						
						
							
							Initial build on macOS
						
						
						
						
						
						
					 | 
					
						2023-08-12 08:50:32 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bab3487115
					 | 
					
						
						
							
							Cleaned up old assets
						
						
						
						
						
						
					 | 
					
						2023-08-07 17:33:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2861296840
					 | 
					
						
						
							
							updated kaijuturtle .png and .json
						
						
						
						
						
						
					 | 
					
						2023-08-07 21:18:43 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3ad0265dbd
					 | 
					
						
						
							
							updates to spritecomp and keyboard ctrlr
						
						
						
						
						
						
					 | 
					
						2023-08-07 17:14:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						838426ead3
					 | 
					
						
						
							
							removed old Kaiju-Turtle.png
						
						
						
						
						
						
					 | 
					
						2023-08-07 16:43:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bcdd633d53
					 | 
					
						
						
							
							Merge branch 'main' of https://lab.oakcityit.net/gitea/Zeronaut/KaijuSaveEarth
						
						
						
						
						
						
					 | 
					
						2023-08-07 16:41:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2ba9b016eb
					 | 
					
						
						
							
							Random updates to game.cpp
						
						
						
						
						
						
					 | 
					
						2023-08-07 16:36:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						654142ae80
					 | 
					
						
						
							
							Uploaded new Kaiju spritesheet
						
						
						
						
						
						
					 | 
					
						2023-08-07 20:33:01 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						936b6806eb
					 | 
					
						
						
							
							Added sanity checks to tiles
						
						
						
						
						
						
					 | 
					
						2023-08-05 18:08:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b2ed8e27b
					 | 
					
						
						
							
							New tileset & map; todo fix tile sanity check
						
						
						
						
						
						
					 | 
					
						2023-08-04 22:05:07 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6568026886
					 | 
					
						
						
							
							refactored Text, box UI and reconfigured config.json
						
						
						
						
						
						
					 | 
					
						2023-08-04 14:34:43 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4c2049a1e0
					 | 
					
						
						
							
							Tiled map and tileset added
						
						
						
						
						
						
					 | 
					
						2023-08-02 14:27:59 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						369ad6f83e
					 | 
					
						
						
							
							Texture assets added
						
						
						
						
						
						
					 | 
					
						2023-08-02 14:06:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3cc810e6d
					 | 
					
						
						
							
							Upload files to 'assets/textures/ui'
						
						
						
						
						
						
						
						Added UI Text Bubble image 
						
						
					 | 
					
						2023-08-01 21:35:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						3dd491f5a6
					 | 
					
						
						
							
							Upload files to 'assets/textures/ui'
						
						
						
						
						
						
						
						Added LoRez5Font.png a 5x5 px font 
						
						
					 | 
					
						2023-08-01 21:14:12 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9d61bcf621
					 | 
					
						
						
							
							Clean up various files
						
						
						
						
						
						
					 | 
					
						2023-08-01 16:58:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d51cd1d65c
					 | 
					
						
						
							
							Merging in engine files
						
						
						
						
						
						
					 | 
					
						2023-08-01 16:46:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						15c0ff5856
					 | 
					
						
						
							
							Pulling in engine files
						
						
						
						
						
						
					 | 
					
						2023-08-01 16:34:22 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7cf5dfd83f
					 | 
					
						
						
							
							Initial commit
						
						
						
						
						
						
					 | 
					
						2023-08-01 20:12:55 +00:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f14960d5ab
					 | 
					
						
						
							
							Merging Tileson to Master
						
						
						
						
						
						
					 | 
					
						2023-07-26 16:34:53 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4b1a80ec40
					 | 
					
						
						
							
							Cleaned up Tileson and TilemapComponent
						
						
						
						
						
						
					 | 
					
						2023-07-26 15:47:36 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1a0bd2ea4e
					 | 
					
						
						
							
							Tileson fully refactored into engine
						
						
						
						
						
						
					 | 
					
						2023-07-26 15:13:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b4b83f098d
					 | 
					
						
						
							
							TileSet Parsing and Setup Refactored
						
						
						
						
						
						
					 | 
					
						2023-07-25 16:48:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b15316c40e
					 | 
					
						
						
							
							More work on Tileson integration
						
						
						
						
						
						
					 | 
					
						2023-07-24 13:41:02 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bbab18d361
					 | 
					
						
						
							
							Tileson working with tsj tileset
						
						
						
						
						
						
					 | 
					
						2023-07-21 00:08:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a3d13f32a5
					 | 
					
						
						
							
							cleaned up gitignore and build artifacts
						
						
						
						
						
						
					 | 
					
						2023-07-20 13:47:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9432b68efe
					 | 
					
						
						
							
							added tileson still debugging
						
						
						
						
						
						
					 | 
					
						2023-07-20 12:31:37 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						352034790c
					 | 
					
						
						
							
							integrating tileson with the project for tmx parsing
						
						
						
						
						
						
					 | 
					
						2023-07-19 17:10:10 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8aa79741e4
					 | 
					
						
						
							
							Cleanup on aisle everywhere
						
						
						
						
						
						
					 | 
					
						2023-07-19 13:16:14 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8d6fe8556c
					 | 
					
						
						
							
							Kdevelop included, libtmxparser excluded
						
						
						
						
						
						
					 | 
					
						2023-07-15 18:05:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4c270a81d
					 | 
					
						
						
							
							Kdevelop included, libtmxparser excluded
						
						
						
						
						
						
					 | 
					
						2023-07-15 18:05:24 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd17014eef
					 | 
					
						
						
							
							SDL libs back to dynamic, libtmxparser fixed
						
						
						
						
						
						
					 | 
					
						2023-07-15 18:05:23 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						391fcedc37
					 | 
					
						
						
							
							libSDL2 static build and link
						
						
						
						
						
						
					 | 
					
						2022-09-30 16:09:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1dec4347e0
					 | 
					
						
						
							
							Built SDL2_image and _mixer static
						
						
						
						
						
						
					 | 
					
						2022-09-30 15:49:16 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e2605bf6c1
					 | 
					
						
						
							
							Changed to static libraries for libTmxParser
						
						
						
						
						
						
					 | 
					
						2022-07-18 18:09:09 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						21c30b7f52
					 | 
					
						
						
							
							Before changing to static libraries
						
						
						
						
						
						
					 | 
					
						2022-07-04 09:42:42 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						70402c5382
					 | 
					
						
						
							
							udpated SDL_GetTicks() to SDL_GetTicks64()
						
						
						
						
						
						
					 | 
					
						2022-05-30 14:02:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4aa7fe1692
					 | 
					
						
						
							
							predictCollisions working in debug mode
						
						
						
						
						
						
					 | 
					
						2022-05-14 17:52:05 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						36adcdeac7
					 | 
					
						
						
							
							predictCollisions func added to Game.cpp
						
						
						
						
						
						
					 | 
					
						2022-05-13 23:20:08 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e28a9cebdb
					 | 
					
						
						
							
							TileMap Debug Colliders Drawing
						
						
						
						
						
						
					 | 
					
						2022-05-01 17:35:58 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b94c2cff38
					 | 
					
						
						
							
							Debug menu scale fixed, Player Tile Position
						
						
						
						
						
						
					 | 
					
						2022-05-01 15:38:55 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fb20b8d868
					 | 
					
						
						
							
							Camera and Tilemaps fixed at 1x res
						
						
						
						
						
						
					 | 
					
						2022-05-01 11:00:51 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f4007bb79
					 | 
					
						
						
							
							TileMaps and camera tuning
						
						
						
						
						
						
					 | 
					
						2022-04-29 21:31:34 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bc4262d552
					 | 
					
						
						
							
							Continued work on tilemaps/debug
						
						
						
						
						
						
					 | 
					
						2022-04-08 18:19:27 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2331110c71
					 | 
					
						
						
							
							TileMaps and cam debug added
						
						
						
						
						
						
					 | 
					
						2022-04-07 23:20:19 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c8aae59f26
					 | 
					
						
						
							
							TileMaps now render and move with camera
						
						
						
						
						
						
					 | 
					
						2022-04-04 18:16:20 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						871e6d19c6
					 | 
					
						
						
							
							TileMaps now render each row correctly
						
						
						
						
						
						
					 | 
					
						2022-03-27 23:59:12 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |