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

218 Commits

Author SHA1 Message Date
tommy-l-ngo
e3b0c0af75 Credit changes 2021-11-23 13:49:21 -06:00
tommy-l-ngo
42c9e0c42b Updated Splash Screen 2021-11-23 01:05:24 -06:00
100f219d74 Main: is_multiplayer no longer exists 2021-11-23 00:11:49 -06:00
tommy-l-ngo
b80288b3f4 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-23 00:09:38 -06:00
tommy-l-ngo
401f324264 Added Splash Screen 2021-11-23 00:09:30 -06:00
4dbc7dc17c Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-23 00:06:05 -06:00
40165394a9 Export: Use icon for export; Net: add comments 2021-11-23 00:05:55 -06:00
tommy-l-ngo
3b392a3a2e Updated .ico file 2021-11-22 23:57:59 -06:00
tommy-l-ngo
fbb4ab31cd Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-22 23:22:12 -06:00
tommy-l-ngo
55d14c4e1c Created and Added icon 2021-11-22 23:22:08 -06:00
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
hpham474
f57f6acb9a Completed Credits Scene 2021-11-22 22:23:57 -06:00
hpham474
47c2acdada Added Credits Scene 2021-11-22 22:06:11 -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
hpham474
a0f4e42914 Added missing ship textures into texture atlas 2021-11-15 03:39:31 -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
tommy-l-ngo
7af638d1ea Texture rendering changes 2021-11-14 03:56:14 -06:00
tommy-l-ngo
ddf63b569c Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 03:18:36 -06:00
tommy-l-ngo
afec8710f5 idk 2021-11-14 03:18:27 -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
428c59115f Merge branch 'game-logic' of github.com:StatewideInk/Group12 into game-logic 2021-11-14 02:12:40 -06:00
4639bb355c Make ships real 2021-11-14 02:12:31 -06:00
hpham474
6aca8c54a3 Added texture atlas 2021-11-14 02:09:12 -06:00
hpham474
50f087061e Added getExtent() function for ships 2021-11-14 01:21:40 -06:00
tommy-l-ngo
e5b7ac7662 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 00:44:20 -06:00
tommy-l-ngo
16b0e57170 idk 2021-11-14 00:44:13 -06:00
Chance Atkinson
5a1f74467a Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 00:44:08 -06:00
Chance Atkinson
d52234d63c Added my win button back :)
wooooooo win butttoooonnnn
2021-11-14 00:43:32 -06:00
tommy-l-ngo
be4429a717 Merge branch 'game-logic' of https://github.com/StatewideInk/Group12 into game-logic 2021-11-14 00:43:23 -06:00
tommy-l-ngo
6577c2551b made dark theme 2021-11-14 00:43:14 -06:00
Chance Atkinson
9bffd36a07 restart button is invisible 2021-11-14 00:39:26 -06:00