Aldin Duraki
|
21b7fc00f7
|
Init Entity-Component Folder Structure
|
2020-05-01 15:09:46 +02:00 |
|
Aldin Duraki
|
54f6cf3cf1
|
Merge branch 'sprint_2_architecture_init' into 'development'
Flatten Project
See merge request marcel.schwarz/software-projekt-2!25
|
2020-05-01 12:56:22 +00:00 |
|
Aldin Duraki
|
9f569c30fa
|
Flatten Project
|
2020-05-01 14:49:55 +02:00 |
|
Aldin Duraki
|
73a632056d
|
Merge branch '14-view-hud' into 'development'
Impl. HUD for GameScene
Closes #14
See merge request marcel.schwarz/software-projekt-2!22
|
2020-04-23 21:02:15 +00:00 |
|
Aldin Duraki
|
996800bc01
|
Impl. HUD for GameScene
|
2020-04-23 23:01:19 +02:00 |
|
Aldin Duraki
|
017bb3bd6a
|
Merge branch '3-hauptmenu' into 'development'
Finalize MenuScene
Closes #3
See merge request marcel.schwarz/software-projekt-2!21
|
2020-04-23 19:35:29 +00:00 |
|
Aldin Duraki
|
5ffe6fe81c
|
Finalize MenuScene
|
2020-04-23 21:31:43 +02:00 |
|
Aldin Duraki
|
647ca473c3
|
Merge branch '15-logo-erstellen' into 'development'
add missing iPad icons
Closes #15
See merge request marcel.schwarz/software-projekt-2!19
|
2020-04-23 18:11:28 +00:00 |
|
|
|
c207e2a354
|
add missing iPad icons
|
2020-04-23 18:35:41 +02:00 |
|
Aldin Duraki
|
f21ca69061
|
Merge branch '15-logo-erstellen' into 'development'
Resolve "Logo erstellen"
Closes #15
See merge request marcel.schwarz/software-projekt-2!13
|
2020-04-23 16:30:47 +00:00 |
|
|
|
3ce979303e
|
add logo 20 pt and 26 pt
|
2020-04-23 18:18:02 +02:00 |
|
Aldin Duraki
|
f5f45af111
|
Merge branch '16-einheiten-der-basis-hinzufugen' into 'development'
Resolve "Einheiten der Basis hinzufügen"
Closes #16
See merge request marcel.schwarz/software-projekt-2!14
|
2020-04-22 17:42:27 +00:00 |
|
72haja
|
31143265f6
|
add unitCount and unitType for basePlayer1 and basePlayer2
|
2020-04-22 18:17:07 +02:00 |
|
72haja
|
d8adce88d2
|
add attributes to Base for unitCount and unitType. Init attributes in constructor with default parameters
|
2020-04-22 18:16:25 +02:00 |
|
72haja
|
6c68a569b9
|
Change struct Unit to enum Unit
|
2020-04-22 18:14:27 +02:00 |
|
127-Z3R0
|
807ecdd75e
|
Merge branch '15-logo-erstellen' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 15-logo-erstellen
|
2020-04-22 16:59:21 +02:00 |
|
Aldin Duraki
|
fdbce8e56d
|
Merge branch '11-view-background' into 'development'
Background add
Closes #11
See merge request marcel.schwarz/software-projekt-2!18
|
2020-04-22 14:49:41 +00:00 |
|
Aldin Duraki
|
79dce7738f
|
Merge branch 'fix-unit-class' into 'development'
Refactor Unit class
See merge request marcel.schwarz/software-projekt-2!17
|
2020-04-22 14:45:13 +00:00 |
|
Aldin Duraki
|
6f8487e16e
|
Refactor Unit class
|
2020-04-22 16:43:58 +02:00 |
|
Aldin Duraki
|
d5058afebb
|
Merge branch '12-model-einheiten' into 'development'
Finalised Issue - Model Einheiten
Closes #12
See merge request marcel.schwarz/software-projekt-2!12
|
2020-04-22 14:34:39 +00:00 |
|
Aldin Duraki
|
dd07cf9ad8
|
Merge branch '8-controller-laufwege' into 'development'
Resolve "[Controller] Laufwege"
Closes #8
See merge request marcel.schwarz/software-projekt-2!10
|
2020-04-22 14:29:55 +00:00 |
|
127-Z3R0
|
b87eb3dd53
|
delete portrait-mode and more refactoring with master Aldin
|
2020-04-22 16:29:28 +02:00 |
|
127-Z3R0
|
6712398f6a
|
forgive me master
|
2020-04-22 16:25:06 +02:00 |
|
Ömer Özel
|
dffcb320b2
|
Background add
|
2020-04-22 16:22:06 +02:00 |
|
127-Z3R0
|
b7128f8c03
|
add xcshareddata to gitignore
|
2020-04-22 16:07:33 +02:00 |
|
127-Z3R0
|
e91b2c3220
|
refactoring with master Aldin
|
2020-04-22 15:59:31 +02:00 |
|
127-Z3R0
|
d596442015
|
add physicsbody to base 6-7 and removal to func addPhysicsBodyToBase()
|
2020-04-22 14:04:40 +02:00 |
|
127-Z3R0
|
7b128a7ee8
|
delete commented Code and prints
|
2020-04-21 20:07:36 +02:00 |
|
Chauntalle Schüle
|
9be1401506
|
Change Variables
|
2020-04-21 19:16:35 +02:00 |
|
Simon Kellner
|
f2be3a955b
|
add logo files in different sizes, update filenames in Contents.json
|
2020-04-21 16:24:01 +02:00 |
|
Chauntalle Schüle
|
06a4bea38d
|
add struct für die Einheiten im File Unit.swift
|
2020-04-21 13:59:06 +02:00 |
|
127-Z3R0
|
f3036a5b33
|
fix interaction-menu with base - zPosition
|
2020-04-20 14:32:34 +02:00 |
|
127-Z3R0
|
4acd12ddc5
|
add PhysicsBody for Drag&Drop Functionality
|
2020-04-20 14:21:55 +02:00 |
|
127-Z3R0
|
7d57decb93
|
fix bound.size problem
|
2020-04-20 14:17:09 +02:00 |
|
127-Z3R0
|
dace2364da
|
add addLines, connectBases
|
2020-04-20 12:58:47 +02:00 |
|
Niko Jochim
|
105a55644f
|
modify GameScene Init, add createVirginBases
|
2020-04-20 12:49:49 +02:00 |
|
Niko Jochim
|
9a560d2fa0
|
changed base to SKSpriteNode and add effects touch/move
|
2020-04-20 12:33:57 +02:00 |
|
Marcel Schwarz
|
63e0336413
|
Merge branch '6-controller-basis' into 'development'
Resolve "[Controller] Basis"
Closes #6
See merge request marcel.schwarz/software-projekt-2!7
|
2020-04-19 13:08:51 +00:00 |
|
|
|
ee69f2c345
|
Add Bases, Autospawn 15 Bases
Add visual effect when base is touched
|
2020-04-19 02:42:47 +02:00 |
|
|
|
79dcc78f75
|
Make base spawn at touch
|
2020-04-19 02:42:16 +02:00 |
|
|
|
e82a7a90d2
|
Change Base texture to generic one
|
2020-04-19 02:38:26 +02:00 |
|
|
|
819ad764e3
|
Remove .gitattributes
It destroys the xcode project file
|
2020-04-19 02:28:25 +02:00 |
|
Aldin Duraki
|
8f41a42621
|
Update .gitattributes
|
2020-04-18 17:52:37 +00:00 |
|
Marcel Schwarz
|
b3109e3621
|
Merge branch '3-hauptmenu' into 'development'
"Hauptmenü" first-steps
See merge request marcel.schwarz/software-projekt-2!5
|
2020-04-18 17:14:28 +00:00 |
|
Aldin Duraki
|
e82d0a57f8
|
Impl Menu Scene
* added temporary buttons assets
|
2020-04-18 18:13:20 +02:00 |
|
Aldin Duraki
|
393c8e2e0a
|
Merge branch 'cleanup-boilerplate-code' into 'development'
Cleanup sample code
See merge request marcel.schwarz/software-projekt-2!8
|
2020-04-18 13:45:47 +00:00 |
|
|
|
4f3826df0c
|
Formatting, remove unnecessary timestamp
|
2020-04-18 15:44:17 +02:00 |
|
|
|
8dfb274416
|
Remove sample code
|
2020-04-18 15:23:38 +02:00 |
|
Aldin Duraki
|
c1638f78fa
|
Merge branch '5-view-basis' into 'development'
Resolve "[View] Basis"
Closes #5
See merge request marcel.schwarz/software-projekt-2!4
|
2020-04-18 12:17:04 +00:00 |
|
Marcel Schwarz
|
90736a6785
|
Resolve "[View] Basis"
|
2020-04-18 12:17:04 +00:00 |
|
