Aldin Duraki
26b3b13459
Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development'
...
Resolve "Status eines jeweiligen Settings sollte in den Settings erkennbar sein"
Closes #82
See merge request marcel.schwarz/software-projekt-2!132
2020-06-25 12:44:52 +00:00
127-Z3R0
77ffe9a815
delete unessecary files
2020-06-25 14:42:23 +02:00
127-Z3R0
bf50703b1c
Ignore the last two Commits -> stupidy impact
...
* Access to ButtonNode via Component
* revert work and implement everything needed
2020-06-25 14:39:31 +02:00
127-Z3R0
6970f27a61
Add new Buttons to SettingsScene
...
* Due to UserDefaults change label by start
* add logging in SoundManager
finish work
2020-06-25 14:20:16 +02:00
127-Z3R0
2f664712d0
Add designated SettingsButton for ButtonNode-Visibility
...
* modify EntityManager to add SettingsButton
* implement Method to toggle Status on/off
* in the ButtonNode make Label visible to change text after init
2020-06-25 14:19:24 +02:00
Chauntalle Schüle
2d38373590
Merge branch 'development' into 89-regelwerk
2020-06-25 13:12:05 +02:00
Aldin Duraki
1665e3e6f0
Merge branch '109-minuscount-fehler' into 'development'
...
Resolve "Minuscount Fehler"
Closes #109
See merge request marcel.schwarz/software-projekt-2!131
2020-06-25 10:40:33 +00: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
5d89636ebd
Merge branch '100-soundeffekte' into 'development'
...
Resolve "Soundeffekte"
Closes #100
See merge request marcel.schwarz/software-projekt-2!118
2020-06-24 20:06:44 +00: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
Aldin Duraki
2b2c86a4de
Merge branch '108-fix-label-wenn-basis-von-2-basen-angegriffen-werden' into 'development'
...
Resolve "Fix Label wenn Basis von 2 Basen angegriffen werden"
Closes #108
See merge request marcel.schwarz/software-projekt-2!129
2020-06-24 13:15:53 +00: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
0b2b552d16
Merge branch '102-ueberarbeitung-slider' into 'development'
...
Resolve "Ueberarbeitung Slider"
Closes #102
See merge request marcel.schwarz/software-projekt-2!128
2020-06-18 21:10:50 +00: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
ba00702e67
Merge branch '91-gold-wars-schriftzug-2' into 'development'
...
Resolve "Gold Wars Schriftzug"
Closes #91
See merge request marcel.schwarz/software-projekt-2!127
2020-06-18 19:08:16 +00: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
1039f48859
Merge branch '75-elo-system' into 'development'
...
Resolve "ELO-System"
Closes #75
See merge request marcel.schwarz/software-projekt-2!122
2020-06-18 18:31:00 +00: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
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
