Commit Graph

310 Commits

Author SHA1 Message Date
Chauntalle Schüle
f9a14852f5 update Textures 2020-06-25 19:25:21 +02:00
Chauntalle Schüle
2d38373590 Merge branch 'development' into 89-regelwerk 2020-06-25 13:12:05 +02:00
Aldin Duraki
c344ff82f4 Fix for #109 & #110 2020-06-25 12:39:53 +02:00
Chauntalle Schüle
3b6647b817 added Credits 2020-06-25 12:38:29 +02:00
Chauntalle Schüle
8758246798 Merge branch 'development' into 89-regelwerk 2020-06-25 00:39:54 +02:00
5cbe20e6c8 Delete unused sound-file 2020-06-24 22:00:16 +02:00
Daniel Steckert
7e1a80e33a Add logging and remove local references to files 2020-06-24 21:16:16 +02:00
Daniel Steckert
bd1d29d6ac Change sound files and remove sound effect for timer 2020-06-24 21:16:16 +02:00
Daniel Steckert
e53e3953dc Trigger sound effects 2020-06-24 21:16:16 +02:00
Daniel Steckert
6370d40e25 Add soundfiles 2020-06-24 21:16:16 +02:00
13bc1b46d5 Update base label only when was not empty before 2020-06-23 20:52:55 +02:00
d05364708b Use player move type to update unit count label 2020-06-23 20:52:27 +02:00
9a041c7310 Remove unnecessary complexity, Reformat code 2020-06-23 19:59:28 +02:00
Chauntalle Schüle
a52e4cd8d1 changes after review 2020-06-23 18:55:47 +02:00
Chauntalle Schüle
23cd0ade20 changed questionmark asset 2020-06-21 23:25:58 +02:00
Chauntalle Schüle
29adaf14a7 same functionality just cleaned up code 2020-06-20 01:23:19 +02:00
Chauntalle Schüle
b945f1e236 adding all Rules as Textures 2020-06-20 01:11:19 +02:00
Chauntalle Schüle
0985e02c3d Merge branch 'development' into 89-regelwerk 2020-06-19 13:46:36 +02:00
Chauntalle Schüle
e878016e4f - added new asset questionmark
- added new Scene: RulesScene
- added button to menuScene to load RulesScene
- finished layout of RulesScene
- finished rules of Spielbeschreibung
2020-06-19 02:15:51 +02:00
c8bdc40c12 Set gray overlay for done to invisible for better understanding 2020-06-18 23:07:24 +02:00
Niko Jochim
bddad86674 review changes 2020-06-18 22:53:41 +02:00
Niko Jochim
adf01db4bf FIX Slider performance
* create hidden silderKnob
2020-06-18 22:28:49 +02:00
Niko Jochim
fca44f3072 Refine logo and buttons in MainScene 2020-06-18 21:01:22 +02:00
Niko Jochim
5d14a8bd56 create GoldWars lettering
+ add new Gold Button Texture
2020-06-18 21:01:22 +02:00
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
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
Jakob Haag
9de3e2cfa5 Add blockWholeScreenPane to disable clicks after Done was clicked 2020-06-18 00:49:53 +02: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
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
15fb959315 Hide label with unit counts when attacking a base 2020-06-11 22:43:16 +02:00
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