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
