Skip to content

Commit

Permalink
Migration
Browse files Browse the repository at this point in the history
* Move namespace and Godot project from 'Code Combat' to 'CodeBlitz'

* Move target framework to 'netstandard2.1'

* Move Godot SDK to 3.2.4
  • Loading branch information
sitiom committed Feb 16, 2021
1 parent cd4be46 commit 79b3d53
Show file tree
Hide file tree
Showing 25 changed files with 733 additions and 750 deletions.
3 changes: 1 addition & 2 deletions Assets/UI/Troops/Display.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
using Godot;
using System;

namespace CodeCombat.Display
namespace CodeBlitz.Assets.UI.Troops
{
public class Display : Node
{
Expand Down
6 changes: 0 additions & 6 deletions Code Combat.csproj

This file was deleted.

7 changes: 7 additions & 0 deletions CodeBlitz.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Project Sdk="Godot.NET.Sdk/3.2.4">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<!--https://github.com/godotengine/godot/issues/42271-->
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
</Project>
47 changes: 28 additions & 19 deletions Code Combat.sln → CodeBlitz.sln
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Code Combat", "Code Combat.csproj", "{29902664-4F6E-4CB4-A4A0-27B416DF22A3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.31005.135
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeBlitz", "CodeBlitz.csproj", "{29902664-4F6E-4CB4-A4A0-27B416DF22A3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
ExportDebug|Any CPU = ExportDebug|Any CPU
ExportRelease|Any CPU = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportDebug|Any CPU.ActiveCfg = ExportDebug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportDebug|Any CPU.Build.0 = ExportDebug|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportRelease|Any CPU.ActiveCfg = ExportRelease|Any CPU
{29902664-4F6E-4CB4-A4A0-27B416DF22A3}.ExportRelease|Any CPU.Build.0 = ExportRelease|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0E6AF5E3-AF93-4BE0-8D54-397220FB8C5B}
EndGlobalSection
EndGlobal
616 changes: 308 additions & 308 deletions Levels/ArenaManager.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 79b3d53

Please sign in to comment.