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
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
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
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
e3b0c0af75
Credit changes
2021-11-23 13:49:21 -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
72ac64f6d0
Game: Implement player setup
2021-11-15 01:17:32 -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
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
tommy-l-ngo
e5b7ac7662
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-14 00:44:20 -06:00
tommy-l-ngo
16b0e57170
idk
2021-11-14 00:44:13 -06:00
Chance Atkinson
5a1f74467a
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-14 00:44:08 -06:00
Chance Atkinson
d52234d63c
Added my win button back :)
...
wooooooo win butttoooonnnn
2021-11-14 00:43:32 -06:00
tommy-l-ngo
be4429a717
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-14 00:43:23 -06:00
tommy-l-ngo
6577c2551b
made dark theme
2021-11-14 00:43:14 -06:00
Chance Atkinson
9bffd36a07
restart button is invisible
2021-11-14 00:39:26 -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
a64114da0f
Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic
2021-11-14 00:30:59 -06:00
4065253bf1
Remove unused resourse main.tres
2021-11-14 00:30:53 -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
hpham474
51e230117a
Added signal for audio SFX
2021-11-13 23:55:46 -06:00
hpham474
3b7a8afdf8
removed option background again
2021-11-13 23:43:05 -06:00
5c49991eed
Oops I made the background invisible
2021-11-13 23:41:12 -06:00
tommy-l-ngo
adb3fc659e
Revert "Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic"
...
This reverts commit 104ffaab0a63dec75688
2021-11-13 23:35:11 -06:00
tommy-l-ngo
104ffaab0a
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-13 23:32:22 -06:00
tommy-l-ngo
63dec75688
Added Confirmation Dialog for Forfeit
2021-11-13 23:32:19 -06:00
hpham474
79496105da
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-13 23:19:13 -06:00
hpham474
9d47a111b0
Removed option background
2021-11-13 23:19:02 -06:00
tommy-l-ngo
bf58a2b29e
Put Background in main
2021-11-13 23:17:33 -06:00
d58ffa91e5
Merge
2021-11-13 23:10:47 -06:00
4cc4cd8f89
Fix null deref when entering singleplayer after exiting multiplayer
2021-11-13 23:07:19 -06:00
tommy-l-ngo
c3a2de2795
Created Sprite for Light Mode
2021-11-13 23:06:13 -06:00
8232bec5d0
Consolidate backgrounds
2021-11-13 22:46:24 -06:00
tommy-l-ngo
7465349de3
Fixed up the Title Screen text
...
imported font
2021-11-13 15:18:12 -06:00
2a3aae73ac
Accidentally offset the Setup menu by a handful of pixels. Whoops.
2021-11-13 04:38:20 -06:00
eb8c0b1756
Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic
2021-11-13 04:34:44 -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
tommy-l-ngo
c766a50949
Added temporary title screen text
2021-11-13 02:38:35 -06:00
tommy-l-ngo
aea9bbe2b0
Created Sprite for "Miss"
2021-11-13 02:06:56 -06:00
tommy-l-ngo
e8f11bcbc3
Created Sprite for Ship5 Destroyed
2021-11-13 01:41:31 -06:00
