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

117 Commits

Author SHA1 Message Date
80b964553f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-22 23:17:33 -06:00
0ef058339c Multiplayer: Fix mail system 2021-11-22 23:17:27 -06:00
hpham474
6ea3da7205 Themes now work on credits page 2021-11-22 22:39:42 -06:00
hpham474
50ad9a2539 Added button to go in and out of credits 2021-11-22 22:35:28 -06:00
5ed44e6deb Multiplayer: Implement message passing system 2021-11-22 22:04:21 -06:00
bc1e31ac8c At least it doesn't crash now, as long as 2 peers are connected. 2021-11-18 09:50:17 -06:00
919576638c Multiplayer sucks 2021-11-18 09:00:15 -06:00
72ac64f6d0 Game: Implement player setup 2021-11-15 01:17:32 -06:00
36cc6896b1 Game: Move debug logic out of Game 2021-11-14 23:50:23 -06:00
hpham474
518e8fa5c4 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 22:47:08 -06:00
hpham474
8e4600eede Added player class functionality 2021-11-14 22:47:01 -06:00
aed672fdd4 Setup: Add variant to ShipData. 2021-11-14 22:46:21 -06:00
hpham474
83f319b76c Partial implementation of the player class 2021-11-14 20:12:01 -06:00
64c5c07624 Debug: Refine command processing to more granularly control printing during script execution. 2021-11-14 14:06:56 -06:00
4730bf7733 Board: Start initial implementation. 2021-11-14 14:06:09 -06:00
fd51682eb0 Ship: Complete initial implementation. Impl's #16 2021-11-14 14:04:32 -06:00
6758dc048e Debug: I lied. Ran into a bug regarding state save/restore when nesting scripts. 2021-11-14 08:00:56 -06:00
b8d0e008d1 Debug: Change script location, and make helptext for sh/script more clear. Last addition, I swear. 2021-11-14 07:36:30 -06:00
dae4c56a2b Refactor ship extents logic 2021-11-14 07:14:35 -06:00
ecbf14c998 Finish scripting implementation 2021-11-14 07:13:53 -06:00
5a72c4fded Debug: add loading and running scripts\ Ship: Validate alternate implementation of getExtents() 2021-11-14 06:32:46 -06:00
hpham474
6fa1319ec4 Added partial texture function for ship 2021-11-14 03:15:27 -06:00
tommy-l-ngo
de9684d22f Added Dark and Light Themes 2021-11-14 02:50:39 -06:00
4639bb355c Make ships real 2021-11-14 02:12:31 -06:00
hpham474
50f087061e Added getExtent() function for ships 2021-11-14 01:21:40 -06:00
Chance Atkinson
d52234d63c Added my win button back :)
wooooooo win butttoooonnnn
2021-11-14 00:43:32 -06:00
Chance Atkinson
80d3313516 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 00:39:02 -06:00
Chance Atkinson
b69cc01be2 Added victory screen
Added a victory screen. Since there is no current way to win, there is a 'win' button added to the top left of the game screen. Once clicked, victory text will appear and the player will be given the option to return to the main menu.
2021-11-14 00:34:51 -06:00
hpham474
b17c82e632 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 00:30:28 -06:00
hpham474
223f36ffdd Sounds no longer scale linearly 2021-11-14 00:30:18 -06:00
tommy-l-ngo
c53ce61b53 Added Confirmation dialog for Forfeit 2021-11-14 00:08:16 -06:00
d99419901f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-13 23:58:47 -06:00
31e00eb7f4 Load the theme on startup 2021-11-13 23:58:41 -06:00
hpham474
e0850366d2 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-13 23:56:10 -06:00
hpham474
51e230117a Added signal for audio SFX 2021-11-13 23:55:46 -06:00
tommy-l-ngo
bd5d350e96 Added dark/light mode functionality 2021-11-13 23:51:36 -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
63dec75688 Added Confirmation Dialog for Forfeit 2021-11-13 23:32:19 -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
c3a2de2795 Created Sprite for Light Mode 2021-11-13 23:06:13 -06:00
8232bec5d0 Consolidate backgrounds 2021-11-13 22:46:24 -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
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
b0995cbd0d Fixed blurry pixel art
Changed texture rendering
2021-11-13 02:09:41 -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
a47cb991f2 Fixed Dialog Box that pops up for Confirm Placement 2021-11-12 03:44:52 -06:00