j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-15 05:25:57 +00:00
Code Issues Projects Releases Wiki Activity
06b8711a08
Boat-Battle/godot_ship/.import
History
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
..
2longShip.jpg-d5a7704611de10aab66ba918993cfefa.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
2longShip.png-e234fd36aa8437d68669bed6fb538b78.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
2longShipA.jpg-814579ce623e33eb53adc6f83c55b97a.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
2longShipS.png-801d61680041dba5398a94c57d0e9262.md5 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
2longShipS.png-801d61680041dba5398a94c57d0e9262.stex Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
2Ship_Destroyed.png-3b174719764d2b2b3ae9a0fec7d0ff67.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
2Ship.png-1f2b7957a514f8da6d9bb3c6b90e97f4.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
2Ship.png-f56f600f71c287a0900c4554ec6e9837.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
2Ship.png-f56f600f71c287a0900c4554ec6e9837.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
3longShipA.png-6a91dbb91ef918b23841c41f7093095a.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.md5 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
3longShipAS.png-c88b2d866e65fe50f618c22da6c0a5d4.stex Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
3longShipB.jpg-938e9622961f078ec20adaae37353048.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
3longShipB.png-298804bab32e13c4fbcd46eeb80a354a.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.md5 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
3longShipBS.png-16d8048d7e635bcebbedc6038f4faaa5.stex Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipA_Destroyed.png-95908b7b74da915910232dfaef45af1c.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipA.png-1fe0003af4adcd83b8c94b2b9d6e5b6d.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipB_Destroyed.png-78d0de82a039cc20026f662e8052d260.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipB.png-28ed039caa6839d715648812af8f65e4.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
3ShipB.png-28ed039caa6839d715648812af8f65e4.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
4longShip.jpg-37f799abec354802900e084382ced2c3.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
4longShip.png-66bb0a1a0592f7a7862593b8911af333.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.md5 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
4longShipS.png-8dc80f51885d7a7242ed523ee285aaa0.stex Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
4Ship_Destroyed.png-acd8cae1448d0240f60f78c6681833bd.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
4Ship.png-1102455fdea5ccc9870ef475ee45f60a.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
4Ship.png-1102455fdea5ccc9870ef475ee45f60a.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
5longShip.jpg-1c06cb236b6500b8cfce00baf4d21905.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
5longShip.png-88bbaaa618d18fc67afeb8ed8b3c60ab.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
5longShipS.png-9d546ec87dabd586e250ea5c5229aa8f.md5 Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
5longShipS.png-9d546ec87dabd586e250ea5c5229aa8f.stex Add handles to ships and improve placement controls; Make the debug menu more aggressive. 2021-10-21 03:18:31 -05:00
5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
5Ship_Destroyed.png-26b685facbe48d12dffaa45c142d98de.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
5Ship.png-78bcea6c287110425f92a7d06eaf0b2b.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Background_Dark.png-f04f9416ce96aca35dfd0f16063b0d5b.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Background_Light.png-3684b7dcc3b1fd645e9fff4401113c01.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
battleship.png-3ac5571985b46807aec666e8ab4daeab.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
BGM - Captain Scurvy.ogg-324577f882a12f61687c746f4a4197ad.md5 Added BGM and Button SFX sounds 2021-11-01 04:26:17 -05:00
BGM - Captain Scurvy.ogg-324577f882a12f61687c746f4a4197ad.oggstr Added BGM and Button SFX sounds 2021-11-01 04:26:17 -05:00
BGM - Captain Scurvy.ogg-e6a4c7b7e6bf2999f35a2157c007b514.md5 Moved audio to folder in assets; Separated BGM from the master volume 2021-11-07 19:15:13 -06:00
BGM - Captain Scurvy.ogg-e6a4c7b7e6bf2999f35a2157c007b514.oggstr Moved audio to folder in assets; Separated BGM from the master volume 2021-11-07 19:15:13 -06:00
board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
board_blue.png-8626e50dfcb57a0efd28af7e65ef2b42.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
board_dark.png-8ab92393097062ca3eabf40325bbb36d.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
board_dark.png-8ab92393097062ca3eabf40325bbb36d.stex added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
board.png-9e4a38787502ba50f20171816826c39a.md5 added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
board.png-9e4a38787502ba50f20171816826c39a.stex added a grid and made Gameplay.gd 2021-10-20 21:21:15 -05:00
ButtonSFX.ogg-8c2b86050b91df563dcd88f6eb352c80.md5 Added BGM and Button SFX sounds 2021-11-01 04:26:17 -05:00
ButtonSFX.ogg-8c2b86050b91df563dcd88f6eb352c80.oggstr Added BGM and Button SFX sounds 2021-11-01 04:26:17 -05:00
ButtonSFX.ogg-473913894e173ed0b5a935d3831ff9b6.md5 Moved audio to folder in assets; Separated BGM from the master volume 2021-11-07 19:15:13 -06:00
ButtonSFX.ogg-473913894e173ed0b5a935d3831ff9b6.oggstr Moved audio to folder in assets; Separated BGM from the master volume 2021-11-07 19:15:13 -06:00
dark.png-1931de55ce8abaebbea8e169cd476889.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
dark.png-1931de55ce8abaebbea8e169cd476889.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
dt5s4fdi.bmp-59801c2c12d6fa0cbe1cffc9c9cc703e.md5 Fix screen resolution, organize scenes, separate scenes. 2021-10-14 20:32:28 -05:00
Hit.png-17e3984e00632881a34870756ffe8c73.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Hit.png-17e3984e00632881a34870756ffe8c73.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Hit.png-87d7e3b710f3d0b308b047fd65cd9a0a.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
Hit.png-30856058168b013ca9959912101c2c87.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Hit.png-30856058168b013ca9959912101c2c87.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
HitSFX.ogg-93a1e93085ac0a2fc2e723f5d44a2ca9.oggstr Game logic (#14) 2021-11-14 00:43:05 -06:00
icon.png-487276ed1e3a0c39cad0279d744ee560.md5 Create new godot-engine project 2021-10-14 18:50:33 -05:00
icon.png-487276ed1e3a0c39cad0279d744ee560.stex Create new godot-engine project 2021-10-14 18:50:33 -05:00
Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Miss.png-ddfb2f437f6e39c5895f51ba5ab8423e.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
MissSFX.ogg-d7b93821aa1c2b607fa4dc4bb3561322.oggstr Game logic (#14) 2021-11-14 00:43:05 -06:00
old.png-e33a9570b9c50f914f31c7204a2ce0c6.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Option-Background.png-a36d67b33a10832808db404a3f8ef365.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Option-Background.png-a36d67b33a10832808db404a3f8ef365.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
RedCrosshair.png-ed59a214d85db7c21233257c8daddbef.stex Game logic (#14) 2021-11-14 00:43:05 -06:00
SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
SunkSFX.ogg-52b6d419298328defecfc61b6c15659d.oggstr Game logic (#14) 2021-11-14 00:43:05 -06:00
Title-Screen-Background.png-0858ea44e9c9235fceac088a9c0f7d28.md5 Updated Title Screen 2021-10-20 06:22:17 -05:00
Title-Screen-Background.png-0858ea44e9c9235fceac088a9c0f7d28.stex Updated Title Screen 2021-10-20 06:22:17 -05:00
Title-Screen-Background.png-dbef7fef33c56892772634130111c923.md5 Game logic (#14) 2021-11-14 00:43:05 -06:00
Title-Screen-Background.png-dbef7fef33c56892772634130111c923.stex Game logic (#14) 2021-11-14 00:43:05 -06:00