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

fix all merge conflicts

Browse Source 
unfortunately we lost a good chunk of git history in the process so that may hurt the ability for this to get merged, may have to consult everyone else for this
This commit is contained in:
minenice55
2022-08-09 11:23:17 -04:00
parent 6ac37d51d4
commit e8975c6dc4
32 changed files with 62 additions and 6938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
Assets/Scripts/Games/FirstContact/AlienFirstContact.cs
View File

@ -1,113 +0,0 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
namespace HeavenStudio.Games.Scripts_FirstContact
{
public class AlienFirstContact : PlayerActionObject
{
public float createBeat;
FirstContact game;
Translator translator;
bool hasSpoke;
public float stateBeat;
public bool prefabHolder;
bool missed;
private void Awake()
{
game = FirstContact.instance;
translator = GameObject.Find("Games/firstContact/Translator").GetComponent<Translator>();
}
private void Start()
{
}
private void Update()
{
if (hasSpoke)
{
return;
}
stateBeat = Conductor.instance.GetPositionFromMargin(createBeat + game.beatInterval, 1f);
StateCheck(stateBeat);
if (PlayerInput.Pressed(true))
{
if (state.eligible())
{
if (!game.hasMissed)
{
Ace();
}
else
{
Eh();
}
}
else if (state.notPerfect() && game.translatorSpeakCount > 0)
{
Eh();
}
//else if (stateBeat > Minigame.LateTime() && game.translatorSpeakCount == 0)
//{
// //Debug.Log("OW");
// Miss();
//}
}
if (stateBeat > Minigame.LateTime())
{
if (!missed)
{
MissNoHit();
}
}
}
public void Ace()
{
translator.successTranslation(true);
game.isCorrect = true;
game.translatorSpeakCount++;
hasSpoke = true;
missed = false;
}
public void Miss()
{
translator.successTranslation(false);
game.isCorrect = false;
hasSpoke = true;
missed = false;
}
public void MissNoHit()
{
game.alienNoHit();
game.isCorrect = false;
missed = true;
game.hasMissed = true;
}
public void Eh()
{
translator.ehTranslation();
hasSpoke = true;
}
public override void OnAce()
{
Ace();
}
}
}

11
Assets/Scripts/Games/FirstContact/AlienFirstContact.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 47ef82bd935047f42b39142f4a1b1d32
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

4
Assets/Scripts/Games/FirstContact/WhiteLines.cs
View File

@ -23,11 +23,7 @@ public class WhiteLines : MonoBehaviour
}
}
<<<<<<< HEAD
void Update()
=======
void FixedUpdate()
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
{
if(transform.position.y > endAt && !isRandomLineMiddle)
{

10
Assets/Scripts/Games/Tram&Pauline/Curtains.cs
View File

@ -16,12 +16,4 @@ namespace HeavenStudio.Games.Scripts_TramAndPauline
}
}
}
}

23
Assets/Scripts/Games/Tram&Pauline/Pauline.cs
View File

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Pauline : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Pauline : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}
}

21
Assets/Scripts/Games/Tram&Pauline/Tram.cs
View File

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Tram : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Tram : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}

23
Assets/Scripts/Games/Tram&Pauline/Trampoline.cs
View File

@ -2,17 +2,20 @@ using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Trampoline : MonoBehaviour
namespace HeavenStudio.Games.Scripts_TramAndPauline
{
// Start is called before the first frame update
void Start()
public class Trampoline : MonoBehaviour
{
}
// Start is called before the first frame update
void Start()
{
// Update is called once per frame
void Update()
{
}
// Update is called once per frame
void Update()
{
}
}
}
}

3
Assets/Scripts/LevelEditor/SettingsDialog/SettingsDialog.cs
View File

@ -10,10 +10,7 @@ namespace HeavenStudio.Editor
public class SettingsDialog : MonoBehaviour
{
[SerializeField] private GameObject settingsMenu;
<<<<<<< HEAD
=======
//this may all be moved to a different script in the future
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
private void Start() {}

10
Assets/Scripts/LevelEditor/Timeline/Timeline.cs
View File

@ -610,32 +610,22 @@ namespace HeavenStudio.Editor.Track
return eventObj;
}
<<<<<<< HEAD
public TimelineEventObj CopyEventObject(Beatmap.Entity e)
{
Beatmap.Entity clone = e.DeepCopy();
TimelineEventObj dup = AddEventObject(clone.datamodel, false, new Vector3(clone.beat, -clone.track * Timeline.instance.LayerHeight()), clone, true, RandomID());
=======
private List<TimelineEventObj> duplicatedEventObjs = new List<TimelineEventObj>();
public TimelineEventObj CopyEventObject(TimelineEventObj e)
{
Beatmap.Entity clone = e.entity.DeepCopy();
TimelineEventObj dup = AddEventObject(clone.datamodel, false, new Vector3(clone.beat, -clone.track * Timeline.instance.LayerHeight()), clone, true, RandomID());
duplicatedEventObjs.Add(dup);
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
return dup;
}
<<<<<<< HEAD
=======
public void FinalizeDuplicateEventStack()
{
CommandManager.instance.Execute(new Commands.Duplicate(duplicatedEventObjs));
duplicatedEventObjs = new List<TimelineEventObj>();
}
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
public void DestroyEventObject(Beatmap.Entity entity)
{
if (EventParameterManager.instance.entity == entity)

18
Assets/Scripts/LevelEditor/Timeline/TimelineEventObj.cs
View File

@ -42,11 +42,6 @@ namespace HeavenStudio.Editor.Track
private bool resizingLeft;
private bool resizingRight;
private bool inResizeRegion;
<<<<<<< HEAD
private bool wasDuplicated;
public Vector2 lastMovePos;
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
public bool isCreating;
public string eventObjID;
@ -64,11 +59,6 @@ namespace HeavenStudio.Editor.Track
Destroy(resizeGraphic.gameObject);
}
<<<<<<< HEAD
lastMovePos = transform.localPosition;
=======
>>>>>>> d65cae24d2db1df6a0e5bb4d3bd4e86fe633985f
// what the fuck????
// moveTemp = new GameObject();
// moveTemp.transform.SetParent(this.transform.parent);
@ -165,13 +155,6 @@ namespace HeavenStudio.Editor.Track
{
if (Timeline.instance.eventObjs.FindAll(c => c.moving).Count > 0 && selected)
{
//duplicate the entity if holding alt or r-click
if ((!wasDuplicated) && (Input.GetKey(KeyCode.LeftAlt) || Input.GetMouseButton(1)))
{
wasDuplicated = true;
var te = Timeline.instance.CopyEventObject(entity);
}
Vector3 mousePos = Editor.instance.EditorCamera.ScreenToWorldPoint(Input.mousePosition);
//duplicate the entity if holding alt or m-click
if ((!wasDuplicated) && (Input.GetKey(KeyCode.LeftAlt) || Input.GetMouseButton(2)))
@ -334,7 +317,6 @@ namespace HeavenStudio.Editor.Track
}
moving = false;
wasDuplicated = false;
Cancel();
if (isCreating == true)