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

27 Commits

Author SHA1 Message Date
c290cfd0f6 Reimport assets with texture filtering disabled 2021-11-24 23:02:19 -06:00
21a5de5701 Merge branch 'game-logic' 2021-11-24 22:32:17 -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
hpham474
a0f4e42914 Added missing ship textures into texture atlas 2021-11-15 03:39:31 -06:00
tommy-l-ngo
afec8710f5 idk 2021-11-14 03:18:27 -06:00
hpham474
6aca8c54a3 Added texture atlas 2021-11-14 02:09:12 -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
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
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
tommy-l-ngo
b21560c9be Created Sprite for Ship4 2021-11-12 23:22:22 -06:00
tommy-l-ngo
450adb8713 Created Sprite for Ship3B 2021-11-12 22:39:03 -06:00
tommy-l-ngo
7a0d1251eb Created Sprites for 2Ship and 3ShipA 2021-11-12 22:09:23 -06:00
hpham474
c87a1d031c 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.
2021-11-12 07:08:01 -06:00
f74ad64865 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
7bea3b1f27 Let Godot do its texture importing thing
:
2021-10-20 21:40:28 -05:00
ef53a133b7 Add ship sprites 2021-10-20 21:39:46 -05:00
Chance Atkinson
d23bba5498 added a grid and made Gameplay.gd
My boats :(
2021-10-20 21:21:15 -05:00
57d6335016 Add temp. board backgroud 2021-10-20 19:43:11 -05:00