b8d0e008d1 
					 
					
						
						
							
							Debug: Change script location, and make helptext for sh/script more clear. Last addition, I swear.  
						
						
						
						
					 
					
						2021-11-14 07:36:30 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dae4c56a2b 
					 
					
						
						
							
							Refactor ship extents logic  
						
						
						
						
					 
					
						2021-11-14 07:14:35 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ecbf14c998 
					 
					
						
						
							
							Finish scripting implementation  
						
						
						
						
					 
					
						2021-11-14 07:13:53 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5a72c4fded 
					 
					
						
						
							
							Debug: add loading and running scripts\ Ship: Validate alternate implementation of getExtents()  
						
						
						
						
					 
					
						2021-11-14 06:32:46 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						6fa1319ec4 
					 
					
						
						
							
							Added partial texture function for ship  
						
						
						
						
					 
					
						2021-11-14 03:15:27 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						de9684d22f 
					 
					
						
						
							
							Added Dark and Light Themes  
						
						
						
						
					 
					
						2021-11-14 02:50:39 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4639bb355c 
					 
					
						
						
							
							Make ships real  
						
						
						
						
					 
					
						2021-11-14 02:12:31 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						50f087061e 
					 
					
						
						
							
							Added getExtent() function for ships  
						
						
						
						
					 
					
						2021-11-14 01:21:40 -06:00 
						 
				 
			
				
					
						
							
							
								Chance Atkinson 
							
						 
					 
					
						
						
							
						
						d52234d63c 
					 
					
						
						
							
							Added my win button back :)  
						
						... 
						
						
						
						wooooooo win butttoooonnnn 
						
						
					 
					
						2021-11-14 00:43:32 -06:00 
						 
				 
			
				
					
						
							
							
								Chance Atkinson 
							
						 
					 
					
						
						
							
						
						80d3313516 
					 
					
						
						
							
							Merge branch 'game-logic' of  https://github.com/StatewideInk/Group12  into game-logic  
						
						
						
						
					 
					
						2021-11-14 00:39:02 -06:00 
						 
				 
			
				
					
						
							
							
								Chance Atkinson 
							
						 
					 
					
						
						
							
						
						b69cc01be2 
					 
					
						
						
							
							Added victory screen  
						
						... 
						
						
						
						Added a victory screen. Since there is no current way to win, there is a 'win' button added to the top left of the game screen. Once clicked, victory text will appear and the player will be given the option to return to the main menu. 
						
						
					 
					
						2021-11-14 00:34:51 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						b17c82e632 
					 
					
						
						
							
							Merge branch 'game-logic' of  https://github.com/StatewideInk/Group12  into game-logic  
						
						
						
						
					 
					
						2021-11-14 00:30:28 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						223f36ffdd 
					 
					
						
						
							
							Sounds no longer scale linearly  
						
						
						
						
					 
					
						2021-11-14 00:30:18 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						c53ce61b53 
					 
					
						
						
							
							Added Confirmation dialog for Forfeit  
						
						
						
						
					 
					
						2021-11-14 00:08:16 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d99419901f 
					 
					
						
						
							
							Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic  
						
						
						
						
					 
					
						2021-11-13 23:58:47 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						31e00eb7f4 
					 
					
						
						
							
							Load the theme on startup  
						
						
						
						
					 
					
						2021-11-13 23:58:41 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						e0850366d2 
					 
					
						
						
							
							Merge branch 'game-logic' of  https://github.com/StatewideInk/Group12  into game-logic  
						
						
						
						
					 
					
						2021-11-13 23:56:10 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						51e230117a 
					 
					
						
						
							
							Added signal for audio SFX  
						
						
						
						
					 
					
						2021-11-13 23:55:46 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						bd5d350e96 
					 
					
						
						
							
							Added dark/light mode functionality  
						
						
						
						
					 
					
						2021-11-13 23:51:36 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0cb75b37b0 
					 
					
						
						
							
							Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic  
						
						
						
						
					 
					
						2021-11-13 23:36:45 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						34d0b1bf0d 
					 
					
						
						
							
							Fix title screen never going (whoops  
						
						
						
						
					 
					
						2021-11-13 23:36:39 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						63dec75688 
					 
					
						
						
							
							Added Confirmation Dialog for Forfeit  
						
						
						
						
					 
					
						2021-11-13 23:32:19 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d58ffa91e5 
					 
					
						
						
							
							Merge  
						
						
						
						
					 
					
						2021-11-13 23:10:47 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4cc4cd8f89 
					 
					
						
						
							
							Fix null deref when entering singleplayer after exiting multiplayer  
						
						
						
						
					 
					
						2021-11-13 23:07:19 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						c3a2de2795 
					 
					
						
						
							
							Created Sprite for Light Mode  
						
						
						
						
					 
					
						2021-11-13 23:06:13 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8232bec5d0 
					 
					
						
						
							
							Consolidate backgrounds  
						
						
						
						
					 
					
						2021-11-13 22:46:24 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2f5a2cd47f 
					 
					
						
						
							
							Comment on which parts of Game are only there for testing purposes.  
						
						
						
						
					 
					
						2021-11-13 05:08:53 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1a031ac9d2 
					 
					
						
						
							
							Setup: remove unused signal  
						
						
						
						
					 
					
						2021-11-13 04:46:28 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1cb400361d 
					 
					
						
						
							
							Major restructuring to better support object-oriented design of the main game logic and UI. This was necessary, I swear.  
						
						
						
						
					 
					
						2021-11-13 04:34:39 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						b0995cbd0d 
					 
					
						
						
							
							Fixed blurry pixel art  
						
						... 
						
						
						
						Changed texture rendering 
						
						
					 
					
						2021-11-13 02:09:41 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						421c2af83c 
					 
					
						
						
							
							Crosshair now snaps into place  
						
						
						
						
					 
					
						2021-11-12 18:07:37 -06:00 
						 
				 
			
				
					
						
							
							
								hpham474 
							
						 
					 
					
						
						
							
						
						c87a1d031c 
					 
					
						
						
							
							Partial fire functionality added.  
						
						... 
						
						
						
						Currently hides all ship placement UI and makes visible all fire functionality. The crosshair currently does not snap to a grid. The ships are saved in an area of location objects holding the length, orientation, and coordinates of the ship. 
						
						
					 
					
						2021-11-12 07:08:01 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						a47cb991f2 
					 
					
						
						
							
							Fixed Dialog Box that pops up for Confirm Placement  
						
						
						
						
					 
					
						2021-11-12 03:44:52 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9a3061c16e 
					 
					
						
						
							
							Improve hitbox leniency, and don't allow ships to rotate into each other.  
						
						
						
						
					 
					
						2021-11-12 03:33:31 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						304389138f 
					 
					
						
						
							
							I accidentally the buttons + Fix some hitbox mistakes.  
						
						
						
						
					 
					
						2021-11-12 03:01:23 -06:00 
						 
				 
			
				
					
						
							
							
								JohnBreaux 
							
						 
					 
					
						
						
							
						
						c558578e2e 
					 
					
						
						
							
							Merge branch 'main' into game-logic  
						
						
						
						
					 
					
						2021-11-12 02:10:34 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						f40bf520d4 
					 
					
						
						
							
							Collision is good  
						
						
						
						
					 
					
						2021-11-12 01:57:15 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1403f7eccb 
					 
					
						
						
							
							Pass  
						
						
						
						
					 
					
						2021-11-11 20:55:19 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						96b5695b12 
					 
					
						
						
							
							Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic  
						
						
						
						
					 
					
						2021-11-11 20:45:56 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						fae2631637 
					 
					
						
						
							
							Fix up some stuff  
						
						
						
						
					 
					
						2021-11-11 20:45:38 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						7d85195dd1 
					 
					
						
						
							
							Added Clear board button and Confirm Placement button  
						
						
						
						
					 
					
						2021-11-11 20:43:09 -06:00 
						 
				 
			
				
					
						
							
							
								Chance Atkinson 
							
						 
					 
					
						
						
							
						
						9ecf401efa 
					 
					
						
						
							
							Collision is bad  
						
						... 
						
						
						
						Tried working on the collision when placing ships, they are cramming when held on top of each other and are not returning to starting position when they are supposed to. 
						
						
					 
					
						2021-11-11 20:36:58 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						a8f96eed9d 
					 
					
						
						
							
							Comment game logic code, and edit for style.  
						
						
						
						
					 
					
						2021-11-11 15:38:50 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8e9a15b6dd 
					 
					
						
						
							
							Merge branch 'main' into game-logic  
						
						... 
						
						
						
						Fixed critical UAF in debug menu which lead to crash. 
						
						
					 
					
						2021-11-11 15:10:28 -06:00 
						 
				 
			
				
					
						
							
							
								tommy-l-ngo 
							
						 
					 
					
						
						
							
						
						f9592f425e 
					 
					
						
						
							
							Commented my code  
						
						... 
						
						
						
						Deals with ship placement on board and ship rotation on board 
						
						
					 
					
						2021-11-11 15:08:14 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3ef450a80a 
					 
					
						
						
							
							Fix fatal use-after-free in debug menu.  
						
						
						
						
					 
					
						2021-11-11 15:08:09 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						eaa1617b9a 
					 
					
						
						
							
							Pushing what I've done of the game logic.  
						
						
						
						
					 
					
						2021-11-11 14:38:10 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						8c4457a883 
					 
					
						
						
							
							Create game classes  
						
						
						
						
					 
					
						2021-11-09 18:28:25 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d833d98502 
					 
					
						
						
							
							Debug: Improve listing properties somewhat  
						
						
						
						
					 
					
						2021-11-08 13:43:11 -06:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						4c66fd7a90 
					 
					
						
						
							
							Improve flags slightly  
						
						
						
						
					 
					
						2021-11-08 13:41:55 -06:00