Commit graph

126 commits

Author SHA1 Message Date
Jacob Janzen
defb92abd5 fix project settings 2024-11-17 15:52:51 -06:00
Zoey Kitt
03efa21bae Merge branch 'main' into clippette-dialogue 2024-11-17 15:51:37 -06:00
Zoey Kitt
4fc8ff1304 I forgor 2024-11-17 15:48:09 -06:00
Zoey Kitt
3f61a10428 Ad message 2024-11-17 15:35:22 -06:00
Jacob Janzen
67371be013 fix for real this time 2024-11-17 15:32:50 -06:00
Jacob Janzen
8a14702e10 undo skew 2024-11-17 15:30:55 -06:00
Jacob Janzen
2fdd1ee74c fix things i think 2024-11-17 15:30:42 -06:00
Jacob Janzen
f1c476b3f1 score insanity 2024-11-17 15:25:49 -06:00
Zoey Kitt
def01c3c37 Lose money when losing fishing :( 2024-11-17 15:18:56 -06:00
Zoey Kitt
a0e3df5b4c Merge branch 'main' into fully_generalized_fish 2024-11-17 15:10:46 -06:00
Zoey Kitt
cd2144e9bb THE WHALE 2024-11-17 15:03:55 -06:00
Zoey Kitt
6b563d96d5 Oops I only committed the sounds (what is git amend) 2024-11-17 15:03:55 -06:00
Zoey Kitt
ac49d94178 The rest of the guys 2024-11-17 15:03:55 -06:00
Zoey Kitt
8102749611 Salmon 2024-11-17 15:03:55 -06:00
Zoey Kitt
5283cc1d09 Proof of concept (specialized generalized fish) 2024-11-17 15:03:36 -06:00
Zoey Kitt
2060290b52 Don't spawn microgames until Clippette's done talking 2024-11-17 14:56:47 -06:00
Jacob Janzen
d267483d31 add losing sound effect 2024-11-17 14:54:34 -06:00
Zoey Kitt
4835e089da Spawn ads again 2024-11-17 14:50:45 -06:00
Zoey Kitt
1e397ffe7d Add the first fish to the list of fish seen 2024-11-17 14:48:56 -06:00
Jacob Janzen
8ccae5aad9 add losing money 2024-11-17 14:46:56 -06:00
Zoey Kitt
9f7327a275 Multiple stock tickers! 2024-11-17 14:43:30 -06:00
Zoey Kitt
0f1b81588b Make the fishing minigame communicate the fish caught on win 2024-11-17 14:06:00 -06:00
Zoey Kitt
88172d8807 THE WHALE 2024-11-17 13:41:01 -06:00
Zoey Kitt
fb7358db16 Merge branch 'main' into fully_generalized_fish 2024-11-17 13:35:51 -06:00
Zoey Kitt
1fb86dcad5 Oops I only committed the sounds (what is git amend) 2024-11-17 13:35:03 -06:00
Jacob Janzen
c4acb25795 moby-dick sound 2024-11-17 13:33:12 -06:00
Zoey Kitt
c53e6a2afd The rest of the guys 2024-11-17 13:33:11 -06:00
Jacob Janzen
cdbde9eb18 add really bad music 2024-11-17 13:23:27 -06:00
Zoey Kitt
a26bbf691c Salmon 2024-11-17 13:13:41 -06:00
Zoey Kitt
1b7ea447c0 Proof of concept (specialized generalized fish) 2024-11-17 13:06:44 -06:00
Zoey Kitt
49da4da8a2 Yeah whatever 2024-11-17 12:53:26 -06:00
Zoey Kitt
c9a135ab2e Merge branch 'main' into clippette-dialogue 2024-11-17 12:52:33 -06:00
Zoey Kitt
8a930109a6 "" 2024-11-17 12:52:06 -06:00
Zoey Kitt
9d1d070385 Good attempt at making the speech bubble disappear :) 2024-11-17 12:47:53 -06:00
Zoey Kitt
8cc3da68ed Botched attempt at making the speech bubble disappear 2024-11-17 12:45:03 -06:00
Jacob Janzen
3c7d4d1b16 add fish 2024-11-17 12:42:44 -06:00
Zoey Kitt
70cd632978 Give Clippette some good old fashioned intro dialogue 2024-11-17 12:42:19 -06:00
Zoey Kitt
2546d01820 Balance Changes 2024-11-17 11:46:04 -06:00
Zoey Kitt
a969c365be Integrate game over screen oh god 2024-11-17 11:41:57 -06:00
Zoey Kitt
1bba8f26cb Fix score display 2024-11-17 11:23:49 -06:00
Zoey Kitt
b2acf9c2f4 Balance Changes 2024-11-17 11:21:48 -06:00
Zoey Kitt
a5e2c5cf4b Make the title screen the main scene 2024-11-17 11:13:39 -06:00
Zoey Kitt
574bc85d7e Make the title screen go to the initial fishing screen 2024-11-17 11:12:53 -06:00
Zoey Kitt
05edc5e090 Merge branch 'main-window' 2024-11-16 20:45:46 -06:00
Jacob Janzen
73f8e11d93 add gameover screen 2024-11-16 20:01:00 -06:00
Zoey Kitt
68459cebbc Merge branch 'main' into main-window 2024-11-16 20:00:51 -06:00
Zoey Kitt
47c6fcc3b0 Restart the silliness after winning fishing 2024-11-16 19:56:44 -06:00
Zoey Kitt
760420412d Add ROBLOX_OOF.MP3 2024-11-16 19:49:31 -06:00
Zoey Kitt
a472a32117 Make the fishing minigame transition into stonks 2024-11-16 19:38:06 -06:00
Jacob Janzen
87d20544d5 title screen 2024-11-16 19:30:09 -06:00