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

238 Commits

Author SHA1 Message Date
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
tommy-l-ngo
7af638d1ea Texture rendering changes 2021-11-14 03:56:14 -06:00
tommy-l-ngo
ddf63b569c Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 03:18:36 -06:00
tommy-l-ngo
afec8710f5 idk 2021-11-14 03:18:27 -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
428c59115f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-14 02:12:40 -06:00
4639bb355c Make ships real 2021-11-14 02:12:31 -06:00
hpham474
6aca8c54a3 Added texture atlas 2021-11-14 02:09:12 -06:00
hpham474
50f087061e Added getExtent() function for ships 2021-11-14 01:21:40 -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
tommy-l-ngo
06b8711a08
Game logic (#14)
* Create game classes

* Pushing what I've done of the game logic.

* Commented my code

Deals with ship placement on board and ship rotation on board

* Comment game logic code, and edit for style.

* Added Clear board button and Confirm Placement button

* Fix up some stuff

* Pass

* I accidentally the buttons + Fix some hitbox mistakes.

* Improve hitbox leniency, and don't allow ships to rotate into each other.

* Fixed Dialog Box that pops up for Confirm Placement

* Update Gameplay.tscn

* Partial fire functionality added.

Currently hides all ship placement UI and makes visible all fire functionality. The crosshair currently does not snap to a grid. The ships are saved in an area of location objects holding the length, orientation, and coordinates of the ship.

* Crosshair now snaps into place

* Created Sprites for 2Ship and 3ShipA

* Created Sprite for Ship3B

* Created Sprite for Ship4

* Created Sprite for Ship5

* Created Sprite for "Hit"

* Created Sprites for Ship2 Destroyed and Ship3A Destroyed

* Created Sprite for Ship3B Destroyed

* Created Sprite for Ship4 Destroyed

* Created Sprite for Ship5 Destroyed

* Created Sprite for "Miss"

* Fixed blurry pixel art

Changed texture rendering

* Added temporary title screen text

* Major restructuring to better support object-oriented design of the main game logic and UI. This was necessary, I swear.

* Accidentally offset the Setup menu by a handful of pixels. Whoops.

* Setup: remove unused signal

* Comment on which parts of Game are only there for testing purposes.

* Fixed up the Title Screen text

imported font

* Fixed Crosshair pixel rendering

* Consolidate backgrounds

* Added more SFX sounds

* Created Sprite for Light Mode

* Fix null deref when entering singleplayer after exiting multiplayer

* Hien's work

* Revert "Hien's work"

This reverts commit f099ed6c80.

* Stuff

* Make git happy by pushing gdengine imports

* Put Background in main

* Removed option background

* Added Confirmation Dialog for Forfeit

* Revert "Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic"

This reverts commit 104ffaab0a, reversing
changes made to 63dec75688.

* Fix title screen never going (whoops

* Oops I made the background invisible

* removed option background again

* Added dark/light mode functionality

* Added signal for audio SFX

* Load the theme on startup

* Added Confirmation dialog for Forfeit

* Fixed Texture Rendering for Light Mode Background

* Sounds no longer scale linearly

* Remove unused resourse main.tres

* 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.

* restart button is invisible

Co-authored-by: John Breaux <JohnBreaux@my.unt.edu>
Co-authored-by: JohnBreaux <89870642+JohnBreaux@users.noreply.github.com>
Co-authored-by: hpham474 <HienPham@my.unt.edu>
Co-authored-by: Chance Atkinson <chancewatkinson@gmail.com>
2021-11-14 00:43:05 -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
5dcb8b7aa9 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-13 23:14:34 -06:00
ed76dda0c0 Make git happy by pushing gdengine imports 2021-11-13 23:14:22 -06:00
tommy-l-ngo
641b891326 Stuff 2021-11-13 23:13:10 -06:00
12ed534000 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-13 23:10:52 -06:00
d58ffa91e5 Merge 2021-11-13 23:10:47 -06:00
tommy-l-ngo
0b98580d8a Revert "Hien's work"
This reverts commit f099ed6c80.
2021-11-13 23:09:23 -06:00
tommy-l-ngo
f099ed6c80 Hien's work 2021-11-13 23:08:01 -06:00