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

146 Commits

Author SHA1 Message Date
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
dd5b6f7b71 Fixed Texture Rendering for Light Mode Background 2021-11-14 00:11:25 -06:00
tommy-l-ngo
c53ce61b53 Added Confirmation dialog for Forfeit 2021-11-14 00:08:16 -06:00
d99419901f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-13 23:58:47 -06:00
31e00eb7f4 Load the theme on startup 2021-11-13 23:58:41 -06:00
hpham474
e0850366d2 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-13 23:56:10 -06:00
hpham474
51e230117a Added signal for audio SFX 2021-11-13 23:55:46 -06:00
tommy-l-ngo
bd5d350e96 Added dark/light mode functionality 2021-11-13 23:51:36 -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
0cb75b37b0 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-13 23:36:45 -06:00
34d0b1bf0d Fix title screen never going (whoops 2021-11-13 23:36:39 -06:00
tommy-l-ngo
adb3fc659e Revert "Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic"
This reverts commit 104ffaab0a, reversing
changes made to 63dec75688.
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
ed76dda0c0 Make git happy by pushing gdengine imports 2021-11-13 23:14:22 -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
80af59116d Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-13 23:06:31 -06:00
tommy-l-ngo
c3a2de2795 Created Sprite for Light Mode 2021-11-13 23:06:13 -06:00
hpham474
8905f86be7 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-13 23:05:43 -06:00
hpham474
96c5678cf4 Added more SFX sounds 2021-11-13 23:05:13 -06:00
8232bec5d0 Consolidate backgrounds 2021-11-13 22:46:24 -06:00
tommy-l-ngo
71d31e3db9 Fixed Crosshair pixel rendering 2021-11-13 15:23:11 -06:00
tommy-l-ngo
7465349de3 Fixed up the Title Screen text
imported font
2021-11-13 15:18:12 -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
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
b0995cbd0d Fixed blurry pixel art
Changed texture rendering
2021-11-13 02:09:41 -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
tommy-l-ngo
f6e2eb2544 Created Sprite for Ship4 Destroyed 2021-11-13 01:19:19 -06:00
tommy-l-ngo
c97de2eaca Created Sprite for Ship3B Destroyed 2021-11-13 01:07:48 -06:00
tommy-l-ngo
fc8c52f680 Created Sprites for Ship2 Destroyed and Ship3A Destroyed 2021-11-13 01:04:45 -06:00
tommy-l-ngo
795c5ac0a5 Created Sprite for "Hit" 2021-11-13 00:23:59 -06:00
tommy-l-ngo
6a915b9175 Created Sprite for Ship5 2021-11-13 00:01:13 -06:00