Fixed merge issues
This commit is contained in:
parent
745d38fb09
commit
3fbf3485b1
3 changed files with 7273 additions and 21384 deletions
|
|
@ -97,6 +97,7 @@ public class GameCore implements GameLogic {
|
|||
List<MaterialData> RevolverMat = ModelLoader.LoadMaterials("resources/models/Revolver/Revolver_mat.json");
|
||||
boolean createOfflinePlayer = !PrimaryRuntime.Server && !ClientConnectionThread.Connected;
|
||||
|
||||
|
||||
if(createOfflinePlayer) {
|
||||
var Musket = new PlayerActor("DebugCamera","Player_Musket", MusketData.ID(), new Vector3f(0,5f,-5f)).SetCameraOffset(new Vector3f(0,1.0f,0));
|
||||
Musket.SetPositionOffset(new Vector3f(0.5f,1.0f,-1.25f));
|
||||
|
|
@ -165,10 +166,6 @@ public class GameCore implements GameLogic {
|
|||
}
|
||||
}
|
||||
}
|
||||
scene.RemoveActor(Musket);
|
||||
scene.AddActor(Revolver);
|
||||
Musket.AttachedCameraID = "NULL";
|
||||
Revolver.AttachedCameraID = "DebugCamera";
|
||||
return new InitData(models,materials,guiTextures);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue