izzy/super-mario-bros
0
0
Fork 0
mirror of https://github.com/izzy2lost/super-mario-bros.git synced 2026-03-26 16:58:05 -07:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 2b3df3cb50 Merge pull request #38 from team-won/feature/player-movement master Swiggies 2020-04-01 10:24:30 +11:00
  • 0cf6e4e6a9 Merge branch 'master' into feature/player-movement feature/player-movement Swiggies 2020-04-01 10:23:58 +11:00
  • 741310194b Updated Collider Swiggies 2020-04-01 10:23:22 +11:00
  • 67941fa396 Merge branch 'master' of https://github.com/team-won/super-mario-bros DaleTGrant 2020-04-01 10:21:41 +11:00
  • b66c567504 Adjusted Build Settings DaleTGrant 2020-04-01 10:21:25 +11:00
  • 2308d8e303 Merge pull request #37 from team-won/feature/image-effects JordanTama 2020-04-01 10:15:42 +11:00
  • eaadcc9b55 Added to main camera prefab. feature/image-effects Jordan Hamlin 2020-04-01 10:14:59 +11:00
  • 2d27a45ef8 Added image effects to enemy test scene camera. Jordan Hamlin 2020-04-01 10:10:06 +11:00
  • 03e21182e8 Added image effect assets. Jordan Hamlin 2020-04-01 10:07:03 +11:00
  • b11ee223b2 Made brick breaking animation more snappy Jonathan Moallem 2020-04-01 10:07:01 +11:00
  • 0cbb6a3933 Koopa shell works but is buggy. feature/implement-coopa-shell Jordan Hamlin 2020-04-01 10:00:32 +11:00
  • bb65a1a2e4 Mario now bounces off enemy heads. Jordan Hamlin 2020-04-01 09:07:53 +11:00
  • ba5e3cb1ca Merge pull request #35 from team-won/feature/brick-break Jonathan Moallem 2020-04-01 01:05:53 +11:00
  • fbf7e5f1f6 Merge branch 'master' into feature/brick-break feature/brick-break Jonathan Moallem 2020-04-01 01:05:19 +11:00
  • ad5c7c61ff Moved brick break script into scripts directory Jonathan Moallem 2020-03-31 23:51:59 +11:00
  • dbfcadf2d8 Sped up brick breaking animation Jonathan Moallem 2020-03-31 23:49:44 +11:00
  • 95d3ae7e18 Made bricks replace spawn with broken bricks on collision Jonathan Moallem 2020-03-31 23:47:02 +11:00
  • 3ba4602d2e Removed all prefab elements from main scene Jonathan Moallem 2020-03-31 23:28:49 +11:00
  • 01ed3c2150 Added script to deal with brick break animator Jonathan Moallem 2020-03-31 23:28:10 +11:00
  • 1395a0b336 Turned brick into prefab Jonathan Moallem 2020-03-31 23:18:50 +11:00
  • 7f5ae71bef Stopped brick break animation from looping Jonathan Moallem 2020-03-31 23:16:30 +11:00
  • 9b35749ae7 Fixed the sorting layer of brick break effect Jonathan Moallem 2020-03-31 23:13:21 +11:00
  • 4a43424f47 Added brick breaking animation Jonathan Moallem 2020-03-31 23:05:40 +11:00
  • 9589af6b54 Merge pull request #34 from team-won/feature/player-movement Swiggies 2020-03-31 21:48:42 +11:00
  • 92fb398352 Merge branch 'master' into feature/player-movement Swiggies 2020-03-31 21:47:38 +11:00
  • 10a1086da2 Updated Mario Stuff Swiggies 2020-03-31 21:46:03 +11:00
  • 6a53366d64 Fixed prefab and sprite bugs. Jordan Hamlin 2020-03-31 21:37:22 +11:00
  • ba966f1075 Merge branch 'master' into feature/player-movement Swiggies 2020-03-31 21:17:56 +11:00
  • a74be1fa25 Updated mario transform Swiggies 2020-03-31 21:17:12 +11:00
  • 9deadc3a36 Merge pull request #33 from team-won/feature/goomba-prefab JordanTama 2020-03-31 21:16:51 +11:00
  • 075c50529c Merge branch 'master' into feature/goomba-prefab feature/goomba-prefab Jordan Hamlin 2020-03-31 21:15:29 +11:00
  • d6e2694c83 Just some comment removal DaleTGrant 2020-03-31 20:55:33 +11:00
  • d0639a60d5 Fixed enemy prefabs. Jordan Hamlin 2020-03-31 20:54:34 +11:00
  • 460a2503bb Merge branch 'master' into feature/lives feature/lives DaleTGrant 2020-03-31 20:45:56 +11:00
  • feba189c9b Mario Death Sequence Complete DaleTGrant 2020-03-31 20:45:41 +11:00
  • 893ac4be3c Merge pull request #32 from team-won/feature/marioTransform edisu 2020-03-31 20:35:26 +11:00
  • 43f97994fd Merge branch 'master' into feature/marioTransform feature/marioTransform edisu 2020-03-31 20:35:17 +11:00
  • ce88df4402 buggy implementation Edisuism 2020-03-31 20:34:57 +11:00
  • 877e42a814 Completed goomba prefab. Jordan Hamlin 2020-03-31 20:25:29 +11:00
  • caf2093b2c small changes for deathpit DaleTGrant 2020-03-31 20:15:06 +11:00
  • a3af2def9e Merge pull request #30 from team-won/feature/player-movement Swiggies 2020-03-31 20:06:23 +11:00
  • f7faab3728 Update Mario.prefab Swiggies 2020-03-31 20:05:35 +11:00
  • 8bc237d796 Merge pull request #29 from team-won/feature/player-movement Swiggies 2020-03-31 20:01:43 +11:00
  • d7c98f7c84 Adjusted enemy prefabs. Jordan Hamlin 2020-03-31 20:00:51 +11:00
  • 79e825bb3d Mario can sprint now Swiggies 2020-03-31 19:59:38 +11:00
  • 463ba6ecb6 Merge pull request #28 from team-won/feature/marioTransform edisu 2020-03-31 19:51:56 +11:00
  • cc31609360 middle mario fix Edisuism 2020-03-31 19:51:00 +11:00
  • b1e963c6f3 Merge branch 'master' into feature/player-movement Swiggies 2020-03-31 19:44:33 +11:00
  • 5610602da1 Update PlayerMovementController.cs Swiggies 2020-03-31 19:39:36 +11:00
  • 82caaf43ef Merge pull request #27 from team-won/feature/superMario edisu 2020-03-31 17:59:48 +11:00
  • 38bd0696d6 merge fix feature/superMario Edisuism 2020-03-31 17:57:51 +11:00
  • 3b52a35095 Merge pull request #26 from team-won/feature/superMario edisu 2020-03-31 17:04:54 +11:00
  • 0af2a7b832 Merge branch 'master' into feature/superMario edisu 2020-03-31 17:04:42 +11:00
  • 4e021fc564 Coins now update the coint and add points feature/coins DaleTGrant 2020-03-31 16:54:44 +11:00
  • 72abb29a0c 1up sfx now plays DaleTGrant 2020-03-31 16:47:01 +11:00
  • e586667acb Merge branch 'master' into feature/levelCompleteScene feature/levelCompleteScene DaleTGrant 2020-03-31 16:36:25 +11:00
  • 14441d8498 LevelCompleteScene Finished DaleTGrant 2020-03-31 16:36:00 +11:00
  • 41e161a9b3 superMario Edisuism 2020-03-31 16:34:24 +11:00
  • d5723d83f7 Merge branch 'master' of https://github.com/team-won/super-mario-bros Ben Kelly 2020-03-31 16:33:31 +11:00
  • 883c9e9ccd Moved scripts, added 'exists' check to npc movement script for objects that dont have it Ben Kelly 2020-03-31 16:33:15 +11:00
  • 69f35685a0 Merge pull request #23 from team-won/feature/levelCompleteScene DaleTGrant 2020-03-31 16:17:51 +11:00
  • 7dacc1255f just fixed firework position in z-axis DaleTGrant 2020-03-31 16:15:50 +11:00
  • 5db0bc0af1 Merge branch 'master' into feature/levelCompleteScene DaleTGrant 2020-03-31 16:02:57 +11:00
  • 1c4f8d2664 Update World 1-1.unity.meta DaleTGrant 2020-03-31 15:55:55 +11:00
  • 7c2a6a2669 duplicate scene 1-1 DaleTGrant 2020-03-31 15:52:47 +11:00
  • 783a8225b2 Doubled the animation times for a few things to make them feel closer to the real game Ben Kelly 2020-03-31 15:30:34 +11:00
  • 92b9893f41 Merge pull request #25 from team-won/feature/raising-items Ben Kelly 2020-03-31 15:07:47 +11:00
  • 576d18800a Redid the powerup spawning to choose between mushroom or flower on start, as well as play a spawn animation feature/raising-items Ben Kelly 2020-03-31 14:56:05 +11:00
  • 46b01ce2c0 Sounds on brick hit and jump (for small mario only). Fixed up item spawning for powerups Ben Kelly 2020-03-31 14:09:39 +11:00
  • 356968b11f Set view orders of assets to overlap correctly Ben Kelly 2020-03-31 13:53:57 +11:00
  • a74744857f Merge pull request #24 from team-won/feature/coins Ben Kelly 2020-03-31 13:48:22 +11:00
  • 6b5b407a79 Coins pickup, pop animation, and sound Ben Kelly 2020-03-31 13:47:06 +11:00
  • ed07d7221d Update README.md Ben Kelly 2020-03-31 09:22:38 +11:00
  • 4dac97b24f Create README.md Ben Kelly 2020-03-31 09:19:11 +11:00
  • 3572833995 Level Complete Scene DaleTGrant 2020-03-30 23:18:16 +11:00
  • 9b1ac59486 Gave all the prefabs their default sprites Ben Kelly 2020-03-30 23:01:42 +11:00
  • 71ba1bafcb Merge pull request #22 from team-won/feature/secret-pipe Ben Kelly 2020-03-30 22:24:54 +11:00
  • 1f7319dc83 Final touchups feature/secret-pipe Ben Kelly 2020-03-30 22:22:30 +11:00
  • ec2f10f32d Merge branch 'master' into feature/secret-pipe Ben Kelly 2020-03-30 22:11:33 +11:00
  • 3f3fd981c6 Merge branch 'master' into feature/secret-pipe Ben Kelly 2020-03-30 22:10:49 +11:00
  • 303d714f35 Merge pull request #21 from team-won/feature/player-movement Swiggies 2020-03-30 21:58:07 +11:00
  • 4593eb4793 Update Mario.prefab Swiggies 2020-03-30 21:57:09 +11:00
  • 1849db8521 Merge branch 'master' into feature/player-movement Swiggies 2020-03-30 21:52:40 +11:00
  • bb7bb967f2 Updated movement Swiggies 2020-03-30 21:52:27 +11:00
  • 8cbc9c4a30 Teleporter script for pipes and locations Ben Kelly 2020-03-30 21:44:53 +11:00
  • 7e4e6a6bbb Merge pull request #16 from team-won/feature/implement-red-mushroom JordanTama 2020-03-30 21:03:03 +11:00
  • 601df5b506 Merge pull request #14 from team-won/feature/implement-green-mushroom JordanTama 2020-03-30 21:02:39 +11:00
  • 34c2d9412a Merge branch 'master' into feature/implement-green-mushroom feature/implement-green-mushroom JordanTama 2020-03-30 21:01:40 +11:00
  • 8556847229 Small error fixes DaleTGrant 2020-03-30 20:57:46 +11:00
  • 1bfbfd3c9c Hidden brick change and flagpole added DaleTGrant 2020-03-30 20:21:31 +11:00
  • 1129cb0263 Merge pull request #20 from team-won/feature/player-movement Swiggies 2020-03-30 20:11:22 +11:00
  • 0f55f53a45 Merge branch 'master' into feature/player-movement Swiggies 2020-03-30 20:10:32 +11:00
  • c4a1e11ed8 Added Mario to main scene w/ Camera Swiggies 2020-03-30 20:08:16 +11:00
  • ca809dfdaa error adjustments for endflag and LCM DaleTGrant 2020-03-30 20:02:03 +11:00
  • 5f80c48f70 Merge branch 'feature/levelCompleteScene' DaleTGrant 2020-03-30 19:19:22 +11:00
  • 43d684a4be Update Firework.cs DaleTGrant 2020-03-30 19:18:47 +11:00
  • a7e626bfdd Merge pull request #19 from team-won/feature/marioTransform edisu 2020-03-30 19:13:49 +11:00
  • 2b8ce0056d Merge branch 'master' into feature/levelCompleteScene DaleTGrant 2020-03-30 19:13:32 +11:00
  • cb7a789fd6 Time stop Edisuism 2020-03-30 19:13:14 +11:00
  • 83e4d767ac Level Complete Scene (partial) DaleTGrant 2020-03-30 19:12:37 +11:00