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 104ffaab0a63dec75688
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
ed76dda0c0
Make git happy by pushing gdengine imports
2021-11-13 23:14:22 -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
80af59116d
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-13 23:06:31 -06:00
tommy-l-ngo
c3a2de2795
Created Sprite for Light Mode
2021-11-13 23:06:13 -06:00
hpham474
8905f86be7
Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic
2021-11-13 23:05:43 -06:00
hpham474
96c5678cf4
Added more SFX sounds
2021-11-13 23:05:13 -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
7465349de3
Fixed up the Title Screen text
...
imported font
2021-11-13 15:18:12 -06:00
2f5a2cd47f
Comment on which parts of Game are only there for testing purposes.
2021-11-13 05:08:53 -06:00
1a031ac9d2
Setup: remove unused signal
2021-11-13 04:46:28 -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
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
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
1403f7eccb
Pass
2021-11-11 20:55:19 -06:00
96b5695b12
Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic
2021-11-11 20:45:56 -06:00
fae2631637
Fix up some stuff
2021-11-11 20:45:38 -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
a8f96eed9d
Comment game logic code, and edit for style.
2021-11-11 15:38:50 -06:00
8e9a15b6dd
Merge branch 'main' into game-logic
...
Fixed critical UAF in debug menu which lead to crash.
2021-11-11 15:10:28 -06:00
tommy-l-ngo
f9592f425e
Commented my code
...
Deals with ship placement on board and ship rotation on board
2021-11-11 15:08:14 -06:00
3ef450a80a
Fix fatal use-after-free in debug menu.
2021-11-11 15:08:09 -06:00
eaa1617b9a
Pushing what I've done of the game logic.
2021-11-11 14:38:10 -06:00
8c4457a883
Create game classes
2021-11-09 18:28:25 -06:00
d833d98502
Debug: Improve listing properties somewhat
2021-11-08 13:43:11 -06:00
4c66fd7a90
Improve flags slightly
2021-11-08 13:41:55 -06:00
c1f49fd7bf
INFINITE POWER SAVINGS: Reduce idle CPU usage to 0 with this one weird trick
2021-11-08 12:17:13 -06:00
89aa8a6b14
Make the debug menu even more dangerously powerful. Added: exec, listprops, getprop, setprop
2021-11-08 11:50:14 -06:00
ff26e67be8
Merge branch 'main' of github.com:StatewideInk/Group12 into main
2021-11-08 04:25:53 -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
425e4428c7
Refactoring: parametrize set volume function
2021-11-07 23:11:19 -06:00
hpham474
7bae715ba5
Added master slider to change all volume
2021-11-07 22:43:00 -06:00
hpham474
737b460991
Refactoring: Removed dead code
2021-11-07 21:38:56 -06:00
hpham474
16dee66c2e
Bugfix: audio now plays when changing scenes; added audio to ships being interacted
2021-11-07 20:53:08 -06:00
hpham474
4eb6a6cad4
Revert "When interacting with something (object or ship) and SFX is played"
...
This reverts commit a2a0607364
2021-11-07 20:48:19 -06:00
hpham474
a2a0607364
When interacting with something (object or ship) and SFX is played
2021-11-07 20:42:50 -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
2dff7428a1
Merge branch 'main' of https://github.com/StatewideInk/Group12
2021-11-07 00:35:43 -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
tommy-l-ngo
e080b4742f
Bug Fix: left click right click moves ship
...
Made it so that you can't rotate the ships while holding. Only when placed on board can ships then be rotated.
2021-11-07 00:06:16 -05:00
tommy-l-ngo
3f1cdc9081
Bug Fix: Board snap bordering fix
2021-11-01 20:44:44 -05:00
tommy-l-ngo
221608a1e3
Rotation only works on board now
...
letting the ships be able to be rotated while not on the board caused a few bugs, so I just made it so that you can't rotate the pieces unless it's on board
2021-11-01 20:40:31 -05:00
tommy-l-ngo
223944523d
Bug Fix: Rotating ships at the original position would move the other ships left for some reason
...
- Issue fixed
- Now the ships won't move when rotated in the original position
- might make it so that the ships don't rotate in the original position in general
2021-11-01 15:22:03 -05:00
tommy-l-ngo
254a9d86d4
Rotation fix for ships being rotated after already being placed on board
...
If rotating the ship hangs the piece off the board, it will move the piece back on the board accordingly
2021-11-01 15:10:12 -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
e4a92faaea
Bug Fix: Ship rotating after placed on board are able to hang off
...
- fixed this by moving ships back inside board when it hangs off after rotating
2021-11-01 00:37:40 -05:00
tommy-l-ngo
cb661106c3
Bug Fix: ships were able to be placed hanging off of the board
...
- Fixed the issue
- Now ships can only be placed inside/on the board
2021-11-01 00:11:54 -05:00
tommy-l-ngo
16719e3adc
Fixed bug
...
Bug fixed:
- moving the ship piece in place crashes game and triggers debugging
2021-10-31 23:05:22 -05:00
tommy-l-ngo
71cc294774
Merge branch 'main' of https://github.com/StatewideInk/Group12
2021-10-31 22:50:07 -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
b518f03eeb
Improve ship grid alignment when snapping. Fixes #2
2021-10-31 22:04:11 -05:00
tommy-l-ngo
448f3a0262
Merge branch 'main' of https://github.com/StatewideInk/Group12
2021-10-31 20:23:58 -05:00
tommy-l-ngo
6696577a85
Borders for the board (In progress)
2021-10-31 20:23:54 -05:00
3cf2335dd8
Debug: Actually add nop, fix formatting, remove unused variables.
2021-10-31 19:57:47 -05:00
29f643de20
Load options on OptionController _ready(), so they will be available before options menu opens. Disable debug printout on loading scene using main bus signal. Cleanup formatting on Debug 'call' command output.
2021-10-31 19:21:23 -05:00
hpham474
c83e10668c
Added options remember settings after closing and reopening game
...
Options file is saved to "(user)/AppData/Godot/app_userdata/godot_ship/options.save"
2021-10-31 05:46:49 -05:00
hpham474
678ebdb95e
Added export preset to exe 64-bit
2021-10-31 03:49:42 -05:00
tommy-l-ngo
1e5def8329
Spaced apart the options accessibilities
2021-10-30 21:57:02 -05:00
05ddde9788
Partial refactor of debug menu and Main script
2021-10-29 17:39:46 -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
f74ad64865
Add handles to ships and improve placement controls; Make the debug menu more aggressive.
2021-10-21 03:18:31 -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
