Mirrors/HeavenStudio
1
0
Fork 0
mirror of https://github.com/RHeavenStudio/HeavenStudio.git synced 2025-06-12 08:17:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Marching Orders Rework + Bug Fixes (#442)

Browse Source 
* first things first, kill mr. downbeat.

now onto fixing meat grinder forrealzies

* meat grinder fix

* fixed munchy monk icon + mr upbeat ding bug

* a few little changes

* lotta stuff

yeahh just look at the pr description

* point and clap

* anim Adjustment

* new sheet + adjustments for it

* IM USING THE INTERNET

i hate merge conflicts

* grrr merge conflicts

* insane changes

* progress

* fixed The Spaceball Camera Bug (literally a single line of code wtf guys)
* colrs

* k im done :3

---------

Co-authored-by: ev <85412919+evdial@users.noreply.github.com>
This commit is contained in:
AstrlJelly
2023-06-04 00:30:42 -04:00
committed by GitHub
parent bb6559fe58
commit 11044922d3
84 changed files with 19587 additions and 1855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Assets/Scripts/Games/Spaceball/Spaceball.cs
View File

@ -52,7 +52,6 @@ namespace HeavenStudio.Games.Loaders
},
new GameAction("camera", "Zoom Camera")
{
function = delegate { Spaceball.instance.OverrideCurrentZoom(); },
defaultLength = 4,
resizable = true,
parameters = new List<Param>()
@ -93,10 +92,10 @@ namespace HeavenStudio.Games
SphereHead
}
public GameObject Ball;
public GameObject BallsHolder;
[SerializeField] GameObject Ball;
[SerializeField] GameObject BallsHolder;
public GameObject Dispenser;
[SerializeField] GameObject Dispenser;
public GameObject Dust;
private float lastCamDistance;
@ -106,8 +105,8 @@ namespace HeavenStudio.Games
private int currentZoomIndex;
public Sprite[] BallSprites;
public Material[] CostumeColors;
[SerializeField] Sprite[] BallSprites;
[SerializeField] Material[] CostumeColors;
private List<DynamicBeatmap.DynamicEntity> _allCameraEvents = new List<DynamicBeatmap.DynamicEntity>();
@ -147,7 +146,7 @@ namespace HeavenStudio.Games
_allCameraEvents = tempEvents;
UpdateCameraZoom();
currentZoomCamDistance = -10;
}
private void Update()
@ -225,11 +224,6 @@ namespace HeavenStudio.Games
}
}
public void OverrideCurrentZoom()
{
// lastCamDistance = GameCamera.instance.camera.transform.localPosition.z;
}
public void Shoot(float beat, bool high, int type)
{
GameObject ball = Instantiate(Ball);