Merge branch 'sprint_2_architecture_init' into 'development'
Flatten Project See merge request marcel.schwarz/software-projekt-2!25
This commit is contained in:
commit
54f6cf3cf1
@ -109,11 +109,13 @@
|
|||||||
110360D1244B101A008610AF /* GoldWars */ = {
|
110360D1244B101A008610AF /* GoldWars */ = {
|
||||||
isa = PBXGroup;
|
isa = PBXGroup;
|
||||||
children = (
|
children = (
|
||||||
11738A3C24508F8C004426F1 /* Unit */,
|
ABA03D9F244BD54F00A66916 /* Base.swift */,
|
||||||
ABA03D9E244BD53D00A66916 /* Base */,
|
11738A3A24508F68004426F1 /* Unit.swift */,
|
||||||
11036114244B3E8A008610AF /* Menu */,
|
11036112244B3E30008610AF /* MenuScene.swift */,
|
||||||
1103610F244B3D48008610AF /* Game */,
|
11036110244B3D6A008610AF /* MenuScene.sks */,
|
||||||
110360D2244B101A008610AF /* AppDelegate.swift */,
|
110360D2244B101A008610AF /* AppDelegate.swift */,
|
||||||
|
110360D8244B101A008610AF /* GameScene.swift */,
|
||||||
|
110360D4244B101A008610AF /* GameScene.sks */,
|
||||||
110360DA244B101A008610AF /* GameViewController.swift */,
|
110360DA244B101A008610AF /* GameViewController.swift */,
|
||||||
110360DC244B101A008610AF /* Main.storyboard */,
|
110360DC244B101A008610AF /* Main.storyboard */,
|
||||||
110360DF244B101B008610AF /* Assets.xcassets */,
|
110360DF244B101B008610AF /* Assets.xcassets */,
|
||||||
@ -141,40 +143,6 @@
|
|||||||
path = GoldWarsUITests;
|
path = GoldWarsUITests;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
};
|
};
|
||||||
1103610F244B3D48008610AF /* Game */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
110360D4244B101A008610AF /* GameScene.sks */,
|
|
||||||
110360D8244B101A008610AF /* GameScene.swift */,
|
|
||||||
);
|
|
||||||
path = Game;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
11036114244B3E8A008610AF /* Menu */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
11036110244B3D6A008610AF /* MenuScene.sks */,
|
|
||||||
11036112244B3E30008610AF /* MenuScene.swift */,
|
|
||||||
);
|
|
||||||
path = Menu;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
11738A3C24508F8C004426F1 /* Unit */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
11738A3A24508F68004426F1 /* Unit.swift */,
|
|
||||||
);
|
|
||||||
path = Unit;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
ABA03D9E244BD53D00A66916 /* Base */ = {
|
|
||||||
isa = PBXGroup;
|
|
||||||
children = (
|
|
||||||
ABA03D9F244BD54F00A66916 /* Base.swift */,
|
|
||||||
);
|
|
||||||
path = Base;
|
|
||||||
sourceTree = "<group>";
|
|
||||||
};
|
|
||||||
/* End PBXGroup section */
|
/* End PBXGroup section */
|
||||||
|
|
||||||
/* Begin PBXNativeTarget section */
|
/* Begin PBXNativeTarget section */
|
||||||
|
Loading…
Reference in New Issue
Block a user