Merge remote-tracking branch 'origin/Dev/ScriptableObjectsRefactor' into Dev/ScriptableObjectsRefactor

# Conflicts:
#	Assets/Entities/Scripts/EntityBase.cs
#	Assets/Entities/Scripts/PowerBase.cs
#	Assets/Entities/Structures/Scripts/StructureBase.cs
This commit is contained in:
Stedd 2024-10-05 15:39:14 +02:00
commit f7ae5d6549
2 changed files with 1 additions and 4 deletions

View File

@ -1,7 +1,3 @@
//using AsteroidGame.ScriptableObjects;
using System;
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;

View File

@ -1,3 +1,4 @@
using AsteroidGame.ScriptableObjects;
using GameDev.CoreSystems;
using UnityEngine;