1
0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Commit Graph

86 Commits

Author SHA1 Message Date
ff45799305 All: General code cleanup 2021-11-28 02:26:00 -06:00
754ad2986b Game: Hide the 'Buttons' 2021-11-25 13:16:41 -06:00
af9b18243e Ship Battle: Draw the rest of the freaking owl 2021-11-24 12:17:07 -06:00
3f4b42821b Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-24 03:08:48 -06:00
6ff4df4a1d Game: Begin state machine implementation; use Net-mail for host<->guest communication. 2021-11-24 03:05:45 -06:00
1116316176 Player: Yield on signal returns the parameters of that signal. Refactor around this fact. 2021-11-24 03:00:27 -06:00
66cac5247f Board: Return LOST state when hit and no ships remain. 2021-11-24 02:53:05 -06:00
Chance Atkinson
1c06faf017 Hit/Miss sprites rendered
Added texture function to Fire.gd to load the correct sprites for a hit/miss and make it so that the player cannot fire on positions that they have already fired at.
2021-11-24 00:10:58 -06:00
12816a2caa Multiplayer: Add Lobby 2021-11-23 22:44:53 -06:00
5ed44e6deb Multiplayer: Implement message passing system 2021-11-22 22:04:21 -06:00
bc1e31ac8c At least it doesn't crash now, as long as 2 peers are connected. 2021-11-18 09:50:17 -06:00
919576638c Multiplayer sucks 2021-11-18 09:00:15 -06:00
72ac64f6d0 Game: Implement player setup 2021-11-15 01:17:32 -06:00
36cc6896b1 Game: Move debug logic out of Game 2021-11-14 23:50:23 -06:00
hpham474
518e8fa5c4 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 22:47:08 -06:00
hpham474
8e4600eede Added player class functionality 2021-11-14 22:47:01 -06:00
aed672fdd4 Setup: Add variant to ShipData. 2021-11-14 22:46:21 -06:00
hpham474
83f319b76c Partial implementation of the player class 2021-11-14 20:12:01 -06:00
4730bf7733 Board: Start initial implementation. 2021-11-14 14:06:09 -06:00
fd51682eb0 Ship: Complete initial implementation. Impl's #16 2021-11-14 14:04:32 -06:00
dae4c56a2b Refactor ship extents logic 2021-11-14 07:14:35 -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
tommy-l-ngo
c53ce61b53 Added Confirmation dialog for Forfeit 2021-11-14 00:08:16 -06:00
tommy-l-ngo
63dec75688 Added Confirmation Dialog for Forfeit 2021-11-13 23:32:19 -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
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
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
eaa1617b9a Pushing what I've done of the game logic. 2021-11-11 14:38:10 -06:00