Chaotic Beta Merge - #50

Open

glowkate wants to merge 37 commits into

Toby222:devfrom

glowkate:chaotic

Commits on Dec 7, 2025

Added components for the Chaotic ocean.
glowkate
committed
bcfbbf3

Commits on Dec 20, 2025

Changed stylistic issues
glowkate
committed
98dd790
More style tab edits woo
glowkate
committed
2aa9506
this time for sure
glowkate
committed
dca43c7
Fixed syntax error
glowkate
committed
4eadab4
Adding spaces to comments and adding a missing trailing comma
glowkate
committed
333d824
removed trailing spaces
glowkate
committed
0766b61
removed more trailing spaces ;-;
glowkate
committed
7bf9577
Single ] removal, prob a better way to do this
glowkate
committed
7bf902c
more style fixes
glowkate
committed
a2c2e0d
More smol things
glowkate
committed
f7b9080
please let this be the last one for now
glowkate
committed
aebeeeb

Commits on Jan 15, 2026

Progressed introducing core resources for Chaotic ocean into game.
glowkate
committed
27bd6c1

Commits on Jan 17, 2026

Implimented chaotic world selection from gateway, and opening fake
glowkate
committed
bc614aa

Commits on Jan 18, 2026

Progressed on tech for Chaotic Ocean
glowkate
committed
e030db0

Commits on Jan 19, 2026

Fixed syntax error and added a new tech
glowkate
committed
436ff2c

Commits on Jan 25, 2026

Changed turtle sweepers into turtle transporters, and made a bunch of
glowkate
committed
68a8e8a

Commits on Jan 26, 2026

Added buttons for toggling echo production. They don't work yet.
glowkate
committed
9c45a5b

Commits on Jan 28, 2026

Shift Echo toggles now change Echo production.
glowkate
committed
7f2fc2d

Commits on Feb 8, 2026

Added more flavor text for purchasing snails and turtles.
glowkate
committed
d0dc901

Commits on Feb 21, 2026

Added more upgrades and replaced tabs with spaces. Tweeked cost of
glowkate
committed
6d7cc84

Commits on Jun 22, 2026

Branch testing
glowkate
committed
4b57bf5
Merge branch 'dev' into dev
glowkate
authored
adf6186

Commits on Aug 5, 2026

Merge branch 'dev' of https://github.com/Toby222/SharkGame into chaotic
glowkate
committed
ea3fd36

Commits on Aug 6, 2026

Fixed sprite for the fake catch fish.
glowkate
committed
3f8ab82

Commits on Aug 11, 2026

Merge pull request #3 from Toby222/dev
glowkate
authored
4a1d0bc

Commits on Aug 27, 2026

Merge branch 'Toby222:dev' into chaotic
glowkate
authored
1b886c5

Commits on Aug 29, 2026

Merge branch 'Toby222:dev' into chaotic
glowkate
authored
30deb30
Merge branch 'dev' into chaotic
glowkate
committed
3192492

Commits on Sep 2, 2026

Commits on Sep 4, 2026

Run formatter
Toby222
committed
4055c73
Added changes requested by Toby222
glowkate
committed
f118992
Removed Testfile.txt
glowkate
committed
4f56e0f

Commits on Sep 6, 2026

Removed lingering conflict resolution markers and fixed stylistic
glowkate
committed
2d19019

Commits on Sep 8, 2026

Fixed spelling/grammar errors
glowkate
committed
77581e3