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

235 Commits

Author SHA1 Message Date
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
hpham474
a0f4e42914 Added missing ship textures into texture atlas 2021-11-15 03:39:31 -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