Merge branch 'main' of https://git.cojoedmo.com/admin/peggle-roguelike

reverting to prior change
2026-06-24 00:08:32 -04:00 · 2026-06-23 23:55:12 -04:00
1 changed files with 4 additions and 0 deletions
@@ -11,8 +11,12 @@ public partial class EnemyController : TurnController
    public PackedScene _enemyScene = GD.Load<PackedScene>("res://Enemy.tscn");
    public List<Enemy> _enemies = new();
    public PlayerController _playerController;
+<<<<<<< HEAD
+    public Tween _movementTween;
+=======
    public Dictionary<float, List<Tween>> _tweenStages = new();
    public Tween _tween;
+>>>>>>> f022333c9b378e5a77d8d2727f2a9cb16dd1b8f8

    public void AddEnemies(int ENEMY_COUNT = 1)
    {
Author	SHA1	Message	Date
admin	95cdd81a3f	Merge branch 'main' of https://git.cojoedmo.com/admin/peggle-roguelike	2026-06-24 00:08:32 -04:00
admin	b1bae1f973	reverting to prior change	2026-06-23 23:55:12 -04:00