Aldin Duraki 4a48ed9b17 Merge branch 'development' into '33-basisownership-anhand-des-gkplayers' ... # Conflicts: # GoldWars/GoldWars/Components/BackgroundComponent.swift # GoldWars/GoldWars/Components/TeamComponent.swift # GoldWars/GoldWars/Entities/Base.swift # GoldWars/GoldWars/Entities/EntityManager.swift # GoldWars/GoldWars/Entities/Modal.swift # GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift # GoldWars/GoldWars/Scenes/GameScene.swift # GoldWars/GoldWars/Scenes/MenuScene.swift		2020-05-15 09:08:26 +00:00
..
GoldWars	Merge branch 'development' into '33-basisownership-anhand-des-gkplayers'	2020-05-15 09:08:26 +00:00
GoldWars.xcodeproj	add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation	2020-05-13 14:59:26 +02:00
GoldWarsTests	Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"	2020-05-11 19:58:15 +02:00