Commit graph

Select branches

Hide pull requests

main

Mono Color

• defb92abd5 fix project settings main Jacob Janzen 2024-11-17 15:52:51 -06:00
• 03efa21bae Merge branch 'main' into clippette-dialogue Zoey Kitt 2024-11-17 15:51:37 -06:00
• 4fc8ff1304 I forgor Zoey Kitt 2024-11-17 15:48:09 -06:00
• 3f61a10428 Ad message Zoey Kitt 2024-11-17 15:35:22 -06:00
• 67371be013 fix for real this time Jacob Janzen 2024-11-17 15:32:50 -06:00
• 8a14702e10 undo skew Jacob Janzen 2024-11-17 15:30:55 -06:00
• 2fdd1ee74c fix things i think Jacob Janzen 2024-11-17 15:30:42 -06:00
• f1c476b3f1 score insanity Jacob Janzen 2024-11-17 15:25:49 -06:00
• def01c3c37 Lose money when losing fishing :( Zoey Kitt 2024-11-17 15:18:56 -06:00
• a0e3df5b4c Merge branch 'main' into fully_generalized_fish Zoey Kitt 2024-11-17 15:10:46 -06:00
• cd2144e9bb THE WHALE Zoey Kitt 2024-11-17 13:41:01 -06:00
• 6b563d96d5 Oops I only committed the sounds (what is git amend) Zoey Kitt 2024-11-17 13:35:03 -06:00
• ac49d94178 The rest of the guys Zoey Kitt 2024-11-17 13:33:11 -06:00
• 8102749611 Salmon Zoey Kitt 2024-11-17 13:13:41 -06:00
• 5283cc1d09 Proof of concept (specialized generalized fish) Zoey Kitt 2024-11-17 15:03:36 -06:00
• 2060290b52 Don't spawn microgames until Clippette's done talking Zoey Kitt 2024-11-17 14:56:47 -06:00
• d267483d31 add losing sound effect Jacob Janzen 2024-11-17 14:54:34 -06:00
• 4835e089da Spawn ads again Zoey Kitt 2024-11-17 14:50:45 -06:00
• 1e397ffe7d Add the first fish to the list of fish seen Zoey Kitt 2024-11-17 14:48:56 -06:00
• 8ccae5aad9 add losing money Jacob Janzen 2024-11-17 14:46:56 -06:00
• 9f7327a275 Multiple stock tickers! Zoey Kitt 2024-11-17 14:43:30 -06:00
• 0f1b81588b Make the fishing minigame communicate the fish caught on win Zoey Kitt 2024-11-17 14:06:00 -06:00
• 88172d8807 THE WHALE Zoey Kitt 2024-11-17 13:41:01 -06:00
• fb7358db16 Merge branch 'main' into fully_generalized_fish Zoey Kitt 2024-11-17 13:35:51 -06:00
• 1fb86dcad5 Oops I only committed the sounds (what is git amend) Zoey Kitt 2024-11-17 13:35:03 -06:00
• c4acb25795 moby-dick sound Jacob Janzen 2024-11-17 13:33:12 -06:00
• c53e6a2afd The rest of the guys Zoey Kitt 2024-11-17 13:33:11 -06:00
• cdbde9eb18 add really bad music Jacob Janzen 2024-11-17 13:23:27 -06:00
• a26bbf691c Salmon Zoey Kitt 2024-11-17 13:13:41 -06:00
• 1b7ea447c0 Proof of concept (specialized generalized fish) Zoey Kitt 2024-11-17 13:06:44 -06:00
• 49da4da8a2 Yeah whatever Zoey Kitt 2024-11-17 12:53:26 -06:00
• c9a135ab2e Merge branch 'main' into clippette-dialogue Zoey Kitt 2024-11-17 12:52:33 -06:00
• 8a930109a6 "" Zoey Kitt 2024-11-17 12:52:06 -06:00
• 9d1d070385 Good attempt at making the speech bubble disappear :) Zoey Kitt 2024-11-17 12:47:53 -06:00
• 8cc3da68ed Botched attempt at making the speech bubble disappear Zoey Kitt 2024-11-17 12:45:03 -06:00
• 3c7d4d1b16 add fish Jacob Janzen 2024-11-17 12:41:39 -06:00
• 70cd632978 Give Clippette some good old fashioned intro dialogue Zoey Kitt 2024-11-17 12:42:19 -06:00
• 2546d01820 Balance Changes Zoey Kitt 2024-11-17 11:46:04 -06:00
• a969c365be Integrate game over screen oh god Zoey Kitt 2024-11-17 11:41:57 -06:00
• 1bba8f26cb Fix score display Zoey Kitt 2024-11-17 11:23:49 -06:00
• b2acf9c2f4 Balance Changes Zoey Kitt 2024-11-17 11:21:48 -06:00
• a5e2c5cf4b Make the title screen the main scene Zoey Kitt 2024-11-17 11:13:39 -06:00
• 574bc85d7e Make the title screen go to the initial fishing screen Zoey Kitt 2024-11-17 11:12:53 -06:00
• 05edc5e090 Merge branch 'main-window' Zoey Kitt 2024-11-16 20:45:46 -06:00
• 73f8e11d93 add gameover screen Jacob Janzen 2024-11-16 20:01:00 -06:00
• 68459cebbc Merge branch 'main' into main-window Zoey Kitt 2024-11-16 20:00:51 -06:00
• 47c6fcc3b0 Restart the silliness after winning fishing Zoey Kitt 2024-11-16 19:56:44 -06:00
• 760420412d Add ROBLOX_OOF.MP3 Zoey Kitt 2024-11-16 19:49:31 -06:00
• a472a32117 Make the fishing minigame transition into stonks Zoey Kitt 2024-11-16 19:38:06 -06:00
• 87d20544d5 title screen Jacob Janzen 2024-11-16 19:30:09 -06:00
• 162f6ba656 You caught GAR! Zoey Kitt 2024-11-16 19:05:07 -06:00
• d74ecb966b Oh my god now it's actually just a fishing game Zoey Kitt 2024-11-16 18:43:05 -06:00
• 271eb69e50 Disable microgame spawning :( (It gets worse before it gets a lot worse) Zoey Kitt 2024-11-16 18:36:52 -06:00
• 977521849b Make the main window just be a stock ticker Zoey Kitt 2024-11-16 18:33:37 -06:00
• 518fa16866 Fiiiiiiine I'll just make Clippette visible instead of instantiating her Zoey Kitt 2024-11-16 18:26:50 -06:00
• 21609e84f2 Finish migration I think? I got distracted Zoey Kitt 2024-11-16 17:46:13 -06:00
• 7546c31057 Move score window to a separate node, theoretically Zoey Kitt 2024-11-16 17:37:18 -06:00
• 77e45cf5cc Merge branch 'main' into main-window Zoey Kitt 2024-11-16 17:32:25 -06:00
• 2ef6e5fe52 Did a wittle fucky wucky :3 Zoey Kitt 2024-11-16 17:31:42 -06:00
• 9f505c69ed Merge branch 'main' into main-window Zoey Kitt 2024-11-16 17:31:04 -06:00
• 0806d80955 Merge branch 'main' into bonk Zoey Kitt 2024-11-16 17:30:09 -06:00
• 332e3aced7 3D rotating fish gif!!! Zoey Kitt 2024-11-16 16:35:46 -06:00
• b88ab51901 Yeah that looks nice enough Zoey Kitt 2024-11-16 16:19:17 -06:00
• 2a1cc7ed46 Resize main window Zoey Kitt 2024-11-16 15:58:14 -06:00
• 9961be9780 Move the main window under Clipette's text box Zoey Kitt 2024-11-16 15:51:49 -06:00
• 4e7da00304 Add Clippette to the main scene Zoey Kitt 2024-11-16 15:27:53 -06:00
• 44e036f8b7 Fix Dark Souls text layering Zoey Kitt 2024-11-16 17:26:43 -06:00
• d01f8f1cce timing Jacob Janzen 2024-11-16 17:18:30 -06:00
• 98c0e0e97e Make stonk window shake upon bankruptcy Zoey Kitt 2024-11-16 17:18:21 -06:00
• 9ab6f6e209 Haha bonk I think Zoey Kitt 2024-11-16 17:09:11 -06:00
• e97061b33f 3D rotating fish gif!!! Zoey Kitt 2024-11-16 16:35:46 -06:00
• ab47e086ec Yeah that looks nice enough Zoey Kitt 2024-11-16 16:19:17 -06:00
• 605873fa38 Resize main window Zoey Kitt 2024-11-16 15:58:14 -06:00
• 68bfe89758 Move the main window under Clipette's text box Zoey Kitt 2024-11-16 15:51:49 -06:00
• c92e9a17a8 Add Clippette to the main scene Zoey Kitt 2024-11-16 15:27:53 -06:00
• 0b471de7ce Merge branch 'fishin' Jacob Janzen 2024-11-16 16:38:49 -06:00
• 1e4c8bc174 add complete fishing minigame Jacob Janzen 2024-11-16 16:38:29 -06:00
• a4a7851542 3D rotating fish gif!!! Zoey Kitt 2024-11-16 16:35:46 -06:00
• 24d0478382 Yeah that looks nice enough Zoey Kitt 2024-11-16 16:19:17 -06:00
• f3efe1b3c7 Resize main window Zoey Kitt 2024-11-16 15:58:14 -06:00
• ec5c89a766 Move the main window under Clipette's text box Zoey Kitt 2024-11-16 15:51:49 -06:00
• 9c9c4c24f5 Add Clippette to the main scene Zoey Kitt 2024-11-16 15:27:53 -06:00
• 97864e7179 Rick roll the player if they click an ad Zoey Kitt 2024-11-16 14:39:02 -06:00
• 8e7b7e1fc7 Check out this special offer [Click Here] Zoey Kitt 2024-11-16 14:38:01 -06:00
• 614d5811cf Merge branch 'main' into globaaaals Zoey Kitt 2024-11-16 14:16:48 -06:00
• aacf95aab9
  add clippy (#3) jacob janzen 2024-11-16 14:16:06 -06:00
• c8ae63405f Oh my god it's gameplay Zoey Kitt 2024-11-16 14:03:25 -06:00
• 1a3455015d Buying takes from your net worth! Zoey Kitt 2024-11-16 14:01:13 -06:00
• 954ac4ef43 Remove print statements, nothing else, nope made no mistakes none Zoey Kitt 2024-11-16 13:28:07 -06:00
• 5776af6ad1 Print transaction values Zoey Kitt 2024-11-16 13:24:14 -06:00
• abf562ee7d Add transaction signal Zoey Kitt 2024-11-16 13:16:05 -06:00
• 606c1714c6 You can now press G to meow Zoey Kitt 2024-11-16 12:46:26 -06:00
• 4618fc1952 Add sound effects (and slightly modify the stock ticker..?) Zoey Kitt 2024-11-16 12:39:22 -06:00
• 9ba8e86a79 Merge branch 'main' into ads Zoey Kitt 2024-11-16 12:32:03 -06:00
• a2362a3b42 Change ad spawn time back to 10 seconds (sad...) Zoey Kitt 2024-11-16 12:10:08 -06:00
• dd480f4e65 Ads baby lessgo sell that ad space Zoey Kitt 2024-11-16 12:07:31 -06:00
• 4e03ecf780 Remove cruft Zoey Kitt 2024-11-16 11:49:09 -06:00
• 9eaa524fba The ad scales yay Zoey Kitt 2024-11-16 11:47:54 -06:00
• 1a6dd05f13
  Stonks for real this time (#2) jacob janzen 2024-11-16 11:43:41 -06:00
• 99f3bb77b9 Attempt to scale the ad to the window (this commit is actually a stash) Zoey Kitt 2024-11-16 11:24:33 -06:00