hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
432 Commits 11 Branches 0 Tags 8.8 MiB
742123ea63
Commit Graph

432 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
42446a7d49 Remove Modal when round ends, to prevent sending already dead units 2020-06-18 00:19:30 +02:00
Marcel Schwarz
afad3e808e Remove base details modal 2020-06-18 00:03:53 +02:00
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
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
Marcel Schwarz
15fb959315 Hide label with unit counts when attacking a base 2020-06-11 22:43:16 +02:00
Marcel Schwarz
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
Marcel Schwarz
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
Simon Kellner
c517a36adc Add Leaderboard managing methods 2020-06-10 18:48:07 +02:00
Marcel Schwarz
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
Marcel Schwarz
4e8b42d81c Fix warning while casting entity to base 2020-06-10 14:58:32 +02:00
Marcel Schwarz
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
Marcel Schwarz
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
Simon Kellner
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