|
|
0b4e9ad48e
|
Merge branch '31-debug-flag-fur-matchmaking' into 'development'
Resolve "Debug Flag für Matchmaking"
Closes #31
See merge request marcel.schwarz/software-projekt-2!43
|
2020-05-05 16:19:35 +00:00 |
|
Simon Kellner
|
084b79a7c0
|
Add flag(--no-matchmaking) to prevent matchmaking process and instantly open GameScene
|
2020-05-05 18:15:18 +02:00 |
|
Aldin Duraki
|
350682cf82
|
Merge branch '26-mm-anbindung-an-gamecenter' into 'development'
Resolve "[MM] Anbindung an GameCenter"
Closes #26
See merge request marcel.schwarz/software-projekt-2!40
|
2020-05-05 13:09:39 +00:00 |
|
Chauntalle Schüle
|
d97b124b83
|
cleaned up code
|
2020-05-05 11:44:33 +02:00 |
|
Chauntalle Schüle
|
3aef30b495
|
Kommentare eingefügt
Spielerzuweisung wird getestet
|
2020-05-05 11:00:11 +02:00 |
|
Ömer Özel
|
b8b37de349
|
Push MM
|
2020-05-05 00:35:27 +02:00 |
|
Chauntalle Schüle
|
e1d5af8a4a
|
matchmaking funktioniert
|
2020-05-04 23:44:23 +02:00 |
|
Chauntalle Schüle
|
e21395d0db
|
Checken ob match gefunden wurde
|
2020-05-04 21:44:50 +02:00 |
|
Chauntalle Schüle
|
54d31d929d
|
Update MatchMakerHelper, added methods
|
2020-05-04 20:34:58 +02:00 |
|
Chauntalle Schüle
|
017e99183b
|
add File to Project Tree
|
2020-05-04 15:22:48 +02:00 |
|
Chauntalle Schüle
|
71a59f2fa0
|
Add MatchmakingViewController
|
2020-05-04 15:13:04 +02:00 |
|
Aldin Duraki
|
bf88e1af83
|
Merge branch '19-einheiten-bewegen' into 'development'
Resolve "Einheiten bewegen"
See merge request marcel.schwarz/software-projekt-2!39
|
2020-05-03 13:50:15 +00:00 |
|
Niko
|
9b3bdbf34b
|
implemented touch functionality
|
2020-05-03 15:46:48 +02:00 |
|
Aldin Duraki
|
44beb7ba4a
|
Merge branch '29-uberarbeitung-der-menuscene-button' into 'development'
Resolve "Überarbeitung der MenuScene & Button"
Closes #29
See merge request marcel.schwarz/software-projekt-2!37
|
2020-05-02 22:15:20 +00:00 |
|
Niko
|
d72c10fa75
|
implement Background Entity and Component
|
2020-05-03 00:14:32 +02:00 |
|
Niko
|
94d7be35ff
|
implemented ButtonEntity
|
2020-05-02 23:12:37 +02:00 |
|
Niko
|
fcf49e656d
|
Merge remote-tracking branch 'origin/29-uberarbeitung-der-menuscene-button' into cleanup_scenes
|
2020-05-02 22:31:12 +02:00 |
|
Niko
|
fae2855bf9
|
stash
|
2020-05-02 22:29:16 +02:00 |
|
Aldin Duraki
|
1cf0704af0
|
Merge branch '25-protokoll-fur-map-interaktion' into 'development'
Align test map to MapProtocol
Closes #25
See merge request marcel.schwarz/software-projekt-2!36
|
2020-05-02 20:18:45 +00:00 |
|
|
|
5eed82803b
|
Remove unnecessary field form MapFactory
|
2020-05-02 21:55:08 +02:00 |
|
|
|
7fc4a5145f
|
Do some polishing
|
2020-05-02 21:52:43 +02:00 |
|
|
|
0dbcbe5eb0
|
Move adjacency list into base
Fix typo in MapProtocol
Improve MapFactory
Generalize MapProtocol
|
2020-05-02 21:45:21 +02:00 |
|
|
|
54813ab44d
|
Fix indentation in Base entity
|
2020-05-02 21:08:10 +02:00 |
|
|
|
67a345e9bf
|
Add adjacency mapping
|
2020-05-02 20:47:33 +02:00 |
|
|
|
918979d750
|
Introduce column based layout
|
2020-05-02 20:22:31 +02:00 |
|
|
|
ffd4e0dfe0
|
Initialize team in Base model with default nil
|
2020-05-02 20:13:31 +02:00 |
|
|
|
c1bb6a47de
|
Create Map Factory, remove texture name from base constructor
|
2020-05-02 20:08:30 +02:00 |
|
|
|
5a7c29b3b8
|
Extract player bases, simplify layout definition
|
2020-05-02 19:07:02 +02:00 |
|
|
|
ffc4c05a46
|
Extract default test map, add map protocol to game scene
|
2020-05-02 18:48:23 +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 |
|
