Commit Graph

240 Commits

Author SHA1 Message Date
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
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
Aldin Duraki
fdb3877194 Merge branch 'development'
Conflicts:
	GoldWars/GoldWars.xcodeproj/project.pbxproj
2020-05-20 21:00:15 +02:00
fe1405d3fa Send map model to other player over data service 2020-05-20 20:33:40 +02:00
71f556868f Allow map to be loaded from predefined model 2020-05-20 20:33:40 +02:00
0fd409c00b Add Ids to C-Elements and corresponding protocol 2020-05-20 20:33:39 +02:00
Jakob Haag
4fdd95bd76 Add CElements and Ways 2020-05-20 20:33:39 +02:00
739a7120f9 Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren'
# Conflicts:
#   GoldWars/GoldWars.xcodeproj/project.pbxproj
2020-05-20 16:33:37 +00:00
ee031f71c1 Add TwoPlayerMapGenerator 2020-05-20 17:03:04 +02:00
e2bd0dc7cf Pull protocols in MapFactory
Add TwoPlayerMapGenerator
Add CenterElementProvider
Introduce Logging for MapGenerator
2020-05-20 17:03:04 +02:00
Aldin Duraki
2ac82e5159 * Minor fixes
* Open up calculator service
2020-05-20 01:41:48 +02:00
Aldin Duraki
f60e97a866 Solve missing lines on previous merge 2020-05-20 00:35:46 +02:00