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:
commit
f7ae5d6549
|
@ -1,7 +1,3 @@
|
|||
//using AsteroidGame.ScriptableObjects;
|
||||
|
||||
using System;
|
||||
using AsteroidGame.ScriptableObjects;
|
||||
using GameDev.CoreSystems;
|
||||
using UnityEngine;
|
||||
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
using AsteroidGame.ScriptableObjects;
|
||||
using GameDev.CoreSystems;
|
||||
using UnityEngine;
|
||||
|
||||
|
|
Loading…
Reference in New Issue