Commit Graph

Select branches

Hide Pull Requests

dennis/hitbox

dev/shop

feature/age

feature/age-hunger-update

feature/age-persist

main

nathannlu/balance-api

nathannlu/canvas-buttons

nathannlu/coins-notif

nathannlu/dev

nathannlu/endless-runner

nathannlu/minor-ui

nathannlu/new-sprite

nathannlu/pet-talk

nathannlu/prettier

vindennt/feature/endless-runner-physics

vindennt/feature/flappy-pets

vindennt/feature/hunger

vindennt/feature/pet-the-dog

vindennt/refactor

Mono Color

• 9dda63fdc1 buggedfeature: hunger endpoint method not allowed feature/age-hunger-update dennistruong 2024-03-31 16:54:38 -07:00
• f6f1223c55 Merge pull request #22 from nathannlu/dennis/hitbox feature/age Nathan 2024-03-31 16:22:28 -07:00
• 08f19adf57 hide buttons dennistruong 2024-03-31 16:15:51 -07:00
• e82dc4d0de Fixed chdir wrong dir main Nathan 2024-03-31 15:29:07 -07:00
• 2353c046d9 Added food consumed Nathan 2024-03-31 15:22:48 -07:00
• 93d2356550 Merge pull request #21 from nathannlu/feature/age-persist Nathan 2024-03-31 15:14:56 -07:00
• f49e6bd61f fix: removes comment dennis/hitbox dennistruong 2024-03-31 15:09:36 -07:00
• 43892f5caa added: hitbox size adapts based on age dennistruong 2024-03-31 15:08:39 -07:00
• d4e50d4fe4 persists pet feature/age-persist Nathan 2024-03-31 15:08:21 -07:00
• 120e8d70eb added baby Nathan 2024-03-31 14:44:16 -07:00
• d1e3c5fcd2 Added start render Nathan 2024-03-18 23:31:53 -07:00
• a3a40b5cff Added open shop event Nathan 2024-03-18 11:41:51 -07:00
• 5f46373f9e Fix shop event Nathan 2024-03-18 11:20:40 -07:00
• 4df227b48c Merge pull request #19 from nathannlu/dev/shop Nathan 2024-03-18 10:40:49 -07:00
• 114d330721 Merge branch 'main' into dev/shop dev/shop Nathan 2024-03-17 01:13:56 -07:00
• 5fbf4c0b13 Merge pull request #18 from nathannlu/vindennt/refactor Nathan 2024-03-17 01:12:06 -07:00
• e9a3125dfe Added inventory & user object Nathan 2024-03-17 01:11:17 -07:00
• 200930f46a Merge branch 'main' into dev/shop Nathan 2024-03-16 23:59:38 -07:00
• 5c25ca10d6 Fixed storage path Nathan 2024-03-16 23:54:35 -07:00
• 3691405732 Merge branch 'main' into dev/shop Nathan 2024-03-16 23:49:30 -07:00
• 309b33ff06 Reformat Nathan 2024-03-16 23:47:50 -07:00
• 862b372c2d Updated husky commands to fix prettier formatting after commit Nathan 2024-03-16 23:47:36 -07:00
• eb13d99cbf restored feed function Nathan 2024-03-16 23:45:01 -07:00
• 3a10de9b22 Merge pull request #16 from nathannlu/vindennt/feature/hunger Nathan 2024-03-16 23:43:19 -07:00
• a15937e076 Item names Nathan 2024-03-16 23:42:47 -07:00
• 9849495b30 Item names Nathan 2024-03-16 23:42:31 -07:00
• 2a53cd8b45 reformat Nathan 2024-03-16 17:27:32 -07:00
• 3b7e62643d Basic shop UI Nathan 2024-03-16 17:26:56 -07:00
• 73ef7a4dc3 Update README.md Nathan 2024-03-16 14:43:19 -07:00
• 0ab5f967cd Added autoupdate Nathan 2024-03-16 13:34:25 -07:00
• e6c073eb8e Merge branch 'main' into vindennt/feature/hunger vindennt/feature/hunger Nathan 2024-03-16 12:52:46 -07:00
• 9e9c9d5c59 refactor: endless runner nad flapyp pets game extend minigames base class vindennt/refactor dennistruong 2024-03-16 02:04:52 -07:00
• b08a807ff9 refactor: minigames import Obstacle class dennistruong 2024-03-16 01:38:01 -07:00
• f4e43ce81a refactor: moved games to minigame folder dennistruong 2024-03-16 01:32:54 -07:00
• 4fbb1b876d Merge pull request #17 from nathannlu/nathannlu/coins-notif Nathan 2024-03-16 01:16:11 -07:00
• d523ba449b formatting nathannlu/coins-notif Nathan 2024-03-16 01:09:06 -07:00
• 9b14529026 refactor: renaming dennistruong 2024-03-16 00:59:28 -07:00
• 0eab0a5132 feature: hunger depletion over time dennistruong 2024-03-16 00:59:12 -07:00
• 77f098e4a7 Added coin earning to games Nathan 2024-03-16 00:58:34 -07:00
• d1033a1db4 Added coins notification + user balance display Nathan 2024-03-16 00:42:46 -07:00
• c6f1d4a748 Merge pull request #15 from nathannlu/nathannlu/prettier Nathan 2024-03-16 00:06:04 -07:00
• d941ec58e8 Merge pull request #14 from nathannlu/nathannlu/balance-api Nathan 2024-03-16 00:05:54 -07:00
• 70e06b3fa6 Added prettier to pre-commit hook + reformatted nathannlu/prettier Nathan 2024-03-15 23:32:43 -07:00
• b343d17f8b Added user balance + earn coins on image gen nathannlu/balance-api Nathan 2024-03-15 23:24:22 -07:00
• 90233eccbb refactor: code cleanup dennistruong 2024-03-15 21:53:58 -07:00
• 5855105693 refactor: links hunger to pet id dennistruong 2024-03-15 21:52:18 -07:00
• 4a1add1904 refactor: changes pointBar constructor paramter into an object dennistruong 2024-03-15 21:47:23 -07:00
• 9bfaf6e992 feature: pointBar backgrounds dennistruong 2024-03-15 21:41:16 -07:00
• f86f7b464e feature: adds label to hunger pointBar dennistruong 2024-03-15 21:09:02 -07:00
• e06120fb35 fix: makes point bar vertical and fixes spacing dennistruong 2024-03-15 19:34:37 -07:00
• 8889c127dc feature: gui element rendering and points bar rendering dennistruong 2024-03-15 19:34:28 -07:00
• 55907b9bba feature: pointBar rendering per point dennistruong 2024-03-15 17:04:03 -07:00
• a7a7e0ae94 feature: pointBar class for gui dennistruong 2024-03-15 16:59:14 -07:00
• 6692a9b6aa feature: pet has hunger points dennistruong 2024-03-15 16:44:16 -07:00
• 0aa906d1e3 fix: removes unecessary repeated object creation dennistruong 2024-03-15 16:43:35 -07:00
• 0135d38cb5 styling: minor linting dennistruong 2024-03-15 16:28:01 -07:00
• 9b02fc28b1 Merge pull request #13 from nathannlu/vindennt/feature/flappy-pets Dennis Truong 2024-03-15 00:21:38 -07:00
• cdc77cf0ea Merge pull request #12 from nathannlu/nathannlu/pet-talk Nathan 2024-03-14 17:47:40 -07:00
• c69ce1375c Updated params nathannlu/pet-talk Nathan 2024-03-14 12:31:08 -07:00
• 8a500ed062 feature: adds scoring when pass middle of obstacle and fixes spawn rate vindennt/feature/flappy-pets dennistruong 2024-03-14 02:39:05 -07:00
• fc2c77789b fix: adjusts obsacle spacing to be more fair dennistruong 2024-03-14 02:29:56 -07:00
• 5e3c57fd7f feature: flappy bird pipe obstacles dennistruong 2024-03-14 02:25:33 -07:00
• 227041e05b Added chat bubbles Nathan 2024-03-14 01:58:19 -07:00
• b1a0007342 feature: dog flapping movement with ceiling collision dennistruong 2024-03-14 01:35:15 -07:00
• edce5d0d3d fix: lets initial x position of pet be set dennistruong 2024-03-14 01:34:20 -07:00
• 6915642b34 refactor: created separate button to initiate flappy game dennistruong 2024-03-14 01:18:57 -07:00
• 2e5247f8ef Merge pull request #11 from nathannlu/nathannlu/minor-ui Nathan 2024-03-14 01:07:32 -07:00
• fdccfa04b1 Improved image quality nathannlu/minor-ui Nathan 2024-03-14 01:07:07 -07:00
• 81f65e3ed3 Set default stage size Nathan 2024-03-14 00:54:59 -07:00
• 97ae756ebd Deprecated GIF module Nathan 2024-03-14 00:54:34 -07:00
• 5779929f5c refactor: renames gameButton to Hop Dog dennistruong 2024-03-14 00:42:29 -07:00
• c3e21494f1 Merge pull request #10 from nathannlu/vindennt/feature/pet-the-dog Nathan 2024-03-13 23:27:16 -07:00
• 1ecea55042 Merge pull request #9 from nathannlu/vindennt/feature/endless-runner-physics Nathan 2024-03-13 23:26:31 -07:00
• b6ddc4f74c feature: can pet the dog vindennt/feature/pet-the-dog dennistruong 2024-03-13 23:06:39 -07:00
• 88d703b28f feature: gameObjects have clickable behaviour dennistruong 2024-03-13 23:06:29 -07:00
• 2b6436a94e refactor: removes redundant comments vindennt/feature/endless-runner-physics dennistruong 2024-03-13 19:48:05 -07:00
• 9068ce6873 feature: adaptive obstacle speed based on score dennistruong 2024-03-13 19:26:40 -07:00
• d498d3b1a9 feature: adds simple scoring based on obstacles removed dennistruong 2024-03-13 19:12:41 -07:00
• 41140510b7 feature: tweaked obstacle spawning to have fair cooldowns dennistruong 2024-03-13 19:08:03 -07:00
• 0c308eb526 refactor: removed keyHold tracking and made jump on buttonDown dennistruong 2024-03-13 18:54:30 -07:00
• fea5830400 feature: jumping physics with static height dennistruong 2024-03-13 17:38:37 -07:00
• c4d38912d1 Update README.md Nathan 2024-03-11 12:15:43 -07:00
• cdcaf7cda2 Update README.md Nathan 2024-03-11 11:57:36 -07:00
• 467a891ce2 Merge pull request #8 from nathannlu/nathannlu/new-sprite Nathan 2024-03-11 11:14:43 -07:00
• a56f4a8b3a Added new sprite nathannlu/new-sprite Nathan 2024-03-11 11:14:23 -07:00
• db321db11c Fixed fps issue Nathan 2024-03-11 01:14:07 -07:00
• 6375a30c2d Merge pull request #7 from nathannlu/nathannlu/endless-runner Nathan 2024-03-10 23:00:14 -07:00
• 7350026609 v1 of minigame nathannlu/endless-runner Nathan 2024-03-10 22:58:55 -07:00
• 4ece497f0e Added default styles Nathan 2024-03-10 22:58:16 -07:00
• 5b464d8c80 Cleanup game Nathan 2024-03-10 19:15:27 -07:00
• ce9233bc02 Add backgroundColor to button api Nathan 2024-03-10 19:12:44 -07:00
• 8ef58104f4 Merge branch 'main' into nathannlu/endless-runner Nathan 2024-03-10 18:39:12 -07:00
• 6530221faa Merge pull request #6 from nathannlu/nathannlu/canvas-buttons Nathan 2024-03-10 18:29:18 -07:00
• 848fd76e8d Added stylized buttons nathannlu/canvas-buttons Nathan 2024-03-10 18:27:57 -07:00
• 14810f78fd Basic Nathan 2024-03-09 19:20:07 -08:00
• ed7f5c9e9b basic Nathan 2024-03-09 17:25:30 -08:00
• ffbb62e8fa Merge pull request #5 from nathannlu/nathannlu/dev Nathan 2024-03-09 16:50:15 -08:00
• 9d778f233d minor fix nathannlu/dev Nathan 2024-03-09 16:49:35 -08:00
• e9d308d709 Merge pull request #4 from nathannlu/nathannlu/dev Nathan 2024-03-09 16:48:40 -08:00
• b7b605d92b Added food event Nathan 2024-03-09 16:48:12 -08:00