Chauntalle Schüle
aee6ec1ac1
adding bigger changes after review, deleted enum und methods enter&changeState
2020-06-03 01:09:06 +02:00
Chauntalle Schüle
9eb06b54fd
made smaller changes after review
2020-06-03 01:07:45 +02:00
Chauntalle Schüle
c5867f12e3
removed unnecessary file
2020-06-03 01:06:34 +02:00
Chauntalle Schüle
c4a4a8f755
deleted comments
2020-06-03 01:06:34 +02:00
Chauntalle Schüle
35ff2208fb
found right trigger for syncingSt and gameSt after finishing a Round
2020-06-03 01:03:17 +02:00
Chauntalle Schüle
079ae4a6f6
still halting game when syncing
2020-06-03 01:03:17 +02:00
Chauntalle Schüle
b23071bb08
menuSt, syncSt and gameSt now correctly triggered even in MM, menuSc and gameSc loaded in states, still need to find trigger for syncSt after finishing one timer cycle / round
2020-06-03 01:00:34 +02:00
Chauntalle Schüle
f4847e79d7
update the first three states before trying sth different
2020-06-03 01:00:34 +02:00
Chauntalle Schüle
3ea48c399e
added info that you're once again entering the same state you're already in
2020-06-03 00:59:56 +02:00
Chauntalle Schüle
0492ab7724
updated update method of menuState
2020-06-03 00:59:56 +02:00
Chauntalle Schüle
78c5016576
new group states
2020-06-03 00:59:56 +02:00
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
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
