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
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
c3a2de2795
Created Sprite for Light Mode
2021-11-13 23:06:13 -06:00
8232bec5d0
Consolidate backgrounds
2021-11-13 22:46:24 -06:00
tommy-l-ngo
7465349de3
Fixed up the Title Screen text
...
imported font
2021-11-13 15:18:12 -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
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
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
421c2af83c
Crosshair now snaps into place
2021-11-12 18:07:37 -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
tommy-l-ngo
6e5471cc66
Update Gameplay.tscn
2021-11-12 03:45:34 -06:00
tommy-l-ngo
a47cb991f2
Fixed Dialog Box that pops up for Confirm Placement
2021-11-12 03:44:52 -06:00
9a3061c16e
Improve hitbox leniency, and don't allow ships to rotate into each other.
2021-11-12 03:33:31 -06:00
304389138f
I accidentally the buttons + Fix some hitbox mistakes.
2021-11-12 03:01:23 -06:00
JohnBreaux
c558578e2e
Merge branch 'main' into game-logic
2021-11-12 02:10:34 -06:00
f40bf520d4
Collision is good
2021-11-12 01:57:15 -06:00
tommy-l-ngo
7d85195dd1
Added Clear board button and Confirm Placement button
2021-11-11 20:43:09 -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
