68 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
garrettmills	45aa8248fc	Clean up styling of top level component; add fleet labels (#3)	2020-09-12 13:33:33 -05:00
garrettmills	233f48628d	Add prompt to switch players to top-level component (#3)	2020-09-12 13:15:02 -05:00
garrettmills	6a08b5d3c8	Add player change prompt states and player display helpers to game service (#3)	2020-09-12 13:14:25 -05:00
garrettmills	531d11fee8	Fix committed merge errors; fetch placeable ships from service	2020-09-12 13:00:13 -05:00
Alec	c0a4bb93cd	the possible boats function	2020-09-11 17:02:25 -05:00
Alec	7f460b2324	Get possible boats to add #1}	2020-09-11 14:58:01 -05:00
garrettmills	5fdaf725d4	Add ability to place ships on grid (#3)	2020-09-10 08:17:48 -05:00
garrettmills	b6118e686d	Add ability to refresh view to game service (#3)	2020-09-10 08:16:52 -05:00
garrettmills	22e489b075	Add existence checks and fix bug with gameboard hover (#3)	2020-09-10 07:48:11 -05:00
garrettmills	c0bb45a078	Fix method call name in scoreboard (#4)	2020-09-10 07:47:37 -05:00
garrettmills	11c233e6af	Merge branch 'master' of github.com:EECS-448-Battleship/project-1	2020-09-10 07:44:57 -05:00
garrettmills	3275ebd5a4	Add hover preview for placing ships (#3)	2020-09-10 07:44:53 -05:00
Evan Powell	0ce2d51c52	added the object variables for score and progress and updated the 'update' function	2020-09-09 20:17:44 -05:00
garrettmills	8ee2a8252b	Modify helper methods for scoreboard on game state service (#4)	2020-09-09 20:02:15 -05:00
garrettmills	23b972b366	Add basic scoreboard file and add to top-level (#4)	2020-09-09 19:51:48 -05:00
garrettmills	1078c87f12	Add event passthrough (#3)	2020-09-09 19:44:09 -05:00
javier-barea	1a35bc7216	Align UI #3	2020-09-09 19:25:36 -05:00
javier-barea	2767cf5558	Merge	2020-09-09 18:47:19 -05:00
Alec	184ddf0aae	merge error	2020-09-09 18:42:53 -05:00
Alec	7f1bc00739	merge conflict #3	2020-09-09 18:38:51 -05:00
javier-barea	41bc0e89dc	Solve merge conflict	2020-09-09 18:32:27 -05:00
javier-barea	34a4f2f484	Merge branch 'master' of https://github.com/EECS-448-Battleship/project-1	2020-09-09 18:29:49 -05:00
javier-barea	70df967246	Add definition for ship options #1	2020-09-09 18:29:25 -05:00
Alec	637dd4892b	edited ship buttons and the board #3	2020-09-09 18:26:43 -05:00
Alec	50c3db868f	edited ship buttons and board #3	2020-09-09 18:25:18 -05:00
javier-barea	19aa3733d0	Add definition for ship options #1	2020-09-09 18:24:54 -05:00
javier-barea	5a6367079a	Define user instructions #3	2020-09-09 18:04:19 -05:00
Alec	c58b4b19a6	Add buttons for # of ships #1	2020-09-09 18:02:57 -05:00
garrettmills	1ea296e710	Fix bug with game state service get_winner (#3) ... Needed to properly fetch the cell state, not just coordinates	2020-09-09 11:50:57 -05:00
garrettmills	eaef36ad61	Add top-level component to show/hide the boards for the current player (#3)	2020-09-09 11:34:46 -05:00
garrettmills	b5a903d599	Modify game board component to accept passed-in rows (#3)	2020-09-09 11:34:13 -05:00
garrettmills	4075f282a2	Game state service bugfixes (#3) ... - Add appropriate "else if" clauses to advance game state - Add ability to listen for game state changes - Don't have winner if no ships are present - Reset "current_turn_had_missile_attempt" to false every state change	2020-09-09 11:32:44 -05:00
garrettmills	7c364c5c01	Revise styles for game board column labels (#1) ... - Just a few tweaks here. The general principle is good. - If you want <div> elements to display horizontally, they need to be wrapped in a parent <div> which has "display: flex;" in the css. - Then, add a width and centering to the individual labels.	2020-09-09 11:23:50 -05:00
javier-barea	bd44b25faa	Merge branch 'master' of https://github.com/EECS-448-Battleship/project-1	2020-09-08 21:45:15 -05:00
javier-barea	2fe5accb32	Commented letter labels to grid #1	2020-09-08 21:44:25 -05:00
garrettmills	e9cbd8cf09	Add helper to get the current game state (#3)	2020-09-08 21:10:55 -05:00
garrettmills	bb8592cbb0	Add ability to listen for game state changes (#3)	2020-09-08 20:58:35 -05:00
Evan Powell	152f1fa776	added the logic for the gamestate if a player has won (#2)	2020-09-08 20:42:07 -05:00
Evan Powell	ce030c346e	added the logic for ensuring the player had fired a missle and the flow of the game in terms of the players' turns (#2)	2020-09-08 20:35:06 -05:00
garrettmills	fda50ad037	Merge branch 'master' of github.com:EECS-448-Battleship/project-1	2020-09-08 20:23:57 -05:00
garrettmills	d29b448484	Add helper methods for checking for victory (#2)	2020-09-08 20:23:49 -05:00
Evan Powell	960203b597	added the logic of handling player one's turn then switching to player two's turn (#2)	2020-09-08 20:16:43 -05:00
garrettmills	fc84c4f415	Merge branch 'issue-2'	2020-09-08 19:27:35 -05:00
garrettmills	aaadd82d31	Add helper methods to game service for firing on opponent (#2)	2020-09-08 07:39:09 -05:00
garrettmills	a4f13f0d17	Add util method for checking if cell can be fired upon (#2)	2020-09-08 07:38:24 -05:00
garrettmills	99759bad09	Add custom error class for invalid missile fire (#2)	2020-09-08 07:38:03 -05:00
javier-barea	01360e548e	Deleted comments	2020-09-08 00:47:47 -05:00
javier-barea	463a8f6d30	Add label to rows (#2)	2020-09-07 21:06:06 -05:00
garrettmills	9a2afe523e	add helper method to handle placing and validating a ship (#2)	2020-09-07 21:05:48 -05:00
garrettmills	a803c6937d	Add custom error classes for state and placement (#2)	2020-09-07 21:04:28 -05:00