| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72b4ac9229
					 | 
					
						
						
							
							TileMapComponent now takes a TMX to render tilemap
						
						
						
						
						
						
					 | 
					
						2022-03-24 23:34:17 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						dc43e59ff6
					 | 
					
						
						
							
							halsafar/libtmx-parser added to project
						
						
						
						
						
						
					 | 
					
						2022-03-21 15:26:13 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						66b8de6f40
					 | 
					
						
						
							
							Cleaned up UITextComponent and SpriteComponent
						
						
						
						
						
						
					 | 
					
						2022-02-06 20:12:12 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b5639e4f41
					 | 
					
						
						
							
							Basic WordWrap for UIText feature
						
						
						
						
						
						
					 | 
					
						2022-02-04 17:08:01 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						72a941810d
					 | 
					
						
						
							
							New UITextComponent implemented
						
						
						
						
						
						
					 | 
					
						2022-02-03 17:59:50 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						40095cb8b7
					 | 
					
						
						
							
							Minor tweaks for debug text
						
						
						
						
						
						
					 | 
					
						2022-01-02 14:05:52 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						af393e8acb
					 | 
					
						
						
							
							a,d keys implemented and screen for 1080p
						
						
						
						
						
						
					 | 
					
						2021-12-30 13:42:55 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b9e9c04235
					 | 
					
						
						
							
							UI tweaks for more layers and debug
						
						
						
						
						
						
					 | 
					
						2021-11-07 20:47:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						0cc31be0c7
					 | 
					
						
						
							
							Fixed Gravity to scale correctly with global scale
						
						
						
						
						
						
					 | 
					
						2021-11-05 21:54:18 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						bd0c49b3ae
					 | 
					
						
						
							
							Collider debug boxes with SDL_Rect
						
						
						
						
						
						
					 | 
					
						2021-11-03 17:37:56 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						165052a617
					 | 
					
						
						
							
							Worked on Colliders
						
						
						
						
						
						
					 | 
					
						2021-08-25 17:11:46 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						1e5beb5b88
					 | 
					
						
						
							
							ColliderComponent hidden prop
						
						
						
						
						
						
					 | 
					
						2021-08-16 17:36:21 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8713b76f83
					 | 
					
						
						
							
							added hidden property to Collider Component
						
						
						
						
						
						
					 | 
					
						2021-08-16 17:29:50 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						586a774cde
					 | 
					
						
						
							
							cleanup on aisle everywhere
						
						
						
						
						
						
					 | 
					
						2021-08-02 18:18:04 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fde99ef76b
					 | 
					
						
						
							
							added Nic's collision pseudocode
						
						
						
						
						
						
					 | 
					
						2021-08-02 17:46:06 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						363f28cb9c
					 | 
					
						
						
							
							Fixed UIText class for non-uniform scale
						
						
						
						
						
						
					 | 
					
						2021-07-29 08:21:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						31e16585d1
					 | 
					
						
						
							
							added a debug file with console output
						
						
						
						
						
						
					 | 
					
						2021-07-10 21:24:44 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						10e5be7a65
					 | 
					
						
						
							
							Working on Collisions
						
						
						
						
						
						
					 | 
					
						2021-07-10 21:23:45 -04:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						de99b127b1
					 | 
					
						
						
							
							Added error checking for config.json
						
						
						
						
						
						
					 | 
					
						2021-03-08 20:51:58 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fe13bac080
					 | 
					
						
						
							
							Fixed input bug (see SDL2 Engine Deck)
						
						
						
						
						
						
					 | 
					
						2021-02-18 14:20:11 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e4de32f9f7
					 | 
					
						
						
							
							Added FSM and Game State Manager
						
						
						
						
						
						
					 | 
					
						2021-02-15 21:10:18 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						78629be4d8
					 | 
					
						
						
							
							Fixed up collision boxes allowing custom colliders
						
						
						
						
						
						
					 | 
					
						2021-02-15 00:30:26 -05:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |