Niko
|
fae2855bf9
|
stash
|
2020-05-02 22:29:16 +02:00 |
|
Aldin Duraki
|
df58c822a1
|
Merge branch '25-protokoll-fur-map-interaktion' into 'development'
Files for "Protokoll für Map-interaktion"
See merge request marcel.schwarz/software-projekt-2!34
|
2020-05-02 16:12:05 +00:00 |
|
|
|
4c37ac690c
|
Move files to correct directory
|
2020-05-02 18:11:01 +02:00 |
|
|
|
5eb9daa02b
|
Create files for Map model
|
2020-05-02 18:06:18 +02:00 |
|
Aldin Duraki
|
b8edc830fb
|
Merge branch '18-auth-anbindung-an-gamecenter' into 'development'
Resolve "[AUTH] Anbindung an GameCenter"
Closes #18
See merge request marcel.schwarz/software-projekt-2!33
|
2020-05-02 14:17:42 +00:00 |
|
Jakob Haag
|
868e10e7a4
|
fix spelling
|
2020-05-02 16:16:16 +02:00 |
|
Jakob Haag
|
311b19d9c2
|
add label of user is not logged in to GameCenter
|
2020-05-02 16:15:03 +02:00 |
|
Jakob Haag
|
cdb67f2d7c
|
remove unused code and format
|
2020-05-02 16:14:46 +02:00 |
|
Jakob Haag
|
bb98c9d0a6
|
add rest of necessary swift files
|
2020-05-02 14:04:08 +02:00 |
|
Jakob Haag
|
c6d1adce9b
|
init 100 units to the team-bases on init
|
2020-05-02 14:03:41 +02:00 |
|
Jakob Haag
|
e8654fbf54
|
move team-enum out of class
|
2020-05-02 14:03:14 +02:00 |
|
Jakob Haag
|
e9bd05c852
|
add GameCenterLogin-window to the GameViewController and fix size of the MenueScene
|
2020-05-02 14:02:24 +02:00 |
|
Jakob Haag
|
cdb4d69621
|
Add window to menu to see if the user is authenticated (ToDo)
|
2020-05-02 14:01:05 +02:00 |
|
Jakob Haag
|
0a94e64a25
|
add GameCenterHelper to login to GameCenter and recognize authenticated user
|
2020-05-02 13:59:34 +02:00 |
|
Aldin Duraki
|
8a3357280e
|
Merge branch '19-einheiten-bewegen' into 'development'
Resolve "Einheiten bewegen"
See merge request marcel.schwarz/software-projekt-2!30
|
2020-05-01 23:24:42 +00:00 |
|
Niko Jochim
|
aae0a49da0
|
add fire to homebase
|
2020-05-02 01:22:53 +02:00 |
|
Aldin Duraki
|
cda2e08624
|
Merge branch '28-moving-background' into 'development'
Resolve "Moving Background"
Closes #28
See merge request marcel.schwarz/software-projekt-2!29
|
2020-05-01 22:16:04 +00:00 |
|
Niko Jochim
|
5b7c5039e1
|
add background to menu-scene
|
2020-05-02 00:14:21 +02:00 |
|
Niko Jochim
|
8d1aa1de66
|
added moving cloudy background
|
2020-05-01 23:57:23 +02:00 |
|
127-Z3R0
|
d8d80b8eb7
|
add asset SkyBackground and Components
|
2020-05-01 23:43:37 +02:00 |
|
Aldin Duraki
|
473bf86c92
|
Merge branch '23-arc-architektur-des-projektes' into 'development'
Resolve "[ARC] Architektur des Projektes"
Closes #23
See merge request marcel.schwarz/software-projekt-2!28
|
2020-05-01 21:35:46 +00:00 |
|
Niko Jochim
|
3b80b945c4
|
impl. hud
|
2020-05-01 23:33:46 +02:00 |
|
Aldin Duraki
|
b7ca10acf7
|
Merge branch 'fix-teamComponents' into 'development'
fix teamComponents reference
See merge request marcel.schwarz/software-projekt-2!27
|
2020-05-01 20:04:13 +00:00 |
|
Niko Jochim
|
323ca45e51
|
fix teamComponents reference
|
2020-05-01 22:02:26 +02:00 |
|
Aldin Duraki
|
f7fbeba1cc
|
Merge branch '17-popup-action-auf-basis-click' into 'development'
Resolve "PopUp Action auf Basis-click"
Closes #17
See merge request marcel.schwarz/software-projekt-2!26
|
2020-05-01 19:50:23 +00:00 |
|
Niko Jochim
|
2ff1a1d705
|
add pop-Up base-details
|
2020-05-01 21:47:43 +02:00 |
|
Aldin Duraki
|
579eae6c57
|
Merge branch '23-arc-architektur-des-projektes' into 'development'
Resolve "[ARC] Architektur des Projektes"
Closes #23
See merge request marcel.schwarz/software-projekt-2!24
|
2020-05-01 15:58:07 +00:00 |
|
Niko Jochim
|
706c879351
|
change architecture to entity-component
|
2020-05-01 17:55:42 +02:00 |
|
Aldin Duraki
|
6127f89e78
|
impf. EntityManager
|
2020-05-01 15:28:47 +02:00 |
|
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 |
|
