ac03ea0
								
								  (HEAD -> master)
								Merge pull request #7 from jrtechs/TryingToMakeThisALittleBetter by
								
								2019-10-16 13:32:45 -0400
							
						
									e9ca94a
								
								  (refs/pull/7/head, TryingToMakeThisALittleBetter)
								Rearranged case statments and moved assets to its own file by
								
								2019-10-16 12:46:26 -0400
							
						
									538ec64
								
								 
								Merge pull request #6 from 17mgeffert/master by
								
								2018-10-13 22:38:11 -0400
							
						
									44622d1
								
								  (refs/pull/6/head)
								Everytime i open this up i find more formatting issues with the code alone, i feel like 12th grade us's had no idea how to code. by
								
								2018-10-13 22:37:18 -0400
							
						
									28a2270
								
								 
								Merge pull request #2 from 17mgeffert/17mgeffert-patch-1 by
								
								2018-10-12 14:05:13 -0400
							
						
									471067b
								
								 
								Create README.md by
								
								2018-10-12 14:04:47 -0400
							
						
									3a518c5
								
								 
								Merge pull request #5 from 17mgeffert/master by
								
								2018-10-09 12:42:50 -0400
							
						
									64d4e83
								
								  (refs/pull/5/head)
								Had to do some format changes becacuse the ammount of empty space drove me crazy. Also changed useless code and fixed a bug where you could shoot when the game hadnt started yet. by
								
								2018-10-09 12:38:22 -0400
							
						
									686f69b
								
								 
								Merge pull request #3 from 17mgeffert/master by
								
								2018-10-04 16:37:56 -0400
							
						
									ad1ea29
								
								  (refs/pull/3/head)
								Made some format changes, stepping stone to greater improvment. by
								
								2018-10-04 16:35:54 -0400
							
						
									4e223fb
								
								 
								Merge pull request #2 from 17mgeffert/master by
								
								2018-10-04 15:43:50 -0400
							
						
									1bd91b5
								
								  (refs/pull/2/head)
								properly formatted comments by
								
								2017-10-27 20:05:40 -0400
							
						
									bdf4d81
								
								 
								Merge pull request #1 from 17mgeffert/master by
								
								2017-10-27 19:49:13 -0400
							
						
									757aa46
								
								  (refs/pull/1/head)
								dank by
								
								2017-10-27 19:40:46 -0400
							
						
									50fd151
								
								 
								game mode edits by
								
								2016-06-09 09:08:24 -0400
							
						
									0a317e7
								
								 
								Added wave functionality to the game by
								
								2016-06-09 08:39:30 -0400
							
						
									c2e6bd6
								
								 
								added fields and methods to player classs by
								
								2016-06-06 10:19:31 -0400
							
						
									d0fa37d
								
								 
								enemy spawn update by
								
								2016-06-05 21:17:19 -0400
							
						
									95ae6c0
								
								 
								finished enemy tank constructor by
								
								2016-06-03 09:22:46 -0400
							
						
									89a8e30
								
								 
								Added a pausing function to the game. Use ESC to pause. by
								
								2016-06-03 09:19:22 -0400
							
						
									9a94920
								
								 
								added enemy turret images by
								
								2016-06-02 21:30:24 -0400
							
						
									b7f6c9c
								
								 
								added turret images boolean movement for player turret by
								
								2016-06-02 21:26:05 -0400
							
						
									0fd0520
								
								 
								Added functioning strings to the bottom of the screen, and added an end to the game when the player dies. by
								
								2016-06-02 12:27:32 -0400
							
						
									39e4f42
								
								 
								created enemy tank class with constructor and move method by
								
								2016-06-02 09:20:15 -0400
							
						
									28193b8
								
								 
								added fields and methods to player class/turret class by
								
								2016-06-02 09:18:12 -0400
							
						
									69e593c
								
								 
								added wave, zombie image update shape creation code by
								
								2016-05-31 19:31:39 -0400
							
						
									593159c
								
								 
								added timer to wave class plus mutator for gameMode field by
								
								2016-05-31 10:31:58 -0400
							
						
									2c5c2d3
								
								 
								Added a black box to the bottom of the game, and added gamemode changing. by
								
								2016-05-31 10:29:31 -0400
							
						
									3abe3a3
								
								 
								added fields and methods to player class by
								
								2016-05-31 10:23:03 -0400
							
						
									676d7f7
								
								 
								added timer to wave class plus mutator for gameMode field by
								
								2016-05-31 10:06:50 -0400
							
						
									ac60cfc
								
								 
								main class fixes added image files fixed class constructors by
								
								2016-05-26 22:12:44 -0400
							
						
									0dcd6c6
								
								 
								main class fixes added wave field by
								
								2016-05-26 21:15:07 -0400
							
						
									b4679f0
								
								 
								Created wave class by
								
								2016-05-26 09:24:02 -0400
							
						
									b139b1c
								
								 
								added fields and methods to JFrame class by
								
								2016-05-26 09:19:46 -0400
							
						
									af24e3a
								
								 
								Added JPanel instantiation and Timers by
								
								2016-05-26 09:15:42 -0400
							
						
									155884b
								
								 
								Added an abstract move method to Enemy Class by
								
								2016-05-26 09:08:57 -0400
							
						
									a8e98d9
								
								 
								added fields and methods to player class by
								
								2016-05-26 08:59:50 -0400
							
						
									bc08fdb
								
								 
								Added collisions to the Bullet Class by
								
								2016-05-26 08:34:10 -0400
							
						
									7dea12e
								
								 
								added constructor to zombie class by
								
								2016-05-25 09:26:46 -0400
							
						
									c8dfa0d
								
								 
								added move method to zombie class by
								
								2016-05-25 09:16:39 -0400
							
						
									594213d
								
								 
								added fields and methods to player class by
								
								2016-05-25 08:58:47 -0400
							
						
									cf0d91e
								
								 
								5/24/16  Tanks pull, committ, push Test by
								
								2016-05-24 08:26:21 -0400
							
						
									34ab1bc
								
								 
								Tank class update Bullet class updated to include width, height field added for enemy by
								
								2016-05-23 21:06:55 -0400
							
						
									a2eb85e
								
								 
								enemy class update by
								
								2016-05-23 18:41:48 -0400
							
						
									92276df
								
								 
								Created Bullet Class by
								
								2016-05-23 10:32:06 -0400
							
						
									45ebcbe
								
								 
								created enemy class by
								
								2016-05-23 10:29:50 -0400
							
						
									fe85eba
								
								 
								just doing a test by
								
								2016-05-23 10:27:13 -0400
							
						
									08528ed
								
								 
								class declarations by
								
								2016-05-22 19:23:35 -0400
							
						
									9c90c7c
								
								 
								creation of the Enemy class by
								
								2016-05-22 18:24:31 -0400
							
						
									1e7e695
								
								 
								creation of the living class by
								
								2016-05-22 18:22:13 -0400
							
						
									516b20d
								
								 
								creation of the Rotational Element class by
								
								2016-05-21 17:38:58 -0400
							
						
									3d2f0d6
								
								 
								creation of the game Element class by
								
								2016-05-21 16:46:50 -0400
							
						
									6a68387
								
								 
								creation of the drawable Element class by
								
								2016-05-21 16:42:23 -0400
							
						
									0122838
								
								 
								just doing a test by
								
								2016-05-20 09:34:48 -0400
							
						
									353e868
								
								 
								added fields by
								
								2016-05-20 09:30:25 -0400
							
						
									48a8a77
								
								 
								Merge origin/master by
								
								2016-05-20 09:28:43 -0400
							
						
									77e1082
								
								 
								Merge origin/master by
								
								2016-05-20 09:27:40 -0400
							
						
									1213b88
								
								 
								Merge origin/master by
								
								2016-05-20 10:26:21 -0300
							
						
									aa0822e
								
								 
								this is from mike by
								
								2016-05-20 09:25:43 -0400
							
						
									cf63d8a
								
								 
								test by
								
								2016-05-20 10:25:07 -0300
							
						
									106dfdd
								
								 
								 by
								
								2016-05-20 09:24:19 -0400
							
						
									e670f3f
								
								 
								just doing a test by
								
								2016-05-20 09:24:06 -0400
							
						
									88e600a
								
								 
								this is a test push by
								
								2016-05-20 09:22:16 -0400
							
						
									01ca48f
								
								 
								comment by
								
								2016-05-19 18:36:48 -0400
							
						
									1feaa5b
								
								 
								static main method by
								
								2016-05-19 18:25:56 -0400
							
						
									0afbe96
								
								 
								static main method by
								
								2016-05-19 18:25:56 -0400
							
						
									c1214d3
								
								 
								comment by
								
								2016-05-19 17:35:53 -0400
							
						
									5dd88e4
								
								 
								comment by
								
								2016-05-19 17:30:00 -0400
							
						
									fba9757
								
								 
								comment by
								
								2016-05-19 17:26:33 -0400
							
						
									572abb3
								
								 
								comment by
								
								2016-05-19 17:12:23 -0400
							
						
									05beb19
								
								 
								java project properties changed required JDK by
								
								2016-05-19 17:16:12 -0400
							
						
									a2f6190
								
								 
								comment by
								
								2016-05-19 17:10:55 -0400
							
						
									62bacb3
								
								 
								added class declarations by
								
								2016-05-19 16:39:43 -0400
							
						
									52c138a
								
								 
								initial project file creation with git hub by
								
								2016-05-19 16:19:22 -0400