Merge branch 'main' into fix/pet-n-orb
Showing
- Assets/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset 17 additions, 17 deletions...s/HDRPDefaultResources/DefaultSettingsVolumeProfile.asset
- Assets/Resources/Data/Cutscene/Death.asset 9 additions, 0 deletionsAssets/Resources/Data/Cutscene/Death.asset
- Assets/Resources/Data/Weapon/Rifle/RifleData.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/Rifle/RifleData.asset
- Assets/Resources/Data/Weapon/Rifle/RifleData_Goon.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/Rifle/RifleData_Goon.asset
- Assets/Resources/Data/Weapon/Shotgun/ShotgunData.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/Shotgun/ShotgunData.asset
- Assets/Resources/Data/Weapon/Shotgun/ShotgunData_HeadGoon.asset 1 addition, 1 deletion.../Resources/Data/Weapon/Shotgun/ShotgunData_HeadGoon.asset
- Assets/Resources/Data/Weapon/Shotgun/ShotgunData_King.asset 3 additions, 3 deletionsAssets/Resources/Data/Weapon/Shotgun/ShotgunData_King.asset
- Assets/Resources/Data/Weapon/Sword/SwordData.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/Sword/SwordData.asset
- Assets/Resources/Data/Weapon/Sword/SwordData_General.asset 2 additions, 2 deletionsAssets/Resources/Data/Weapon/Sword/SwordData_General.asset
- Assets/Resources/Data/Weapon/Sword/SwordData_goon.asset 1 addition, 1 deletionAssets/Resources/Data/Weapon/Sword/SwordData_goon.asset
- Assets/Resources/InputSystem.meta 3 additions, 3 deletionsAssets/Resources/InputSystem.meta
- Assets/Resources/InputSystem/InputSystem.inputactions 1102 additions, 0 deletionsAssets/Resources/InputSystem/InputSystem.inputactions
- Assets/Resources/InputSystem/InputSystem.inputactions.meta 14 additions, 0 deletionsAssets/Resources/InputSystem/InputSystem.inputactions.meta
- Assets/Resources/Prefabs/Mobs/General/General.prefab 1 addition, 1 deletionAssets/Resources/Prefabs/Mobs/General/General.prefab
- Assets/Resources/Prefabs/Mobs/Goon/Goon.prefab 1 addition, 1 deletionAssets/Resources/Prefabs/Mobs/Goon/Goon.prefab
- Assets/Resources/Prefabs/Mobs/Goon/Goon_Rifle.prefab 1 addition, 1 deletionAssets/Resources/Prefabs/Mobs/Goon/Goon_Rifle.prefab
- Assets/Resources/Prefabs/Mobs/HeadGoon/HeadGoon.prefab 1 addition, 1 deletionAssets/Resources/Prefabs/Mobs/HeadGoon/HeadGoon.prefab
- Assets/Resources/Prefabs/Mobs/King/King.prefab 1 addition, 1 deletionAssets/Resources/Prefabs/Mobs/King/King.prefab
- Assets/UI/InGame/Dialog/DialogController.cs 33 additions, 9 deletionsAssets/UI/InGame/Dialog/DialogController.cs
- Assets/UI/InGame/Shop/ShopController.cs 1 addition, 0 deletionsAssets/UI/InGame/Shop/ShopController.cs
Please register or sign in to comment