j/Boat-Battle
1
0
Fork 0
mirror of https://github.com/JohnBreaux/Boat-Battle.git synced 2024-11-14 21:15:58 +00:00
Code Issues Projects Releases Wiki Activity

Commit Graph

  • adb3fc659e Revert "Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic" tommy-l-ngo 2021-11-13 23:35:11 -0600
  • 104ffaab0a Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic tommy-l-ngo 2021-11-13 23:32:22 -0600
  • 63dec75688 Added Confirmation Dialog for Forfeit tommy-l-ngo 2021-11-13 23:32:19 -0600
  • 79496105da Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic hpham474 2021-11-13 23:19:13 -0600
  • 9d47a111b0 Removed option background hpham474 2021-11-13 23:19:02 -0600
  • bf58a2b29e Put Background in main tommy-l-ngo 2021-11-13 23:17:33 -0600
  • 5dcb8b7aa9 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic John Breaux 2021-11-13 23:14:34 -0600
  • ed76dda0c0 Make git happy by pushing gdengine imports John Breaux 2021-11-13 23:14:22 -0600
  • 641b891326 Stuff tommy-l-ngo 2021-11-13 23:13:10 -0600
  • 12ed534000 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic John Breaux 2021-11-13 23:10:52 -0600
  • d58ffa91e5 Merge John Breaux 2021-11-13 23:10:47 -0600
  • 0b98580d8a Revert "Hien's work" tommy-l-ngo 2021-11-13 23:09:23 -0600
  • f099ed6c80 Hien's work tommy-l-ngo 2021-11-13 23:08:01 -0600
  • 4cc4cd8f89 Fix null deref when entering singleplayer after exiting multiplayer John Breaux 2021-11-13 23:07:19 -0600
  • 80af59116d Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic tommy-l-ngo 2021-11-13 23:06:31 -0600
  • c3a2de2795 Created Sprite for Light Mode tommy-l-ngo 2021-11-13 23:06:13 -0600
  • 8905f86be7 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic hpham474 2021-11-13 23:05:43 -0600
  • 96c5678cf4 Added more SFX sounds hpham474 2021-11-13 23:05:13 -0600
  • 8232bec5d0 Consolidate backgrounds John Breaux 2021-11-13 22:46:24 -0600
  • 71d31e3db9 Fixed Crosshair pixel rendering tommy-l-ngo 2021-11-13 15:23:11 -0600
  • 7465349de3 Fixed up the Title Screen text tommy-l-ngo 2021-11-13 15:18:12 -0600
  • 2f5a2cd47f Comment on which parts of Game are only there for testing purposes. John Breaux 2021-11-13 05:08:53 -0600
  • 1a031ac9d2 Setup: remove unused signal John Breaux 2021-11-13 04:46:28 -0600
  • 2a3aae73ac Accidentally offset the Setup menu by a handful of pixels. Whoops. John Breaux 2021-11-13 04:38:20 -0600
  • eb8c0b1756 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic John Breaux 2021-11-13 04:34:44 -0600
  • 1cb400361d Major restructuring to better support object-oriented design of the main game logic and UI. This was necessary, I swear. John Breaux 2021-11-13 04:34:39 -0600
  • c766a50949 Added temporary title screen text tommy-l-ngo 2021-11-13 02:38:35 -0600
  • b0995cbd0d Fixed blurry pixel art tommy-l-ngo 2021-11-13 02:09:41 -0600
  • aea9bbe2b0 Created Sprite for "Miss" tommy-l-ngo 2021-11-13 02:06:56 -0600
  • e8f11bcbc3 Created Sprite for Ship5 Destroyed tommy-l-ngo 2021-11-13 01:41:31 -0600
  • f6e2eb2544 Created Sprite for Ship4 Destroyed tommy-l-ngo 2021-11-13 01:19:19 -0600
  • c97de2eaca Created Sprite for Ship3B Destroyed tommy-l-ngo 2021-11-13 01:07:48 -0600
  • fc8c52f680 Created Sprites for Ship2 Destroyed and Ship3A Destroyed tommy-l-ngo 2021-11-13 01:04:45 -0600
  • 795c5ac0a5 Created Sprite for "Hit" tommy-l-ngo 2021-11-13 00:23:59 -0600
  • 6a915b9175 Created Sprite for Ship5 tommy-l-ngo 2021-11-13 00:01:13 -0600
  • b21560c9be Created Sprite for Ship4 tommy-l-ngo 2021-11-12 23:22:22 -0600
  • 450adb8713 Created Sprite for Ship3B tommy-l-ngo 2021-11-12 22:39:03 -0600
  • 7a0d1251eb Created Sprites for 2Ship and 3ShipA tommy-l-ngo 2021-11-12 22:09:23 -0600
  • 421c2af83c Crosshair now snaps into place hpham474 2021-11-12 18:07:37 -0600
  • c87a1d031c Partial fire functionality added. hpham474 2021-11-12 07:08:01 -0600
  • 6e5471cc66 Update Gameplay.tscn tommy-l-ngo 2021-11-12 03:45:34 -0600
  • a47cb991f2 Fixed Dialog Box that pops up for Confirm Placement tommy-l-ngo 2021-11-12 03:44:52 -0600
  • 9a3061c16e Improve hitbox leniency, and don't allow ships to rotate into each other. John Breaux 2021-11-12 03:33:31 -0600
  • 304389138f I accidentally the buttons + Fix some hitbox mistakes. John Breaux 2021-11-12 03:01:23 -0600
  • c558578e2e
         Merge branch 'main' into game-logic JohnBreaux 2021-11-12 02:10:34 -0600
  • 99bb051920
         Merge pull request #15 from StatewideInk/collision-is-bad JohnBreaux 2021-11-12 02:02:36 -0600
  • f40bf520d4 Collision is good #15 John Breaux 2021-11-12 01:57:15 -0600
  • 1403f7eccb Pass John Breaux 2021-11-11 20:55:19 -0600
  • 96b5695b12 Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic John Breaux 2021-11-11 20:45:56 -0600
  • fae2631637 Fix up some stuff John Breaux 2021-11-11 20:45:38 -0600
  • 7d85195dd1 Added Clear board button and Confirm Placement button tommy-l-ngo 2021-11-11 20:43:09 -0600
  • 9ecf401efa Collision is bad Chance Atkinson 2021-11-11 20:36:58 -0600
  • a8f96eed9d Comment game logic code, and edit for style. John Breaux 2021-11-11 15:38:50 -0600
  • 8e9a15b6dd Merge branch 'main' into game-logic Fixed critical UAF in debug menu which lead to crash. John Breaux 2021-11-11 15:10:28 -0600
  • f9592f425e Commented my code tommy-l-ngo 2021-11-11 15:08:14 -0600
  • 3ef450a80a Fix fatal use-after-free in debug menu. John Breaux 2021-11-11 15:08:09 -0600
  • eaa1617b9a Pushing what I've done of the game logic. John Breaux 2021-11-11 14:38:10 -0600
  • 8c4457a883 Create game classes John Breaux 2021-11-08 07:40:11 -0600
  • d833d98502 Debug: Improve listing properties somewhat John Breaux 2021-11-08 13:43:11 -0600
  • 4c66fd7a90 Improve flags slightly John Breaux 2021-11-08 13:41:55 -0600
  • c1f49fd7bf INFINITE POWER SAVINGS: Reduce idle CPU usage to 0 with this one weird trick John Breaux 2021-11-08 12:17:13 -0600
  • 89aa8a6b14 Make the debug menu even more dangerously powerful. Added: exec, listprops, getprop, setprop John Breaux 2021-11-08 11:50:14 -0600
  • ff26e67be8 Merge branch 'main' of github.com:StatewideInk/Group12 into main John Breaux 2021-11-08 04:25:53 -0600
  • 73461743d4 ''I've got a feeling we're not in Kansas any more.'' Remove C++ unused header files John Breaux 2021-11-08 04:25:44 -0600
  • 425e4428c7 Refactoring: parametrize set volume function hpham474 2021-11-07 23:11:19 -0600
  • 7bae715ba5 Added master slider to change all volume hpham474 2021-11-07 22:43:00 -0600
  • 737b460991 Refactoring: Removed dead code hpham474 2021-11-07 21:38:56 -0600
  • 16dee66c2e Bugfix: audio now plays when changing scenes; added audio to ships being interacted hpham474 2021-11-07 20:53:08 -0600
  • 4eb6a6cad4 Revert "When interacting with something (object or ship) and SFX is played" hpham474 2021-11-07 20:48:19 -0600
  • a2a0607364 When interacting with something (object or ship) and SFX is played hpham474 2021-11-07 20:42:50 -0600
  • 388fcb9483 Added AudioBus. SFX Vol slider now works hpham474 2021-11-07 20:33:07 -0600
  • 9929aab354 Moved audio to folder in assets; Separated BGM from the master volume hpham474 2021-11-07 19:15:13 -0600
  • 04fc9759dc min_value for volume slider set to -50 instead of -60 Chance Atkinson 2021-11-07 00:38:23 -0500
  • 2dff7428a1 Merge branch 'main' of https://github.com/StatewideInk/Group12 Chance Atkinson 2021-11-07 00:35:43 -0500
  • 9ef5a6f749 Fixed volume slider and ship spawning Chance Atkinson 2021-11-07 00:35:34 -0500
  • e080b4742f Bug Fix: left click right click moves ship tommy-l-ngo 2021-11-07 00:06:16 -0500
  • 3f1cdc9081 Bug Fix: Board snap bordering fix tommy-l-ngo 2021-11-01 20:44:44 -0500
  • 221608a1e3 Rotation only works on board now tommy-l-ngo 2021-11-01 20:40:31 -0500
  • 223944523d Bug Fix: Rotating ships at the original position would move the other ships left for some reason tommy-l-ngo 2021-11-01 15:22:03 -0500
  • 254a9d86d4 Rotation fix for ships being rotated after already being placed on board tommy-l-ngo 2021-11-01 15:10:12 -0500
  • bc319fa464 Background music volume can be adjusted hpham474 2021-11-01 04:48:21 -0500
  • 1b3333203e Added BGM and Button SFX sounds hpham474 2021-11-01 04:26:17 -0500
  • e4a92faaea Bug Fix: Ship rotating after placed on board are able to hang off tommy-l-ngo 2021-11-01 00:37:40 -0500
  • cb661106c3 Bug Fix: ships were able to be placed hanging off of the board tommy-l-ngo 2021-11-01 00:11:54 -0500
  • 16719e3adc Fixed bug tommy-l-ngo 2021-10-31 23:05:22 -0500
  • 71cc294774 Merge branch 'main' of https://github.com/StatewideInk/Group12 tommy-l-ngo 2021-10-31 22:50:07 -0500
  • df1c43bb0d Snap only when on board tommy-l-ngo 2021-10-31 22:48:20 -0500
  • b518f03eeb Improve ship grid alignment when snapping. Fixes #2 John Breaux 2021-10-31 22:04:11 -0500
  • 448f3a0262 Merge branch 'main' of https://github.com/StatewideInk/Group12 tommy-l-ngo 2021-10-31 20:23:58 -0500
  • 6696577a85 Borders for the board (In progress) tommy-l-ngo 2021-10-31 20:23:54 -0500
  • 3cf2335dd8 Debug: Actually add nop, fix formatting, remove unused variables. John Breaux 2021-10-31 19:57:47 -0500
  • 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. John Breaux 2021-10-31 19:21:23 -0500
  • c83e10668c Added options remember settings after closing and reopening game hpham474 2021-10-31 05:46:49 -0500
  • 678ebdb95e Added export preset to exe 64-bit hpham474 2021-10-31 03:49:42 -0500
  • 1e5def8329 Spaced apart the options accessibilities tommy-l-ngo 2021-10-30 21:57:02 -0500
  • 05ddde9788 Partial refactor of debug menu and Main script John Breaux 2021-10-29 17:39:46 -0500
  • 909773a65b Improve debug and Options somewhat John Breaux 2021-10-22 01:53:04 -0500
  • ecaa22771a Further improvements to overall system stability and other minor adjustments have been made to enhance the user exprience. John Breaux 2021-10-21 13:37:41 -0500
  • 7f0b58de70 Radical debug menu overhaul + Options overhaul John Breaux 2021-10-21 05:22:42 -0500
  • f74ad64865 Add handles to ships and improve placement controls; Make the debug menu more aggressive. John Breaux 2021-10-21 03:18:31 -0500