Commit Graph

368 Commits

Author SHA1 Message Date
f852aae859 Implement EloSystem in EloHelper
Calculate new EloData for both sides on serverside
Report scores on both sides
New Data type for sharing EloData
2020-06-18 20:10:08 +02:00
875524d170 Merge branch '66-game-over-scene-2' into 'development'
Resolve "Game-Over Scene"

Closes #66

See merge request marcel.schwarz/software-projekt-2!115
2020-06-18 17:50:35 +00:00
Niko Jochim
3c4ae97b61 fix getBackground to return a optional 2020-06-18 19:48:46 +02:00
Niko Jochim
b22e645163 review changes 2020-06-18 19:30:27 +02:00
Niko Jochim
e76f86b126 clean Code 2020-06-18 17:24:34 +02:00
Niko Jochim
e2c08b51a2 add winner/loser Icons
* remove SpinningLogoComponent
* create SoinningLogoNode
2020-06-18 17:13:44 +02:00
Niko Jochim
8df133f896 setLabel Names 2020-06-18 12:55:37 +02:00
Niko Jochim
f363d30f15 rest RoundCalculatorService 2020-06-18 11:51:56 +02:00
Niko Jochim
48e6247b69 Pfusch von Aldin.D 2020-06-18 11:51:56 +02:00
Niko Jochim
3082297415 create GameEnd Animation 2020-06-18 11:51:56 +02:00
Niko Jochim
b29111cb9e create gameEnd Trigger 2020-06-18 11:51:00 +02:00
dc3ef818df Merge branch '105-basen-disablen-sobald-zug-durch-done-beendet-wurde' into 'development'
Resolve "Basen disablen, sobald Zug durch Done beendet wurde"

Closes #105

See merge request marcel.schwarz/software-projekt-2!126
2020-06-17 22:54:26 +00:00
Jakob Haag
9de3e2cfa5 Add blockWholeScreenPane to disable clicks after Done was clicked 2020-06-18 00:49:53 +02:00
c46849e95d Merge branch '103-info-modal-entfernen' into 'development'
Resolve "Info-Modal entfernen"

Closes #103

See merge request marcel.schwarz/software-projekt-2!125
2020-06-17 22:20:26 +00:00
42446a7d49 Remove Modal when round ends, to prevent sending already dead units 2020-06-18 00:19:30 +02:00
afad3e808e Remove base details modal 2020-06-18 00:03:53 +02:00
0d8a134445 Merge branch '104-teamkomponente-loschen' into 'development'
Resolve "Teamkomponente löschen"

Closes #104

See merge request marcel.schwarz/software-projekt-2!124
2020-06-17 21:35:18 +00:00
Jakob Haag
5aa10e3fc5 review changes 2020-06-17 23:34:48 +02:00
71c01d589c Fix Spy-Skill to show labels again 2020-06-17 23:29:05 +02:00
Jakob Haag
07e630881e Remove fireNode if base has no ownership. Move unitcount Label from BaseComponent to Teamcomponent and remove it if base has no ownership. Remove unused Team-Enum cases. Remove unused team-colors. 2020-06-17 22:19:50 +02:00
f50d00a416 Merge branch '92-bei-angriff-unitcountlabel-anpassen' into 'development'
Resolve "Bei Angriff unitCountLabel anpassen"

Closes #92

See merge request marcel.schwarz/software-projekt-2!119
2020-06-12 13:26:15 +00:00
15fb959315 Hide label with unit counts when attacking a base 2020-06-11 22:43:16 +02:00
e10d57968c Merge branch '84-nachkomma-stellen-entfernen' into 'development'
Resolve "Nachkomma-Stellen entfernen"

Closes #84

See merge request marcel.schwarz/software-projekt-2!110
2020-06-11 20:42:08 +00:00
Chauntalle Schüle
f871bfda1d Units now only shown in slider of modal as Integer 2020-06-11 22:38:55 +02:00
00f8fbc61a Merge branch '49-leaderboard-einbauen' into 'development'
Resolve "Leaderboard einbauen"

Closes #49

