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
77d6b25f58
Lobby: Load Net state on Lobby start, and show appropriate menus.
2021-12-06 13:07:53 -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
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
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
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
12816a2caa
Multiplayer: Add Lobby
2021-11-23 22:44:53 -06:00
100f219d74
Main: is_multiplayer no longer exists
2021-11-23 00:11:49 -06:00
40165394a9
Export: Use icon for export; Net: add comments
2021-11-23 00:05:55 -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
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
64c5c07624
Debug: Refine command processing to more granularly control printing during script execution.
2021-11-14 14:06:56 -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
6758dc048e
Debug: I lied. Ran into a bug regarding state save/restore when nesting scripts.
2021-11-14 08:00:56 -06:00
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
