1
0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-14 21:15:58 +00:00
Commit Graph

250 Commits

Author SHA1 Message Date
55a12dceea Create the Boat Battle Player's Guide, to instruct new players on the ways of Boat Battle. 2021-12-06 14:40:34 -06:00
68009d1c39 Improve interactions between Game, Victory, and Lobby.
Game:
- Show victory screen on opponent, including ships
- Return to Lobby on forfeit/connection error

Victory:
- Display win/lose status
- Request that Game return to lobby, rather than doing it manually
- Disconnect from network when returning to main menu
2021-12-06 13:16:49 -06:00
99a54a021f Victory: Enable play-again button, organize menu in a more aesthetically pleasing way, fix text font weight/color to not die on light theme. 2021-12-06 13:12:21 -06:00
77d6b25f58 Lobby: Load Net state on Lobby start, and show appropriate menus. 2021-12-06 13:07:53 -06:00
4a2d577e9c Title: Change multiplayer game mode text to better suit the multiplayer-only nature of the game 2021-12-06 13:05:30 -06:00
df7c76806d Build: Enable building for Linux/X11. 2021-12-06 13:04:24 -06:00
49bda9cb9a Debug: Check for presence of file before loading. Fixes annoying break to debugger. 2021-12-06 13:02:11 -06:00
d8c5d0548f Net: Fix off-by-one in number of players allowed to connect (was 3, now 2; Godot does not include the 'server'.) 2021-12-06 12:57:06 -06:00
JohnBreaux
dbd7e0392c
Update README.md
Add information about the game
2021-11-28 19:12:23 -06:00
c907391947 Rename the game and exported executable to match the official name of the game. 2021-11-28 05:45:59 -06:00
c28b273249 Debug: Cleanup scring concatenations, hide cheaty features behind a cheat code (it's unsalted sha256, and there are hints ;P), expand perf command to accept more verbose descriptions of performance counters.) 2021-11-28 05:45:05 -06:00
ff45799305 All: General code cleanup 2021-11-28 02:26:00 -06:00
8239c133fc Lobby: Multiple cosmetic changes were made to improve the user experience 2021-11-28 00:08:40 -06:00
754ad2986b Game: Hide the 'Buttons' 2021-11-25 13:16:41 -06:00
c290cfd0f6 Reimport assets with texture filtering disabled 2021-11-24 23:02:19 -06:00
21a5de5701 Merge branch 'game-logic' 2021-11-24 22:32:17 -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
20cd32bd89 Lobby: ??? 2021-11-24 03:07:27 -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
1a3d770690 Title Screen: Disable singleplayer (for now) 2021-11-24 02:50:05 -06:00
10d7fda957 Lobby: Change boxes to close on LineEdit text entered; remove OK buttons. 2021-11-24 02:49:13 -06:00
bfd005d01c Lobby: Return to Host/Connect menu when connection to server unexpectedly closes 2021-11-24 02:48:02 -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
hpham474
ceb8df329a Added hitmissatlas 2021-11-23 22:56:12 -06:00
5bf690c779 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-23 22:44:59 -06:00
12816a2caa Multiplayer: Add Lobby 2021-11-23 22:44:53 -06:00
tommy-l-ngo
81fd52c76d Another Splash Screen Update :) 2021-11-23 16:04:07 -06:00
tommy-l-ngo
bc60249b69 Updated Splash Screen 2021-11-23 14:39:49 -06:00
tommy-l-ngo
e3b0c0af75 Credit changes 2021-11-23 13:49:21 -06:00
tommy-l-ngo
42c9e0c42b Updated Splash Screen 2021-11-23 01:05:24 -06:00
100f219d74 Main: is_multiplayer no longer exists 2021-11-23 00:11:49 -06:00
tommy-l-ngo
b80288b3f4 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-23 00:09:38 -06:00
tommy-l-ngo
401f324264 Added Splash Screen 2021-11-23 00:09:30 -06:00
4dbc7dc17c Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-23 00:06:05 -06:00
40165394a9 Export: Use icon for export; Net: add comments 2021-11-23 00:05:55 -06:00
tommy-l-ngo
3b392a3a2e Updated .ico file 2021-11-22 23:57:59 -06:00
tommy-l-ngo
fbb4ab31cd Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-22 23:22:12 -06:00
tommy-l-ngo
55d14c4e1c Created and Added icon 2021-11-22 23:22:08 -06:00
80b964553f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-22 23:17:33 -06:00
0ef058339c Multiplayer: Fix mail system 2021-11-22 23:17:27 -06:00
hpham474
6ea3da7205 Themes now work on credits page 2021-11-22 22:39:42 -06:00
hpham474
50ad9a2539 Added button to go in and out of credits 2021-11-22 22:35:28 -06:00
hpham474
f57f6acb9a Completed Credits Scene 2021-11-22 22:23:57 -06:00
hpham474
47c2acdada Added Credits Scene 2021-11-22 22:06:11 -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