Jonathan/Babushka
2
0
Fork 0
Code Pull Requests Releases Activity

And other stuff (still don't merge)

Browse Source
This commit is contained in:
jonathan
2025-09-04 23:14:01 +02:00
parent 57d19a8ad2
commit 029a9d481b
24 changed files with 2595 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/CSharp/Common/NPC/TalkingCharacter.cs
+1 -1
View File
@@ -30,7 +30,7 @@ public partial class TalkingCharacter : Node2D
public void ToggleTalking()
{
GD.Print("ToggleTalking");
GD.Print("ToggleTalking");
if (isTalking || _timelineIndex >= _timelinesToPlay.Length)
{
if (_sprite != null)
scripts/CSharp/Common/SceneManagement/SceneTransitionThreaded.cs
+5 -1
View File
@@ -1,4 +1,5 @@
using Godot;
using Godot.Collections;
namespace Babushka.scripts.CSharp.Common.SceneManagement;
public partial class SceneTransitionThreaded : CanvasLayer
@@ -35,6 +36,9 @@ public partial class SceneTransitionThreaded : CanvasLayer
if (scenePathThreaded == "")
{ return; }
var ar = new Array();
ResourceLoader.LoadThreadedGetStatus(scenePathThreaded, ar);
if (threadedLoadingState == ThreadedLoadingStateEn._loading && ResourceLoader.LoadThreadedGetStatus(scenePathThreaded) == ResourceLoader.ThreadLoadStatus.Loaded)
{
OnResourceLoadThreadedComplete();
@@ -58,7 +62,7 @@ public partial class SceneTransitionThreaded : CanvasLayer
if (scenePathThreaded == "")
{ return; }
ResourceLoader.LoadThreadedRequest(scenePathThreaded);
ResourceLoader.LoadThreadedRequest(scenePathThreaded,"",true);
threadedLoadingState = ThreadedLoadingStateEn._loading;
}
scripts/CSharp/Common/SceneTransition.cs
+1 -1
View File
@@ -17,7 +17,7 @@ public partial class SceneTransition : Node
public void LoadSceneAtIndex(int index)
{
string sceneName = _sceneNamesToLoad[index];
SceneTransitionThreaded.Instance.ChangeSceneToFile(sceneName);
SceneTransitionThreaded.Instance.ChangeSceneToFileThreaded(sceneName);
UnloadAfterDelay();
}