mevulfmp3
/
MuseumGame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 5ce4ada43d added credits main Matthew Kalahiki 2021-05-05 07:56:59 -0500
  • 90dcd5d211 Fixed doors in winter boss level Ivy 2021-05-05 07:44:02 -0500
  • 5b8eda8aff Final Fix Before Class thoopchuk26 2021-05-05 07:16:23 -0500
  • 621f3fbf29 Fleurite animation meta data Unity decided to change when I closed it Mars Paton 2021-05-05 01:45:40 -0500
  • b52acec939 Fleurite will now do its die animation then die Mars Paton 2021-05-05 01:44:07 -0500
  • 62930f9c38 Fleurite animation Mars Paton 2021-05-05 01:10:34 -0500
  • a0bff0da26 Merge branch 'main' of https://github.com/SpenThompson/MuseumGame into main Mars Paton 2021-05-05 00:45:26 -0500
  • 303d3b6135 Fleurite overhall Mars Paton 2021-05-05 00:45:15 -0500
  • 57a10d2820 help menu Matthew Kalahiki 2021-05-05 00:43:55 -0500
  • 24eef1d260 removed art from museum Matthew Kalahiki 2021-05-04 23:39:00 -0500
  • c5c4231321 gallery indicates if painting is found or not found Matthew Kalahiki 2021-05-04 23:10:50 -0500
  • 0529e48925 more music Matthew Kalahiki 2021-05-04 23:00:55 -0500
  • dd09329cb9 music updated Matthew Kalahiki 2021-05-04 23:00:05 -0500
  • f7fd44a4dc gallery indicates if art was collected Matthew Kalahiki 2021-05-04 22:54:06 -0500
  • ed82fee87b removed background grid in demo Matthew Kalahiki 2021-05-04 22:35:48 -0500
  • a231771ecc Auto stash before merge of "main" and "origin/main" Matthew Kalahiki 2021-05-04 22:28:09 -0500
  • 88f2560a07 Fixed double jump powerup Ivy 2021-05-04 22:27:10 -0500
  • e971a41718 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 22:21:03 -0500
  • e2dfc28741 Fixed build settings Spencer 2021-05-04 21:54:37 -0500
  • a5c023de33 winter background Matthew Kalahiki 2021-05-04 22:13:12 -0500
  • 659e816438 Backgrounds Added Spencer 2021-05-04 21:54:37 -0500
  • 7f8e402f99 All paintings in levels Matthew Kalahiki 2021-05-04 21:47:59 -0500
  • ee094f69cf winter level in museum Matthew Kalahiki 2021-05-04 20:56:48 -0500
  • a4f2148b38 Rest of the Pixelarts Added Spencer 2021-05-04 20:38:18 -0500
  • 36d1227f65 fix powerup Matthew Kalahiki 2021-05-04 20:37:42 -0500
  • 7616385923 Main Menu Edits and hopefully fixing block push bug thoopchuk26 2021-05-04 20:29:32 -0500
  • dc2dfeafce Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 20:19:47 -0500
  • 40faa615b0 Changes to backgrounds Ivy 2021-05-04 20:19:21 -0500
  • c5b3f7a64e Minor Menu Changes thoopchuk26 2021-05-04 20:17:06 -0500
  • d3abd4efc1 Auto stash before merge of "main" and "origin/main" thoopchuk26 2021-05-04 20:02:39 -0500
  • 56799ba33d fixed some things Matthew Kalahiki 2021-05-04 19:55:45 -0500
  • d890dedee4 Winter levels Matthew Kalahiki 2021-05-04 19:47:13 -0500
  • 36d8be215c Fixed dog level doors Ivy 2021-05-04 17:51:34 -0500
  • dcd18af8de Added room for picking up shrink powerup Ivy 2021-05-04 17:39:51 -0500
  • 6bea76f7d1 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 16:58:33 -0500
  • 5cfe2bce40 More work on dog level Ivy 2021-05-04 16:58:20 -0500
  • f3f556f9a4 start of winter Matthew Kalahiki 2021-05-04 16:22:55 -0500
  • b436427c87 Minor Menu Edits thoopchuk26 2021-05-04 16:21:16 -0500
  • 37de504ccf Main Menu Changes thoopchuk26 2021-05-04 16:16:26 -0500
  • c4184305cb Snowman Idle Added Spencer 2021-05-04 16:04:51 -0500
  • b07b90a1b6 Added Menu Images thoopchuk26 2021-05-04 16:02:46 -0500
  • 77268a989b Adding extra door to dog tunnel Ivy 2021-05-04 15:28:16 -0500
  • c9fcec1864 Adding extra door to dog tunnel Ivy 2021-05-04 15:28:16 -0500
  • dae9498d90 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 15:15:14 -0500
  • 144abcb765 Fixed bug with one way platforms Ivy 2021-05-04 15:15:11 -0500
  • 13ee5ca6da Merge branch 'main' of https://github.com/SpenThompson/MuseumGame into main Mars Paton 2021-05-04 15:12:59 -0500
  • 7a7ce1b6c8 Updated Fleurite's damage parameters Mars Paton 2021-05-04 15:12:43 -0500
  • 362f2bab21 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 15:05:22 -0500
  • 3923863f0d More work on dog tunnel level Ivy 2021-05-04 15:04:54 -0500
  • 7e74cf8443 Winter Tilepallet made Matthew Kalahiki 2021-05-04 14:51:42 -0500
  • e8c7bc13dd Working on dog tunnel Ivy 2021-05-04 14:28:40 -0500
  • ac79fc8e61 Merge remote-tracking branch 'origin/main' into main Matthew Kalahiki 2021-05-04 13:57:22 -0500
  • 2a8a6eee8a Winter Tileset Added Spencer 2021-05-04 13:54:06 -0500
  • 87f24b38d1 Tweaks to new dog spawn Ivy 2021-05-04 13:47:31 -0500
  • 898fb0411e Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 13:13:55 -0500
  • ba7bc799c9 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 13:13:11 -0500
  • e6b5453226 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 13:13:11 -0500
  • 60f296c060 Updating levels to use new tileset Ivy 2021-05-04 13:12:22 -0500
  • 93e2447f4b jungle backgrounds should be working Matthew Kalahiki 2021-05-04 13:11:35 -0500
  • e04adbf1d8 fixed museum background Matthew Kalahiki 2021-05-04 12:48:27 -0500
  • 2afce54b92 snow music Matthew Kalahiki 2021-05-04 12:30:22 -0500
  • 856720fb09 museum background Matthew Kalahiki 2021-05-04 11:38:02 -0500
  • d367edc891 Updated Jungle Tileset Added Spencer 2021-05-04 11:33:15 -0500
  • 66d70e50f0 Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-04 10:58:54 -0500
  • f248810bf5 Fixed pause/unpause bugs Ivy 2021-05-04 10:58:51 -0500
  • 3334b0a369 paralax script Matthew Kalahiki 2021-05-04 10:56:52 -0500
  • eeb2d82fc0 Tweaking dog spawn Ivy 2021-05-04 10:02:27 -0500
  • 3e7f51504e Block Push Powerup Logic Finished thoopchuk26 2021-05-04 02:19:53 -0500
  • 89cf222399 Untested Block Push Powerup Logic thoopchuk26 2021-05-03 14:32:55 -0500
  • cdebdf63b0 Started Logic for Block Push Powerup thoopchuk26 2021-05-03 14:21:51 -0500
  • 1ac5a21503 Revert "Auto stash before merge of "main" and "origin/main"" thoopchuk26 2021-05-03 12:56:18 -0500
  • b67f90fb29 Auto stash before merge of "main" and "origin/main" thoopchuk26 2021-05-03 12:56:18 -0500
  • cd3c0289a4 Started work on updated dog level spawn with new tileset Ivy 2021-05-03 12:45:43 -0500
  • 0aeae1a903 Tweaked player animation cycle to reduce freezing Ivy 2021-05-03 11:40:52 -0500
  • fdd08bf233 Animation Adjusted Spencer 2021-05-03 09:19:26 -0500
  • c33da6ab64 Midair Animation Added Spencer 2021-05-03 09:10:40 -0500
  • 320575a27c Fifth Powerup Icon Added Spencer 2021-05-03 08:51:43 -0500
  • f65cebdd0a Updated powerup prefabs to match artwork as described by design doc Ivy 2021-05-02 22:41:39 -0500
  • ab14554d39 Created double jump powerup prefab, connected to museum art Ivy 2021-05-02 22:30:41 -0500
  • e77051ce92 fixed pickup script Matthew Kalahiki 2021-05-02 21:20:10 -0500
  • 57b90a35b9 Merge remote-tracking branch 'origin/main' into main Matthew Kalahiki 2021-05-02 21:03:38 -0500
  • 061100187a Removed extra powerup in museum Ivy 2021-05-02 16:38:26 -0500
  • f190d83f6a Attached glider animation Ivy 2021-05-02 16:28:07 -0500
  • 881e9c468e Fixed buggy jump animation Ivy 2021-05-02 16:14:59 -0500
  • d312c70fbd Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-02 15:45:23 -0500
  • 2092ba912a Added true pausing/resuming Ivy 2021-05-02 15:42:08 -0500
  • b293e8a504 Added true pausing/resuming Ivy 2021-05-02 15:42:08 -0500
  • f0671d1693 Created Scarecrow museum art prefab for glider powerup, placed in museum Ivy 2021-05-02 15:38:03 -0500
  • b9f763090e Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-02 15:26:13 -0500
  • 489396d468 Removed MuseumArt.cs, made disabling art disable colliders Ivy 2021-05-02 15:26:03 -0500
  • 9e44ecdc59 restart should reset everything in the game Matthew Kalahiki 2021-05-02 15:22:58 -0500
  • 5070423ea0 re-applied a couple things Matthew Kalahiki 2021-05-02 15:13:06 -0500
  • c147fbd4aa Merge remote-tracking branch 'origin/main' into main Matthew Kalahiki 2021-05-02 15:03:12 -0500
  • 375cecb736 art only visible in museum once collected Matthew Kalahiki 2021-05-02 14:58:26 -0500
  • ae62f3a75b Merge remote-tracking branch 'origin/main' into main Ivy 2021-05-02 14:51:08 -0500
  • 8ace03285d Added toggling museum art from game manager Ivy 2021-05-02 14:50:13 -0500
  • 2f5c25ae0f fixed conflict Matthew Kalahiki 2021-05-02 14:36:34 -0500
  • 62dfd0b748 disable player until game started Matthew Kalahiki 2021-05-02 14:35:22 -0500
  • b9d4ac47ed Added respawning to the start room Ivy 2021-05-02 14:14:44 -0500
  • 0a213b42cf Added camera scroll to DogLevelSpawn Ivy 2021-05-02 13:24:09 -0500