Skip to content

Commit

Permalink
Merge branch 'master' into camera
Browse files Browse the repository at this point in the history
  • Loading branch information
MarkSuckerberg authored Sep 27, 2023
2 parents 81d1214 + 9701ae4 commit 79f9a3a
Show file tree
Hide file tree
Showing 15 changed files with 91 additions and 2 deletions.
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/HardenedWhiteSand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class HardenedWhiteSand : Block
{
public override void Initialize()
{
blockName = "Hardened White Sand";
blockID = 18;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/PuceStone.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class Pucestone : Block
{
public override void Initialize()
{
blockName = "Pucestone";
blockID = 19;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/PucestoneSlab.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class PucestoneSlab : Block
{
public override void Initialize()
{
blockName = "Pucestone Slab";
blockID = 22;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/PurpleGrass.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class PurpleGrass : Block
{
public override void Initialize()
{
blockName = "Purple Grass";
blockID = 17;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/Salt.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class Salt : Block
{
public override void Initialize()
{
blockName = "Salt";
blockID = 20;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/WhiteSand.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class WhiteSand : Block
{
public override void Initialize()
{
blockName = "White Sand";
blockID = 16;
blockSmoothing = true;
base.Initialize();
}
}
}
13 changes: 13 additions & 0 deletions Blocktest/Code/Blocks/WhiteSandstoneBrick.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
namespace Blocktest.Blocks
{
public class WhiteSandstoneBrick : Block
{
public override void Initialize()
{
blockName = "White Sandstone Brick";
blockID = 21;
blockSmoothing = true;
base.Initialize();
}
}
}
2 changes: 0 additions & 2 deletions Blocktest/Code/Scenes/GameScene.cs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,5 @@ public GameScene(BlocktestGame game) {
BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 1));
BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[2], true, new Vector2Int(i, 0));
}

BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(20, 20));
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Blocktest/Content/Graphics/Blocks/pucestone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Blocktest/Content/Graphics/Blocks/pucestoneslab.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Blocktest/Content/Graphics/Blocks/purplegrass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Blocktest/Content/Graphics/Blocks/salt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Blocktest/Content/Graphics/Blocks/whitesand.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 79f9a3a

Please sign in to comment.