hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 6cd1d618de Merge branch '65-achivements-einbauen' into 'development' Simon Kellner 2020-06-02 18:13:10 +0000
  • bc42399fe3 Implement GameCenter button, achivement progress func Simon Kellner 2020-06-02 15:29:53 +0200
  • 36ae4dc0b7 Merge branch '39-spielendkriterium' into 'development' Tim Herbst 2020-06-02 16:57:16 +0000
  • bd153968cb add roundcount and functionality to new structure 127-Z3R0 2020-06-02 18:38:39 +0200
  • 1074d244b1 HUD v1 73-ueberarbeitung-spielername-und-unitcounts Aldin Duraki 2020-06-02 13:43:19 +0200
  • f4749b362c Quick Fix: kill Race Condition for nextRound() 127-Z3R0 2020-05-29 13:29:16 +0200
  • 6685acfd10 Implement isGameRunning flag and show provisional label to indicate game ending 127-Z3R0 2020-05-28 18:08:18 +0200
  • f682815480 TEST flag isGameRunning Niko Jochim 2020-05-28 17:30:37 +0200
  • f5c363d625 TEST: if criterion for GameOver reach, set MenuScene to present * add isGameOver to RoundCalculator * modify TimerComponent 127-Z3R0 2020-05-28 14:47:10 +0200
  • bb943668af FIX pbxproj file and restore old status 127-Z3R0 2020-05-28 13:47:59 +0200
  • 5b5e9b3ec7 Revert "Add round counter" 127-Z3R0 2020-05-28 13:39:12 +0200
  • 7e6be70862 Add round counter 127-Z3R0 2020-05-27 16:56:27 +0200
  • 5bb1b6764a Merge branch '74-gray-overlay-auf-nodes' into 'development' Aldin Duraki 2020-06-02 09:56:02 +0000
  • 64fab3c6d8 Merge branch '74-gray-overlay-auf-nodes' into 'development' Aldin Duraki 2020-06-02 09:55:38 +0000
  • 08894325a5 Impl. Modal Overlay Aldin Duraki 2020-06-02 11:55:17 +0200
  • 4d2b7fe6ea Merge branch '71-finish-button' into 'development' Aldin Duraki 2020-06-02 09:22:40 +0000
  • 759a60f7a5 Merge branch '71-finish-button' into 'development' Jakob Haag 2020-06-02 09:12:37 +0000
  • 2ba541e369 Resize Button, adjust position and change text Jakob Haag 2020-06-02 11:06:49 +0200
  • 42f4537dc6 Fixed scope issue on collected playerMoves Aldin Duraki 2020-06-02 11:01:15 +0200
  • eaa71d1d73 fix crash on spamming finish button Jakob Haag 2020-06-02 09:34:32 +0200
  • a086a7779b fix rebase issues Jakob Haag 2020-06-01 20:34:44 +0200
  • eadcec10d8 init function of finish button Jakob Haag 2020-06-01 16:33:52 +0200
  • 99b57cc4cd add finishButton to HUD Jakob Haag 2020-05-28 16:52:03 +0200
  • bddd226ffd Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer Jakob Haag 2020-05-30 14:46:42 +0200
  • 37fba97953 Add RoundTimer and adjust TimerComponent Jakob Haag 2020-05-28 18:21:09 +0200
  • 392f59108b Merge branch '69-globales-unit-wachstum' into 'development' Marcel Schwarz 2020-06-01 20:44:25 +0000
  • c50a5cf77d Merge branch '69-globales-unit-wachstum' into 'development' Aldin Duraki 2020-06-01 20:43:22 +0000
  • 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 Aldin Duraki 2020-05-31 11:14:24 +0200
  • 96eb25de65 Impl. global unit count increasement functionality after each round Aldin Duraki 2020-05-31 11:09:48 +0200
  • f0a5f5d15c Merge branch '67-ueberarbeitung-timer-synchronisation' into 'development' Aldin Duraki 2020-06-01 17:22:56 +0000
  • e99b3659e4 Merge branch '67-ueberarbeitung-timer-synchronisation' into 'development' Jakob Haag 2020-06-01 17:22:22 +0000
  • 729ee968b3 Delete TimerComponent file Marcel Schwarz 2020-06-01 19:22:13 +0200
  • f882b7e615 Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer Jakob Haag 2020-05-30 14:46:42 +0200
  • 5c6ee9fd7e Add RoundTimer and adjust TimerComponent Jakob Haag 2020-05-28 18:21:09 +0200
  • 823dda29ef Merge branch '68-attack-defense-boost-in-roundcalculator' into 'development' Aldin Duraki 2020-06-01 17:16:37 +0000
  • dab98b9256 Fix ownership after snapshotReveive Marcel Schwarz 2020-06-01 19:12:47 +0200
  • 64d2c04fcb Swap playWithMaxUnits after applying boosts Marcel Schwarz 2020-06-01 18:29:17 +0200
  • 2820c7357a Remove optionals on localRoundData Marcel Schwarz 2020-06-01 17:37:43 +0200
  • 4c9d83c7cb Add localRoundData Send boosts Marcel Schwarz 2020-06-01 17:27:13 +0200
  • a423942182 Send boosts with snapshot model, increase unit counts accordingly Marcel Schwarz 2020-05-31 23:14:06 +0200
  • 6b1d0eac12 Add atk and def boost to PlayerMove struct Marcel Schwarz 2020-05-31 19:04:58 +0200
  • 0d20cc6716 Collect baseSpecificMoves in separate function Marcel Schwarz 2020-05-31 14:45:57 +0200
  • ad861f63c4 Merge branch '81-implement-attackboost-defenceboost-and-spyboost-in-hud' into 'development' Marcel Schwarz 2020-05-29 15:22:08 +0000
  • 2b89f12549 Merge branch '81-implement-attackboost-defenceboost-and-spyboost-in-hud' into 'development' Jakob Haag 2020-05-29 15:20:45 +0000
  • bd1848a629 remove false ways Jakob Haag 2020-05-29 16:42:29 +0200
  • 915d726160 remove SkillComponents and PlayerInfoComponent and implement them in the HUD class. Adjust the EntityManager Jakob Haag 2020-05-29 16:20:56 +0200
  • 0b09180f83 Merge branch '80-entfernen-von-unnoetigem-map-code' into 'development' Marcel Schwarz 2020-05-29 15:01:21 +0000
  • 1a18b79191 Merge branch '80-entfernen-von-unnoetigem-map-code' into 'development' Marcel Schwarz 2020-05-29 15:00:40 +0000
  • 61f3ab14fc Update log subsystem in MapFactory Marcel Schwarz 2020-05-29 16:51:43 +0200
  • ed5d5caa15 Remove orphan files Marcel Schwarz 2020-05-29 16:39:12 +0200
  • 387303af3a Pull getMapModel in the MapModelStruct Marcel Schwarz 2020-05-29 16:32:17 +0200
  • 08dfe6a922 Pull TwoPlayerMapGenerator in as MapFactory Marcel Schwarz 2020-05-29 16:23:56 +0200
  • 40ba0f4468 Remove MapProtocol Marcel Schwarz 2020-05-29 16:14:07 +0200
  • b210e04d38 Remove TestMap Marcel Schwarz 2020-05-29 16:09:42 +0200
  • 02c7903705 Merge branch '38-verschiedene-modals-fuer-angriff-und-verschieben' into 'development' Marcel Schwarz 2020-05-29 13:58:06 +0000
  • fa6013bdbe Merge branch '73-ueberarbeitung-spielername-und-unitcounts' into 'development' Ömer Özel 2020-05-29 13:29:37 +0000
  • 3e1722a2dc Merge branch '38-verschiedene-modals-fuer-angriff-und-verschieben' into 'development' Jakob Haag 2020-05-29 12:37:37 +0000
  • f1e54a6da4 Set different header and text in the submit button for attack an enemy base or move units between own bases Jakob Haag 2020-05-23 11:47:40 +0200
  • 4773424bf6 Merge branch '45-validierung-kommerzieller-assets' into 'development' Marcel Schwarz 2020-05-29 10:52:51 +0000
  • d72e3606e3 Merge branch '45-validierung-kommerzieller-assets' into 'development' Niko Jochim 2020-05-29 10:03:16 +0000
  • 84ef233f9f add new Assets * change Base Texture * change Background Texture * change ModalBackgrund Texture * add RedCross Texture * set Button Texture in SettingsScene * adjust Texture Positions Niko Jochim 2020-05-29 11:45:28 +0200
  • 2ad8b1ff93 Add RoundTimer class and update TimerComponent Jakob Haag 2020-05-28 18:10:10 +0200
  • 0db26a7558 Merge branch '53-matchmaking-ueberarbeiten-2' into 'development' Marcel Schwarz 2020-05-27 20:41:05 +0000
  • 9329978981 * create new GameCenterManager * send RandomNumber to all Peers Method Niko Jochim 2020-05-27 20:41:05 +0000
  • c6896bfccd Merge branch '53-matchmaking-ueberarbeiten-2' into 'development' Niko Jochim 2020-05-27 20:38:43 +0000
  • f6feb93d29 FIX Host loading Game Bug Niko Jochim 2020-05-27 22:23:32 +0200
  • 2f0655087d add new Statelogic Niko Jochim 2020-05-27 22:11:44 +0200
  • 458e79b128 add logging Messages Niko Jochim 2020-05-27 17:17:17 +0200
  • 4910bc9480 finish MM overtake * separate loading map model and Game Scene * add Logging * provisional states for sending and receiving (synching MM-process) Niko Jochim 2020-05-27 11:55:59 +0200
  • 72df80915d * Rebase Delevopment into 53 127-Z3R0 2020-05-26 19:31:32 +0200
  • 74f3abc677 Test: revert Init Niko Jochim 2020-05-26 16:35:13 +0200
  • 8ae4f9b4c8 clean Code Niko Jochim 2020-05-26 15:37:24 +0200
  • c0c24b3994 Fix loadMap Error, call correct MapModel from Dataservice Niko Jochim 2020-05-26 15:25:58 +0200
  • 2c92566254 add call GameScene for peer Niko Jochim 2020-05-26 14:50:32 +0200
  • 925b1d13de remove Host struct Niko Jochim 2020-05-26 14:41:14 +0200
  • ce18565de2 FIX menuScene reference Niko Jochim 2020-05-26 14:23:47 +0200
  • 7ec5ded2b9 remove unused GKMatchmaker Niko Jochim 2020-05-26 13:32:22 +0200
  • 91a2361bd1 Test: add register for invite friends Niko Jochim 2020-05-26 13:06:34 +0200
  • 1da1dcb00b * TEST: Add funcs for Invite Friends Niko Jochim 2020-05-26 12:20:58 +0200
  • 1570f1269e set loadScene Niko Jochim 2020-05-25 22:07:50 +0200
  • a150be03e0 remove Dictionary Niko Jochim 2020-05-25 21:29:40 +0200
  • d587723866 implement findMatch method Niko Jochim 2020-05-25 21:05:25 +0200
  • 8dc1df768e TEST: send Number To Peers and Start Game Niko Jochim 2020-05-25 20:15:31 +0200
  • 56cafe9e70 set local and peer RandomNumber Niko Jochim 2020-05-25 19:22:45 +0200
  • a199394ef4 * create new GameCenterManager * send RandomNumber to all Peers Method Niko Jochim 2020-05-25 18:45:22 +0200
  • 23707cb1d9 Merge branch '70-anzahl-zuege-pro-runde' into 'development' Marcel Schwarz 2020-05-26 18:11:56 +0000
  • f038b5ec80 Merge branch '70-anzahl-zuege-pro-runde' into 'development' Jakob Haag 2020-05-26 18:11:32 +0000
  • 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 Jakob Haag 2020-05-23 11:23:54 +0200
  • 23e53effd4 Merge branch 'refactoring' into 'development' Marcel Schwarz 2020-05-26 16:58:15 +0000
  • 87caa4867f Merge branch 'refactoring' into 'development' Marcel Schwarz 2020-05-26 16:57:53 +0000
  • 288438884e Refactor complete entity component model Marcel Schwarz 2020-05-24 22:43:34 +0200
  • 067495a57b Merge branch '79-verschiebung-der-basen-zuruecksetzen' into 'development' Marcel Schwarz 2020-05-26 16:54:47 +0000
  • bfa4f4cbde Merge branch '79-verschiebung-der-basen-zuruecksetzen' into 'development' Marcel Schwarz 2020-05-24 12:49:19 +0000
  • 2c31d923c6 Reset all bases when moveTouch is finished Marcel Schwarz 2020-05-24 14:48:17 +0200
  • bb9582bee9 Merge branch '77-entity-manager-ueberarbeiten' into 'development' Aldin Duraki 2020-05-23 18:15:43 +0000
  • 9dbca2a2d0 Merge branch '77-entity-manager-ueberarbeiten' into 'development' Tim Herbst 2020-05-23 18:15:35 +0000
  • 7e2b1b7a54 * Refactor for Master of the Universe 127-Z3R0 2020-05-23 19:02:39 +0200
  • 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 127-Z3R0 2020-05-23 18:36:59 +0200
  • 515435ff12 add Fonts Ömer Özel 2020-05-23 15:31:02 +0200
  • d7108aa167 Merge branch 'sprint_3_delivery' into 'master' Aldin Duraki 2020-05-21 17:44:26 +0000