Chauntalle Schüle
8537dee231
game scene and menu scene are now initialized in states, still need to test for 2 player
2020-06-03 00:59:35 +02:00
Chauntalle Schüle
0296edb080
adding var current- and previousState - set in enterState, adding func changeState
2020-06-03 00:59:35 +02:00
Chauntalle Schüle
6be5325d86
added EndGameState, deleted imports from enum StateTypes
2020-06-03 00:59:35 +02:00
Chauntalle Schüle
ce2d847393
added GameState
2020-06-03 00:58:15 +02:00
Chauntalle Schüle
50fa1b6cc6
just changed name of variable allowedState to wantedState for better understanding and correctness
2020-06-03 00:58:15 +02:00
Chauntalle Schüle
f008ecafa7
added SyncingState
2020-06-03 00:58:15 +02:00
Chauntalle Schüle
d7d17dba2b
added MenuState, is initial State
2020-06-03 00:58:15 +02:00
Chauntalle Schüle
3bbae779af
added Statemanager with Singleton, used to create and enter states, already with logging if entering state is un/successful
2020-06-03 00:57:49 +02:00
Chauntalle Schüle
767548cb82
bulk update, gonna break it up with new files in following commits
2020-06-03 00:56:37 +02:00
Chauntalle Schüle
6b602e6af2
Made first states and initialized them
2020-06-03 00:55:42 +02:00
Aldin Duraki
fbc6a63232
Merge branch '58-spy-boost-faehigkeit-implementieren' into 'development'
...
Resolve "Spy-Boost Faehigkeit implementieren"
Closes #58
See merge request marcel.schwarz/software-projekt-2!102
2020-06-02 21:47:18 +00: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
c68ed6ea97
Merge branch '42-explosion-animation-beim-angriff' into 'development'
...
Resolve "Explosion Animation beim Angriff"
Closes #42
See merge request marcel.schwarz/software-projekt-2!107
2020-06-02 21:12:23 +00:00
Aldin Duraki
631b184564
Implemented Explosion Animation
2020-06-02 23:11:15 +02:00
Aldin Duraki
69927d35fa
Merge branch '39-spielendkriterium' into 'development'
...
Resolve "Spielendkriterium"
Closes #39
See merge request marcel.schwarz/software-projekt-2!105
2020-06-02 20:34:02 +00: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
Aldin Duraki
0c2b621b05
Merge branch '65-achivements-einbauen' into 'development'
...
Resolve "Achivements einbauen"
Closes #65
See merge request marcel.schwarz/software-projekt-2!96
2020-06-02 18:36:18 +00:00
Simon Kellner
bc42399fe3
Implement GameCenter button, achivement progress func
2020-06-02 20:12:35 +02:00
Aldin Duraki
5bb1b6764a
Merge branch '74-gray-overlay-auf-nodes' into 'development'
...
Resolve "Gray Overlay auf Nodes"
Closes #74
See merge request marcel.schwarz/software-projekt-2!103
2020-06-02 09:56:02 +00:00
Aldin Duraki
08894325a5
Impl. Modal Overlay
2020-06-02 11:55:17 +02:00
Aldin Duraki
4d2b7fe6ea
Merge branch '71-finish-button' into 'development'
...
Resolve "Finish Button"
Closes #71
See merge request marcel.schwarz/software-projekt-2!91
2020-06-02 09:22:40 +00: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
392f59108b
Merge branch '69-globales-unit-wachstum' into 'development'
...
Resolve "Globales Unit Wachstum"
Closes #69
See merge request marcel.schwarz/software-projekt-2!101
2020-06-01 20:44:25 +00: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
Aldin Duraki
f0a5f5d15c
Merge branch '67-ueberarbeitung-timer-synchronisation' into 'development'
...
Resolve "Ueberarbeitung Timer Synchronisation"
Closes #67
See merge request marcel.schwarz/software-projekt-2!97
2020-06-01 17:22:56 +00: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
Aldin Duraki
823dda29ef
Merge branch '68-attack-defense-boost-in-roundcalculator' into 'development'
...
Resolve "Attack / Defense Boost in RoundCalculator"
Closes #68
See merge request marcel.schwarz/software-projekt-2!88
2020-06-01 17:16:37 +00: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
ad861f63c4
Merge branch '81-implement-attackboost-defenceboost-and-spyboost-in-hud' into 'development'
...
Resolve "Implement AttackBoost, DefenceBoost and SpyBoost in HUD"
Closes #81
See merge request marcel.schwarz/software-projekt-2!99
2020-05-29 15:22:08 +00:00
Jakob Haag
bd1848a629
remove false ways
2020-05-29 17:19:32 +02:00
