Commit Graph

326 Commits

Author SHA1 Message Date
Aldin Duraki
6e7758767f Merge branch 'sprint_2_version' into 'development'
change Build version

See merge request marcel.schwarz/software-projekt-2!46
2020-05-07 19:04:54 +00:00
82joni1bif
91bc4fa59c change Build version 2020-05-07 21:02:23 +02:00
Aldin Duraki
5bd8aa2083 Merge branch '20-timer-anbindung-an-gamecenter' into 'development'
Resolve "[TIMER] Anbindung an GameCenter"

See merge request marcel.schwarz/software-projekt-2!42
2020-05-07 18:43:34 +00:00
82joni1bif
b602841f8d Merge branch 'development'
Conflicts:
	GoldWars/GoldWars.xcodeproj/project.pbxproj
	GoldWars/GoldWars/Entities/EntityManager.swift
2020-05-07 20:19:40 +02:00
Aldin Duraki
dcd4a10d08 Merge branch '19-einheiten-bewegen' into 'development'
Resolve "Einheiten bewegen"

Closes #19

See merge request marcel.schwarz/software-projekt-2!41
2020-05-07 18:17:42 +00:00
Aldin Duraki
6b8b11d14e Merge branch 'development' into '19-einheiten-bewegen'
# Conflicts:
#   GoldWars/GoldWars/GameViewController.swift
2020-05-07 18:17:24 +00:00
82joni1bif
c196ba721f ... 2020-05-07 20:14:53 +02:00
Niko Jochim
3580d5537e fix SliderComponent 2020-05-06 12:57:41 +02:00
Niko Jochim
185358a3d5 * Impl. basic attacking functionality
* added attacking Modal
2020-05-06 02:17:25 +02:00
Daniel Steckert
423ccc3208 Implement timer during rounds 2020-05-05 22:34:08 +02:00
Daniel Steckert
7254183d9e Merge remote-tracking branch 'refs/remotes/origin/20-timer-anbindung-an-gamecenter' 2020-05-05 21:39:08 +02:00
Daniel Steckert
58d7a01fd1 Implement TimerComponent 2020-05-05 21:37:58 +02:00
Aldin Duraki
3b417cbe0e Minor code cleanup 2020-05-05 11:16:27 -07:00
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
Daniel Steckert
9a7a8adaf8 Implement TimerComponent 2020-05-05 17:19:04 +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