1. 27 Apr, 2017 1 commit
  2. 20 Apr, 2017 19 commits
  3. 13 Apr, 2017 15 commits
    • Ashley's avatar
      pause menu works · 53f13639
      Ashley authored
      53f13639
    • Eby Komenan's avatar
      7eb30a45
    • Eby Komenan's avatar
      modified: Assets/Scripts/Birb/Jump.cs · 49af132d
      Eby Komenan authored
      	modified:   Assets/Scripts/Util/HazardSlow.cs
      49af132d
    • Ashley's avatar
      trying to fix pause menu · 2352a6cb
      Ashley authored
      2352a6cb
    • Tanner Grehawick's avatar
      222a2258
    • Ashley's avatar
      made the pause prefab · 360cbc0b
      Ashley authored
      360cbc0b
    • Ashley's avatar
      made the pause menu · 1a29b10d
      Ashley authored
      1a29b10d
    • Andrew R Van Buren's avatar
      Merge branch 'walk' into 'master' · 4b6bd843
      Andrew R Van Buren authored
      Walk
      
      See merge request !58
      4b6bd843
    • Jordan B Mckenney's avatar
    • Jordan B Mckenney's avatar
    • Andrew R Van Buren's avatar
      Merge branch 'LungeEnemy' into 'master' · fd0028f5
      Andrew R Van Buren authored
      Lunge enemy
      
      See merge request !56
      fd0028f5
    • DESHON-PC\Deshon's avatar
      Merge branch 'master' of git.gmu.edu:gadig/Birb into LungeEnemy · 15f344dd
      DESHON-PC\Deshon authored
      # Conflicts:
      #	Assets/Scenes/jumptest.unity
      #	Assets/Scripts/Birb/Dash.cs
      15f344dd
    • Eby Komenan's avatar
      Merge branch 'master' of https://git.gmu.edu/gadig/Birb into slowHazard · 95935f37
      Eby Komenan authored
      	modified:   .gitignore
      	new file:   .vscode/launch.json
      	modified:   .vscode/settings.json
      	deleted:    .vscode/tasks.json
      	modified:   Assets/Art/Environment/Wafer Paricles.mat
      	modified:   Assets/Art/Environment/WaferController.controller
      	modified:   Assets/Art/Environment/wafer_break.anim
      	modified:   Assets/Art/Environment/wafer_intact.anim
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Back Leg.asset
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Beak.asset
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Body.asset
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Eye.asset
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Front Leg.asset
      	modified:   Assets/Art/Kiwi/Anima2D Meshes/Kiwi Head.asset
      	modified:   Assets/Art/Kiwi/Blink.anim
      	modified:   Assets/Art/Kiwi/Dash.anim
      	modified:   Assets/Art/Kiwi/Failed Jump.anim
      	modified:   Assets/Art/Kiwi/Feather.mat
      	modified:   Assets/Art/Kiwi/Hurt.anim
      	modified:   Assets/Art/Kiwi/Idle.anim
      	modified:   Assets/Art/Kiwi/Jump.anim
      	modified:   Assets/Art/Kiwi/Kiwi Back Eye Shut.asset
      	modified:   Assets/Art/Kiwi/Kiwi Feather.asset
      	modified:   Assets/Art/Kiwi/Kiwi Front Eye Shut.asset
      	modified:   Assets/Art/Kiwi/Kiwi.controller
      	modified:   Assets/Art/Kiwi/Kiwi.prefab
      	modified:   Assets/Art/Kiwi/Kiwi.unity
      	modified:   Assets/Art/Kiwi/Kiwi_0.asset
      	modified:   Assets/Art/Kiwi/Kiwi_1.asset
      	modified:   Assets/Art/Kiwi/Kiwi_10.asset
      	modified:   Assets/Art/Kiwi/Kiwi_2.asset
      	modified:   Assets/Art/Kiwi/Kiwi_3.asset
      	modified:   Assets/Art/Kiwi/Kiwi_4.asset
      	modified:   Assets/Art/Kiwi/Kiwi_5.asset
      	modified:   Assets/Art/Kiwi/Kiwi_6.asset
      	modified:   Assets/Art/Kiwi/Kiwi_7.asset
      	modified:   Assets/Art/Kiwi/Kiwi_8.asset
      	modified:   Assets/Art/Kiwi/Kiwi_9.asset
      	modified:   Assets/Art/Kiwi/Midair Dash.anim
      	modified:   Assets/Art/Kiwi/Peck.anim
      	modified:   Assets/Art/Kiwi/Poof.anim
      	modified:   Assets/Art/Kiwi/Run.anim
      	modified:   Assets/Art/Kiwi/Wall Slide.anim
      	modified:   Assets/Art/Kiwi/Whoosh.mat
      	new file:   Assets/Audio.meta
      	new file:   Assets/Audio/Music.meta
      	new file:   Assets/Audio/Music/Birb_MainTheme_V1.wav
      	new file:   Assets/Audio/Music/Birb_MainTheme_V1.wav.meta
      	new file:   Assets/Audio/Music/Meadow_Theme.wav
      	new file:   Assets/Audio/Music/Meadow_Theme.wav.meta
      	new file:   Assets/Audio/Music/Victory_Birb.wav
      	new file:   Assets/Audio/Music/Victory_Birb.wav.meta
      	new file:   Assets/Audio/SFX.meta
      	new file:   Assets/Audio/SFX/Bread_Wall_Crumble.wav
      	new file:   Assets/Audio/SFX/Bread_Wall_Crumble.wav.meta
      	new file:   Assets/Audio/SFX/Button_Click.wav
      	new file:   Assets/Audio/SFX/Button_Click.wav.meta
      	new file:   Assets/Audio/SFX/Cake_Horse_Gallup.wav
      	new file:   Assets/Audio/SFX/Cake_Horse_Gallup.wav.meta
      	new file:   Assets/Audio/SFX/Caramel_Spit.wav
      	new file:   Assets/Audio/SFX/Caramel_Spit.wav.meta
      	new file:   Assets/Audio/SFX/Cattius_Jibberish.wav
      	new file:   Assets/Audio/SFX/Cattius_Jibberish.wav.meta
      	new file:   Assets/Audio/SFX/Cattius_Laugh.wav
      	new file:   Assets/Audio/SFX/Cattius_Laugh.wav.meta
      	new file:   Assets/Audio/SFX/Cattius_Surprised.wav
      	new file:   Assets/Audio/SFX/Cattius_Surprised.wav.meta
      	new file:   Assets/Audio/SFX/Cooldown.wav
      	new file:   Assets/Audio/SFX/Cooldown.wav.meta
      	new file:   Assets/Audio/SFX/Snake Hiss.wav
      	new file:   Assets/Audio/SFX/Snake Hiss.wav.meta
      	new file:   Assets/Audio/SFX/ToasterMobile_EngineRunning.wav
      	new file:   Assets/Audio/SFX/ToasterMobile_EngineRunning.wav.meta
      	new file:   Assets/Audio/SFX/ToasterMobile_Entrance.wav
      	new file:   Assets/Audio/SFX/ToasterMobile_Entrance.wav.meta
      	new file:   Assets/Audio/SFX/ToasterMobile_Exit.wav
      	new file:   Assets/Audio/SFX/ToasterMobile_Exit.wav.meta
      	new file:   Assets/Audio/SFX/Zebra_bark.wav
      	new file:   Assets/Audio/SFX/Zebra_bark.wav.meta
      	new file:   Assets/Camel.meta
      	new file:   Assets/Camel/CaramelCamel.controller
      	renamed:    Assets/Prefabs/Enemy/VerticalEnemyLeftWall.prefab.meta -> Assets/Camel/CaramelCamel.controller.meta
      	new file:   Assets/Camel/CaramelCamel.prefab
      	renamed:    Assets/Prefabs/Enemy/VerticalEnemyRightWall.prefab.meta -> Assets/Camel/CaramelCamel.prefab.meta
      	new file:   Assets/Camel/CaramelCamelBones.png
      	new file:   Assets/Camel/CaramelCamelBones.png.meta
      	new file:   Assets/Camel/CaramelCamelBones_10.asset
      	new file:   Assets/Camel/CaramelCamelBones_10.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_11.asset
      	new file:   Assets/Camel/CaramelCamelBones_11.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_17.asset
      	new file:   Assets/Camel/CaramelCamelBones_17.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_2.asset
      	new file:   Assets/Camel/CaramelCamelBones_2.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_6.asset
      	new file:   Assets/Camel/CaramelCamelBones_6.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_7.asset
      	new file:   Assets/Camel/CaramelCamelBones_7.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_8.asset
      	new file:   Assets/Camel/CaramelCamelBones_8.asset.meta
      	new file:   Assets/Camel/CaramelCamelBones_9.asset
      	new file:   Assets/Camel/CaramelCamelBones_9.asset.meta
      	new file:   Assets/Camel/Spit.anim
      	new file:   Assets/Camel/Spit.anim.meta
      	new file:   Assets/Camel/Walk.anim
      	new file:   Assets/Camel/Walk.anim.meta
      	modified:   Assets/Physics/NoBounceNoFric.physicsMaterial2D
      	modified:   Assets/Prefabs/Enemy.meta
      	modified:   Assets/Prefabs/Enemy/CaramelBullet.prefab
      	new file:   Assets/Prefabs/Enemy/CaramelCamel 1.prefab
      	new file:   Assets/Prefabs/Enemy/CaramelCamel 1.prefab.meta
      	modified:   Assets/Prefabs/Enemy/CaramelCamel.prefab
      	modified:   Assets/Prefabs/Enemy/ChargeEnemy.prefab
      	modified:   Assets/Prefabs/Enemy/HorizontalEnemy.prefab
      	modified:   Assets/Prefabs/Enemy/HorizontalEnemy.prefab.meta
      	new file:   Assets/Prefabs/Enemy/VerticalEnemy.prefab
      	new file:   Assets/Prefabs/Enemy/VerticalEnemy.prefab.meta
      	deleted:    Assets/Prefabs/Enemy/VerticalEnemyLeftWall.prefab
      	deleted:    Assets/Prefabs/Enemy/VerticalEnemyRightWall.prefab
      	modified:   Assets/Prefabs/InputManager.prefab
      	modified:   Assets/Prefabs/Particles/Wafer Particles.prefab
      	new file:   Assets/Prefabs/Player (static).prefab
      	new file:   Assets/Prefabs/Player (static).prefab.meta
      	modified:   Assets/Prefabs/Player.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_Grass_left.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_Grass_middle.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_Grass_right.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_bottom_1.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_bottom_2.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_bottom_3.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_left.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_middle.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_right.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_top_1.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_top_2.prefab
      	modified:   Assets/Prefabs/Tiles/Dirt_top_3.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_bottom_1.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_bottom_2.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_bottom_3.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_left.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_middle.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_right.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_top_1.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_top_2.prefab
      	modified:   Assets/Prefabs/Tiles/Grass_top_3.prefab
      	modified:   Assets/Prefabs/Tiles/Hazards/ThornLeft.prefab
      	modified:   Assets/Prefabs/Tiles/Hazards/ThornMain.prefab
      	modified:   Assets/Prefabs/Tiles/Hazards/ThornRight.prefab
      	new file:   Assets/Prefabs/Tiles/Hazards/Thorns.prefab
      	new file:   Assets/Prefabs/Tiles/Hazards/Thorns.prefab.meta
      	modified:   Assets/Prefabs/Tiles/Spike.prefab
      	modified:   Assets/Prefabs/Tiles/Wafer_Bottom.prefab
      	modified:   Assets/Prefabs/Tiles/Wafer_Top.prefab
      	modified:   Assets/Prefabs/Tiles/Wall.prefab
      	modified:   Assets/Prefabs/Tiles/Water_middle.prefab
      	modified:   Assets/Prefabs/Tiles/Water_top.prefab
      	modified:   Assets/Prefabs/Tiles/X.prefab
      	modified:   Assets/Prefabs/Tiles/_.prefab
      	modified:   Assets/Prefabs/UI/DashMeterBG.prefab
      	modified:   Assets/Prefabs/Util/GameManager.prefab
      	modified:   Assets/Prefabs/_EDITOR_.prefab
      	modified:   Assets/Prefabs/enemyProjectile.prefab
      	modified:   Assets/Prefabs/enemyRanged.prefab
      	modified:   Assets/Scenes/CharacterTest.unity
      	new file:   Assets/Scenes/LargeLevelTest.unity
      	new file:   Assets/Scenes/LargeLevelTest.unity.meta
      	new file:   Assets/Scenes/MainMenu.unity
      	new file:   Assets/Scenes/MainMenu.unity.meta
      	modified:   Assets/Scenes/_BASE_LEVEL_.unity
      	modified:   Assets/Scenes/enemyTest.unity
      	modified:   Assets/Scenes/jumptest.unity
      	modified:   Assets/Scripts/Birb/Dash.cs
      	modified:   Assets/Scripts/Birb/Jump.cs
      	modified:   Assets/Scripts/Enemy/BaseEnemy.cs
      	modified:   Assets/Scripts/Enemy/EnemyCharge.cs
      	modified:   Assets/Scripts/Enemy/HorizontalEnemy.cs
      	modified:   Assets/Scripts/Enemy/VerticalEnemy.cs
      	modified:   Assets/Scripts/Enemy/enemyRanged.cs
      	new file:   Assets/Scripts/MapEditor/DragPlaceInfo.cs
      	new file:   Assets/Scripts/MapEditor/DragPlaceInfo.cs.meta
      	new file:   Assets/Scripts/MapEditor/DragPlacement.cs
      	new file:   Assets/Scripts/MapEditor/DragPlacement.cs.meta
      	modified:   Assets/Scripts/MapEditor/MapEditor.cs
      	modified:   Assets/Scripts/MapEditor/World.cs
      	modified:   Assets/Scripts/Player/CameraFollow.cs
      	modified:   Assets/Scripts/Player/CameraFollow.cs.meta
      	modified:   Assets/Scripts/Player/CollisionState.cs
      	modified:   Assets/Scripts/Player/Walk.cs
      	new file:   Assets/Scripts/Util/MenuActions.cs
      	new file:   Assets/Scripts/Util/MenuActions.cs.meta
      	modified:   ProjectSettings/AudioManager.asset
      	modified:   ProjectSettings/ClusterInputManager.asset
      	modified:   ProjectSettings/DynamicsManager.asset
      	modified:   ProjectSettings/EditorBuildSettings.asset
      	modified:   ProjectSettings/EditorSettings.asset
      	modified:   ProjectSettings/GraphicsSettings.asset
      	modified:   ProjectSettings/InputManager.asset
      	modified:   ProjectSettings/NavMeshAreas.asset
      	modified:   ProjectSettings/NetworkManager.asset
      	modified:   ProjectSettings/Physics2DSettings.asset
      	modified:   ProjectSettings/ProjectSettings.asset
      	modified:   ProjectSettings/ProjectVersion.txt
      	modified:   ProjectSettings/QualitySettings.asset
      	modified:   ProjectSettings/TagManager.asset
      	modified:   ProjectSettings/TimeManager.asset
      	modified:   ProjectSettings/UnityConnectSettings.asset
      	new file:   birb.sln
      	new file:   project.json
      	new file:   project.lock.json
      95935f37
    • Eby Komenan's avatar
      modified: Assets/Art/Kiwi/Kiwi.controller · 4bbd1989
      Eby Komenan authored
      	modified:   Assets/Scripts/Birb/Jump.cs
      	modified:   Assets/Scripts/Util/Hazard.cs
      	modified:   Assets/Scripts/Util/HazardSlow.cs
      4bbd1989
    • DESHON-PC\Deshon's avatar
      Lunge Enemy added · a19735f7
      DESHON-PC\Deshon authored
      a19735f7
  4. 11 Apr, 2017 2 commits
  5. 10 Apr, 2017 1 commit
  6. 09 Apr, 2017 2 commits