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

35 Commits

Author SHA1 Message Date
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
f40bf520d4 Collision is good 2021-11-12 01:57:15 -06:00
Chance Atkinson
9ecf401efa Collision is bad
Tried working on the collision when placing ships, they are cramming when held on top of each other and are not returning to starting position when they are supposed to.
2021-11-11 20:36:58 -06:00
73461743d4 ''I've got a feeling we're not in Kansas any more.'' Remove C++ unused header files 2021-11-08 04:25:44 -06:00
hpham474
7bae715ba5 Added master slider to change all volume 2021-11-07 22:43:00 -06:00
hpham474
388fcb9483 Added AudioBus. SFX Vol slider now works 2021-11-07 20:33:07 -06:00
hpham474
9929aab354 Moved audio to folder in assets; Separated BGM from the master volume 2021-11-07 19:15:13 -06:00
Chance Atkinson
04fc9759dc min_value for volume slider set to -50 instead of -60 2021-11-07 00:38:23 -05:00
Chance Atkinson
9ef5a6f749 Fixed volume slider and ship spawning
Previously tried adding a collision mesh to the ships to avoid stacking, but it caused the ships to slide to the right when they spawned. This issue has been resolved.

The volume slider now sets to a minimum to -60 dB so the audio only goes silent when set to the minimum. Also set the 'step' variable to 1 so that the slider could be more precise.
2021-11-07 00:35:34 -05:00
hpham474
bc319fa464 Background music volume can be adjusted 2021-11-01 04:48:21 -05:00
hpham474
1b3333203e Added BGM and Button SFX sounds 2021-11-01 04:26:17 -05:00
tommy-l-ngo
df1c43bb0d Snap only when on board
- snaps only when placed on board
- Returns to original position if it isn't
2021-10-31 22:48:20 -05:00
tommy-l-ngo
6696577a85 Borders for the board (In progress) 2021-10-31 20:23:54 -05:00
tommy-l-ngo
1e5def8329 Spaced apart the options accessibilities 2021-10-30 21:57:02 -05:00
909773a65b Improve debug and Options somewhat 2021-10-22 01:53:04 -05:00
ecaa22771a Further improvements to overall system stability and other minor adjustments have been made to enhance the user exprience. 2021-10-21 13:37:41 -05:00
7f0b58de70 Radical debug menu overhaul + Options overhaul 2021-10-21 05:22:42 -05:00
0fd0fa63f0 Improve menuing, and convert ships to RigidBody2D for accurate positioning. 2021-10-21 01:24:27 -05:00
Chance Atkinson
e9040293ae Boats work again
pog
2021-10-20 22:37:48 -05:00
Chance Atkinson
06e131834a Click and drag ships, rotate ships
:)
2021-10-20 22:33:14 -05:00
Chance Atkinson
d23bba5498 added a grid and made Gameplay.gd
My boats :(
2021-10-20 21:21:15 -05:00
hpham474
8345032169 Added Options menu exit functionality 2021-10-20 12:10:18 -05:00
hpham474
76ced10447 Added option menu UI 2021-10-20 10:58:06 -05:00
4cbccbbbbe Add help text to debug menu 2021-10-20 06:34:12 -05:00
5f8c881c1c Make debug menu fully functional, flesh out command bus. 2021-10-20 06:33:59 -05:00
b9947393a5 Working debug menu! No text output yet. 2021-10-20 06:33:52 -05:00
ee468dd572 Overhaul menu system 2021-10-20 06:23:23 -05:00
tommy-l-ngo
dcf746b77d Update Title Screen.tscn
changed button sizing
2021-10-20 06:23:13 -05:00
tommy-l-ngo
df0f203343 tidy up title screen
Moved titlescreen.gd to scripts folder
2021-10-20 06:23:12 -05:00
544b5f41ea Implement debug console drop-down (no commands just yet) and fix UI keybinds. 2021-10-20 06:22:36 -05:00
tommy-l-ngo
f420fd9c38 Updated Title Screen
- Added buttons that change scene
- Added Background
2021-10-20 06:22:17 -05:00
07340d2fe6 Pushing what I have of the debug menu so I don't forget. TODO: Pulldown keypress, command processing. 2021-10-20 06:20:40 -05:00
c632800adb Add title and debug UI scenes 2021-10-14 20:46:51 -05:00
9e1faf149a Add UI canvases 2021-10-14 20:35:59 -05:00
faa0792b0e Fix screen resolution, organize scenes, separate scenes. 2021-10-14 20:32:28 -05:00