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

196 Commits

Author SHA1 Message Date
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
Chance Atkinson
06e131834a Click and drag ships, rotate ships
:)
2021-10-20 22:33:14 -05:00
4d1327b74f feed the Git gods 2021-10-20 21:41:20 -05:00
7bea3b1f27 Let Godot do its texture importing thing
:
2021-10-20 21:40:28 -05:00