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

405 Commits

This Branch
This Branch
All Branches
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
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
Marcel Schwarz
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
Marcel Schwarz
dab98b9256 Fix ownership after snapshotReveive 2020-06-01 19:12:47 +02:00
Marcel Schwarz
64d2c04fcb Swap playWithMaxUnits after applying boosts 2020-06-01 18:29:17 +02:00
Marcel Schwarz
2820c7357a Remove optionals on localRoundData 2020-06-01 17:37:43 +02:00
Marcel Schwarz
4c9d83c7cb Add localRoundData 
Send boosts
 2020-06-01 17:27:13 +02:00
Marcel Schwarz
a423942182 Send boosts with snapshot model, increase unit counts accordingly 2020-05-31 23:14:06 +02:00
Marcel Schwarz
6b1d0eac12 Add atk and def boost to PlayerMove struct 2020-05-31 19:04:58 +02:00
Marcel Schwarz
0d20cc6716 Collect baseSpecificMoves in separate function 2020-05-31 14:45:57 +02:00
Marcel Schwarz
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
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
Marcel Schwarz
0b09180f83 Merge branch '80-entfernen-von-unnoetigem-map-code' into 'development' 
Resolve "Entfernen von unnoetigem map code"

Closes #80

See merge request marcel.schwarz/software-projekt-2!100
 2020-05-29 15:01:21 +00:00
Marcel Schwarz
61f3ab14fc Update log subsystem in MapFactory 2020-05-29 16:51:43 +02:00
Marcel Schwarz
ed5d5caa15 Remove orphan files 2020-05-29 16:39:12 +02:00
Marcel Schwarz
387303af3a Pull getMapModel in the MapModelStruct 2020-05-29 16:32:17 +02:00
Marcel Schwarz
08dfe6a922 Pull TwoPlayerMapGenerator in as MapFactory 2020-05-29 16:23:56 +02:00
Marcel Schwarz
40ba0f4468 Remove MapProtocol 2020-05-29 16:14:14 +02:00
Marcel Schwarz
b210e04d38 Remove TestMap 2020-05-29 16:09:42 +02:00
Marcel Schwarz
02c7903705 Merge branch '38-verschiedene-modals-fuer-angriff-und-verschieben' into 'development' 
Resolve "Verschiedene Modals fuer Angriff und Verschieben"

Closes #38

See merge request marcel.schwarz/software-projekt-2!81
 2020-05-29 13:58:06 +00: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
Marcel Schwarz
4773424bf6 Merge branch '45-validierung-kommerzieller-assets' into 'development' 
Resolve "Validierung kommerzieller Assets"

Closes #45

See merge request marcel.schwarz/software-projekt-2!98
 2020-05-29 10:52:51 +00: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
Marcel Schwarz
0db26a7558 Merge branch '53-matchmaking-ueberarbeiten-2' into 'development' 
Resolve "Matchmaking ueberarbeiten"

Closes #53

See merge request marcel.schwarz/software-projekt-2!84
 2020-05-27 20:41:05 +00:00
Niko Jochim
9329978981 * create new GameCenterManager 
* send RandomNumber to all Peers Method
 2020-05-27 20:41:05 +00:00
Marcel Schwarz
23707cb1d9 Merge branch '70-anzahl-zuege-pro-runde' into 'development' 
Resolve "Anzahl Zuege pro Runde"

Closes #70

See merge request marcel.schwarz/software-projekt-2!80
 2020-05-26 18:11:56 +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
Marcel Schwarz
23e53effd4 Merge branch 'refactoring' into 'development' 
Refactoring entitiy component model

See merge request marcel.schwarz/software-projekt-2!89
 2020-05-26 16:58:15 +00:00
Marcel Schwarz
288438884e Refactor complete entity component model 2020-05-26 18:57:32 +02:00
Marcel Schwarz
067495a57b Merge branch '79-verschiebung-der-basen-zuruecksetzen' into 'development' 
Resolve "Verschiebung der Basen zuruecksetzen"

Closes #79

See merge request marcel.schwarz/software-projekt-2!85
 2020-05-26 16:54:47 +00:00
Marcel Schwarz
2c31d923c6 Reset all bases when moveTouch is finished 2020-05-24 14:48:17 +02:00
Aldin Duraki
bb9582bee9 Merge branch '77-entity-manager-ueberarbeiten' into 'development' 
Resolve "Entity-Manager ueberarbeiten"

Closes #77

See merge request marcel.schwarz/software-projekt-2!82
 2020-05-23 18:15:43 +00: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
8b140b95b4 Merge branch '64-view-visibility-unitcount-and-playername' into 'development' 
Resolve "[View] Visibility UnitCount and Playername"

Closes #64

See merge request marcel.schwarz/software-projekt-2!77
 2020-05-21 17:41:51 +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
3ab40f94cb Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' 
Resolve "Runde beenden mit berechnetem Angriff"

Closes #36

See merge request marcel.schwarz/software-projekt-2!78
 2020-05-21 13:52:11 +00: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