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

131 Commits

Author SHA1 Message Date
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
JohnBreaux
99bb051920
Merge pull request #15 from StatewideInk/collision-is-bad
Collision is Good, actually
2021-11-12 02:02:36 -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