halbear/Terrain4J_Experimental_branch
halbear/Terrain4J_Experimental_branch
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main'

Browse source
This commit is contained in:
Will_Allen 2026-07-08 15:36:28 +01:00
commit 2e929abf46
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/net/halbear/Terrain4J/EngineCore/Main/GameCore.java
View file

@ -112,6 +112,9 @@ public class GameCore implements GameLogic {
Revolver.CreatePhysicsController( ConvexMesh.Box(0.5f,0.75f,0.5f),200f); Revolver.CreatePhysicsController( ConvexMesh.Box(0.5f,0.75f,0.5f),200f);
scene.Revolver = Revolver; scene.Revolver = Revolver;
PlayerActorID = "Player_Revolver"; PlayerActorID = "Player_Revolver";
physicsController = (RigidPhysicsController) Revolver.GetPhysicsController();
RigidBody.RigidBodyRegister.get(physicsController.RigidBodyID).LockRotation();
// if I put PlayerActorID = "Player_Revolver" it just crashes // if I put PlayerActorID = "Player_Revolver" it just crashes
mesh.RegisterMesh(); mesh.RegisterMesh();
scene.AddActor(Musket); scene.AddActor(Musket);

2
src/main/java/net/halbear/Terrain4J/EngineCore/Main/Scene/Scene.java
View file

@ -165,7 +165,7 @@ public class Scene implements IScene {
@Override @Override
public void SetUpAudio(EngineInstance engineInstance, AudioManager manager) { public void SetUpAudio(EngineInstance engineInstance, AudioManager manager) {
AudioInstance newInstance = new AudioInstance("resources/EngineResources/audio/music/groovy_fight.ogg","BGM",manager,true); AudioInstance newInstance = new AudioInstance("resources/EngineResources/audio/music/MENUMUSIC_RetroFutureClean.ogg","BGM",manager,true);
newInstance.Play(); newInstance.Play();
audioInstances.put("BGM",newInstance); audioInstances.put("BGM",newInstance);
} }