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
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
70cfe9719b
Merge branch 'development'
2020-06-04 18:40:43 +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
Niko Jochim
84ef233f9f
add new Assets
...
* change Base Texture
* change Background Texture
* change ModalBackgrund Texture
* add RedCross Texture
* set Button Texture in SettingsScene
* adjust Texture Positions
2020-05-29 11:45:28 +02:00
Niko Jochim
9329978981
* create new GameCenterManager
...
* send RandomNumber to all Peers Method
2020-05-27 20:41:05 +00:00
Jakob Haag
f7e4188143
Add limit of moves
...
* set limit of moves. 1 attack and 5 own unit moves
* update move-limiter after submit button of modal
* increase number of attack to two able attacks
2020-05-26 20:11:16 +02:00
288438884e
Refactor complete entity component model
2020-05-26 18:57:32 +02:00
2c31d923c6
Reset all bases when moveTouch is finished
2020-05-24 14:48:17 +02:00
127-Z3R0
7e2b1b7a54
* Refactor for Master of the Universe
2020-05-23 19:02:39 +02:00
127-Z3R0
e447a37757
* Add 3 Instances for each Scene
...
* Refactor in Code that the right instances is called
* Probs to Aldin und nicht an Niko, der nur im Bett liegt
2020-05-23 18:36:59 +02:00
Aldin Duraki
df7c86f57e
Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"
...
This reverts merge request !60
2020-05-21 17:44:26 +00:00
Niko Jochim
b2f84bc3f4
set zPosistion on all Nodes
...
update host and peer Label Nodes
2020-05-21 19:40:46 +02:00
Niko Jochim
bf8ce0c477
Merge branch 'development'
2020-05-21 18:00:15 +02:00
Niko Jochim
d16867f367
add label with 100000000 changes
2020-05-21 17:59:19 +02:00
Aldin Duraki
841bda9d9b
Readded sleep
2020-05-21 15:48:32 +02:00
Aldin Duraki
8e22f02c7a
* Impl. debugging move on MapGeneration
...
* Changed fire particle with master designer niko von jochim
2020-05-21 03:18:07 +02:00
Aldin Duraki
9fd34d9a6c
Minor fixes
2020-05-21 02:44:38 +02:00
Aldin Duraki
ad44ba8302
Synching players timer since playermoves would not register before calculating
2020-05-21 00:29:19 +02:00
Aldin Duraki
5df7fd3dac
TEST: playermoves not synched in same second
2020-05-20 23:46:40 +02:00
Aldin Duraki
a8c42fa0b0
Fix slider min max unit values
2020-05-20 23:36:48 +02:00
Aldin Duraki
5f7b12c28c
* Changed slider behavior to not take MAX and 0 value as unit counts to send
2020-05-20 23:20:05 +02:00
Aldin Duraki
458d50e4b3
FIXME solved by extending the TeamComponent behavior
2020-05-20 22:59:32 +02:00
Aldin Duraki
604001a365
* Impl. a usecase of a fight scenario
...
* Reset playermoves when necessary
2020-05-20 22:14:29 +02:00