See merge request marcel.schwarz/software-projekt-2!117
2020-06-11 20:35:54 +00:00
c517a36adc Add Leaderboard managing methods 2020-06-10 18:48:07 +02:00
1a9c075dce Merge branch '87-vektorisierte-wege' into 'development'
Resolve "Vektorisierte Wege"

Closes #87

See merge request marcel.schwarz/software-projekt-2!113
2020-06-10 13:00:30 +00:00
4e8b42d81c Fix warning while casting entity to base 2020-06-10 14:58:32 +02:00
04e55be394 Remove orphan files 2020-06-10 14:55:04 +02:00
Jakob Haag
502c609d81 remove old unused unnecessary DefaultWayComponent and rename for better understanding 2020-06-10 14:49:29 +02:00
Jakob Haag
ad9e970ef6 fix gap between two crossed curves 2020-06-10 14:49:29 +02:00
Jakob Haag
ed764afc45 remove Ways as Component and add function to generate different types of ways 2020-06-10 14:49:29 +02:00
79781ccdc9 Merge branch '97-music-flag' into 'development'
Resolve "Music Flag"

Closes #97

See merge request marcel.schwarz/software-projekt-2!116
2020-06-09 21:48:08 +00:00
Aldin Duraki
376ed849ae Merge branch '98-appdelegate' into 'development'
Resolve "AppDelegate"

Closes #98

See merge request marcel.schwarz/software-projekt-2!114
2020-06-09 16:07:52 +00:00
2f32943511 Add --no-music flag, Implement NSUserDefaults for music settings 2020-06-08 10:42:05 +02:00
Aldin Duraki
e6d866bc70 For better understanding 2020-06-06 19:20:13 +02:00
Aldin Duraki
a37187bbad Impl. AppDelegates handlings 2020-06-06 18:59:26 +02:00
Aldin Duraki
46fa90bfe3 Merge branch 'sprint_4_delivery' into 'development'
Sprint 4 delivery

See merge request marcel.schwarz/software-projekt-2!108
2020-06-04 16:16:31 +00:00
Aldin Duraki
a26efeb3d1 Update Build Version 2020-06-04 18:15:48 +02:00
Aldin Duraki
fbc6a63232 Merge branch '58-spy-boost-faehigkeit-implementieren' into 'development'
Resolve "Spy-Boost Faehigkeit implementieren"

Closes #58

See merge request marcel.schwarz/software-projekt-2!102
2020-06-02 21:47:18 +00:00
Daniel Steckert
97d51411dc Enable ability for both player and change trigger to current round 2020-06-02 23:46:08 +02:00
Daniel Steckert
c0153d43d4 Add function to button 2020-06-02 23:44:30 +02:00
Aldin Duraki
c68ed6ea97 Merge branch '42-explosion-animation-beim-angriff' into 'development'
Resolve "Explosion Animation beim Angriff"

Closes #42

See merge request marcel.schwarz/software-projekt-2!107
2020-06-02 21:12:23 +00:00
Aldin Duraki
631b184564 Implemented Explosion Animation 2020-06-02 23:11:15 +02:00
Aldin Duraki
69927d35fa Merge branch '39-spielendkriterium' into 'development'
Resolve "Spielendkriterium"

Closes #39

See merge request marcel.schwarz/software-projekt-2!105
2020-06-02 20:34:02 +00:00
127-Z3R0
cbf288e86d minor refactoring 2020-06-02 22:33:28 +02:00
127-Z3R0
09062d5f5d add isGameOver and determineHost func
* adjust position finish button

small refactoring and delete prints -> ready to merge
2020-06-02 22:10:56 +02:00
127-Z3R0
028282f784 implement RoundIncrement feature 2020-06-02 20:52:39 +02:00
127-Z3R0
48361738ba add RoundCount directly to HUD
* add backgroundRoundCounter, currentRoundLabel, roundsLabel and roundlabel
* add necessary Assets to project
* add labels to EntityManager
* minor refactoring in RoundCalculatorService and SettingsScene
2020-06-02 20:52:39 +02:00
Aldin Duraki
0c2b621b05 Merge branch '65-achivements-einbauen' into 'development'
Resolve "Achivements einbauen"

Closes #65

See merge request marcel.schwarz/software-projekt-2!96
2020-06-02 18:36:18 +00:00