Commit Graph

269 Commits

Author SHA1 Message Date
Chauntalle Schüle
f871bfda1d Units now only shown in slider of modal as Integer 2020-06-11 22:38:55 +02:00
c517a36adc Add Leaderboard managing methods 2020-06-10 18:48:07 +02: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
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
a26efeb3d1 Update Build Version 2020-06-04 18:15:48 +02: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
631b184564 Implemented Explosion Animation 2020-06-02 23:11:15 +02: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
Simon Kellner
bc42399fe3 Implement GameCenter button, achivement progress func 2020-06-02 20:12:35 +02:00
Aldin Duraki
08894325a5 Impl. Modal Overlay 2020-06-02 11:55:17 +02:00
Jakob Haag
2ba541e369 Resize Button, adjust position and change text 2020-06-02 11:12:14 +02:00
Aldin Duraki
42f4537dc6 Fixed scope issue on collected playerMoves 2020-06-02 11:01:15 +02:00
Jakob Haag
eaa71d1d73 fix crash on spamming finish button 2020-06-02 09:34:32 +02:00
Jakob Haag
a086a7779b fix rebase issues 2020-06-01 22:47:11 +02:00
Jakob Haag
eadcec10d8 init function of finish button 2020-06-01 22:47:11 +02:00
Jakob Haag
99b57cc4cd add finishButton to HUD 2020-06-01 22:47:11 +02:00
Jakob Haag
bddd226ffd Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer 2020-06-01 22:47:11 +02:00
Jakob Haag
37fba97953 Add RoundTimer and adjust TimerComponent 2020-06-01 22:47:11 +02:00
Aldin Duraki
9cd87c6bf5 Changed captured bases behavior so that they are not allowed to move units in same Round
Fixed Merge errors
Fixed calculation on a specific fight scenario
Fixed RoundTimer 
Fixed forced unwrap on boost nil object
2020-06-01 22:43:02 +02:00
Aldin Duraki
96eb25de65 Impl. global unit count increasement functionality after each round 2020-06-01 19:40:08 +02:00
729ee968b3 Delete TimerComponent file 2020-06-01 19:22:13 +02:00
Jakob Haag
f882b7e615 Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer 2020-06-01 19:18:19 +02:00
Jakob Haag
5c6ee9fd7e Add RoundTimer and adjust TimerComponent 2020-06-01 19:18:19 +02:00
dab98b9256 Fix ownership after snapshotReveive 2020-06-01 19:12:47 +02:00
64d2c04fcb Swap playWithMaxUnits after applying boosts 2020-06-01 18:29:17 +02:00
2820c7357a Remove optionals on localRoundData 2020-06-01 17:37:43 +02:00
4c9d83c7cb Add localRoundData
Send boosts
2020-06-01 17:27:13 +02:00
a423942182 Send boosts with snapshot model, increase unit counts accordingly 2020-05-31 23:14:06 +02:00
6b1d0eac12 Add atk and def boost to PlayerMove struct 2020-05-31 19:04:58 +02:00
0d20cc6716 Collect baseSpecificMoves in separate function 2020-05-31 14:45:57 +02:00
Jakob Haag
bd1848a629 remove false ways 2020-05-29 17:19:32 +02:00
Jakob Haag
915d726160 remove SkillComponents and PlayerInfoComponent and implement them in the HUD class. Adjust the EntityManager 2020-05-29 17:19:32 +02:00
61f3ab14fc Update log subsystem in MapFactory 2020-05-29 16:51:43 +02:00
ed5d5caa15 Remove orphan files 2020-05-29 16:39:12 +02:00
387303af3a Pull getMapModel in the MapModelStruct 2020-05-29 16:32:17 +02:00
08dfe6a922 Pull TwoPlayerMapGenerator in as MapFactory 2020-05-29 16:23:56 +02:00
40ba0f4468 Remove MapProtocol 2020-05-29 16:14:14 +02:00
b210e04d38 Remove TestMap 2020-05-29 16:09:42 +02:00
Jakob Haag
f1e54a6da4 Set different header and text in the submit button for attack an enemy base or move units between own bases 2020-05-29 14:28:31 +02:00