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

Commit Graph

  • 3d14d4c8d6 Merge branch 'sprint_2_delivery_version_update' into 'master' Aldin Duraki 2020-05-07 19:05:48 +0000
  • 360586cc2e Merge branch 'sprint_2_delivery_version_update' into 'master' Aldin Duraki 2020-05-07 19:05:44 +0000
  • 6e7758767f Merge branch 'sprint_2_version' into 'development' Aldin Duraki 2020-05-07 19:04:54 +0000
  • 6b6f93edf0 Merge branch 'sprint_2_version' into 'development' Aldin Duraki 2020-05-07 19:04:51 +0000
  • 91bc4fa59c change Build version 82joni1bif 2020-05-07 21:02:23 +0200
  • 38e7b2f345 Merge branch 'sprint_2_delivery' into 'master' Aldin Duraki 2020-05-07 18:45:53 +0000
  • 809cf49618 Merge branch 'sprint_2_delivery' into 'master' Aldin Duraki 2020-05-07 18:45:33 +0000
  • 5bd8aa2083 Merge branch '20-timer-anbindung-an-gamecenter' into 'development' Aldin Duraki 2020-05-07 18:43:34 +0000
  • 7b9eee2c41 Merge branch '20-timer-anbindung-an-gamecenter' into 'development' Daniel Steckert 2020-05-07 18:39:25 +0000
  • b602841f8d Merge branch 'development' 82joni1bif 2020-05-07 20:19:40 +0200
  • dcd4a10d08 Merge branch '19-einheiten-bewegen' into 'development' Aldin Duraki 2020-05-07 18:17:42 +0000
  • 8d230033ea Merge branch '19-einheiten-bewegen' into 'development' Aldin Duraki 2020-05-07 18:17:26 +0000
  • 6b8b11d14e Merge branch 'development' into '19-einheiten-bewegen' Aldin Duraki 2020-05-07 18:17:24 +0000
  • c196ba721f ... 82joni1bif 2020-05-07 20:14:53 +0200
  • 3580d5537e fix SliderComponent Niko Jochim 2020-05-06 12:57:41 +0200
  • 185358a3d5 * Impl. basic attacking functionality * added attacking Modal Niko Jochim 2020-05-06 02:17:25 +0200
  • 423ccc3208 Implement timer during rounds Daniel Steckert 2020-05-05 22:34:08 +0200
  • 7254183d9e Merge remote-tracking branch 'refs/remotes/origin/20-timer-anbindung-an-gamecenter' Daniel Steckert 2020-05-05 21:39:08 +0200
  • 58d7a01fd1 Implement TimerComponent Daniel Steckert 2020-05-05 17:19:04 +0200
  • 3b417cbe0e Minor code cleanup Aldin Duraki 2020-05-05 11:16:27 -0700
  • 0b4e9ad48e Merge branch '31-debug-flag-fur-matchmaking' into 'development' Marcel Schwarz 2020-05-05 16:19:35 +0000
  • 63f39417c2 Merge branch '31-debug-flag-fur-matchmaking' into 'development' Simon Kellner 2020-05-05 16:16:09 +0000
  • 084b79a7c0 Add flag(--no-matchmaking) to prevent matchmaking process and instantly open GameScene Simon Kellner 2020-05-05 18:06:21 +0200
  • 9a7a8adaf8 Implement TimerComponent Daniel Steckert 2020-05-05 17:19:04 +0200
  • 350682cf82 Merge branch '26-mm-anbindung-an-gamecenter' into 'development' Aldin Duraki 2020-05-05 13:09:39 +0000
  • acd34379d9 Merge branch '26-mm-anbindung-an-gamecenter' into 'development' Chauntalle Schüle 2020-05-05 09:45:34 +0000
  • d97b124b83 cleaned up code Chauntalle Schüle 2020-05-05 11:44:33 +0200
  • 3aef30b495 Kommentare eingefügt Spielerzuweisung wird getestet Chauntalle Schüle 2020-05-05 11:00:11 +0200
  • b8b37de349 Push MM Ömer Özel 2020-05-05 00:35:27 +0200
  • e1d5af8a4a matchmaking funktioniert Chauntalle Schüle 2020-05-04 23:44:23 +0200
  • e21395d0db Checken ob match gefunden wurde Chauntalle Schüle 2020-05-04 21:44:50 +0200
  • 54d31d929d Update MatchMakerHelper, added methods Chauntalle Schüle 2020-05-04 20:34:58 +0200
  • 017e99183b add File to Project Tree Chauntalle Schüle 2020-05-04 15:22:48 +0200
  • 71a59f2fa0 Add MatchmakingViewController Chauntalle Schüle 2020-05-04 15:13:04 +0200
  • bf88e1af83 Merge branch '19-einheiten-bewegen' into 'development' Aldin Duraki 2020-05-03 13:50:15 +0000
  • 0bd67d1b7f Merge branch '19-einheiten-bewegen' into 'development' Aldin Duraki 2020-05-03 13:49:57 +0000
  • 9b3bdbf34b implemented touch functionality Niko 2020-05-03 15:46:48 +0200
  • 44beb7ba4a Merge branch '29-uberarbeitung-der-menuscene-button' into 'development' Aldin Duraki 2020-05-02 22:15:20 +0000
  • 59c51f4d9f Merge branch '29-uberarbeitung-der-menuscene-button' into 'development' Aldin Duraki 2020-05-02 22:14:58 +0000
  • d72c10fa75 implement Background Entity and Component Niko 2020-05-03 00:14:32 +0200
  • 94d7be35ff implemented ButtonEntity Niko 2020-05-02 23:12:37 +0200
  • fcf49e656d Merge remote-tracking branch 'origin/29-uberarbeitung-der-menuscene-button' into cleanup_scenes Niko 2020-05-02 22:31:12 +0200
  • fae2855bf9 stash Niko 2020-05-02 22:29:16 +0200
  • 1cf0704af0 Merge branch '25-protokoll-fur-map-interaktion' into 'development' Aldin Duraki 2020-05-02 20:18:45 +0000
  • a5858a4966 Merge branch '25-protokoll-fur-map-interaktion' into 'development' Marcel Schwarz 2020-05-02 19:55:31 +0000
  • 5eed82803b Remove unnecessary field form MapFactory Marcel Schwarz 2020-05-02 21:55:08 +0200
  • 7fc4a5145f Do some polishing Marcel Schwarz 2020-05-02 21:51:31 +0200
  • 0dbcbe5eb0 Move adjacency list into base Fix typo in MapProtocol Improve MapFactory Generalize MapProtocol Marcel Schwarz 2020-05-02 21:45:21 +0200
  • 54813ab44d Fix indentation in Base entity Marcel Schwarz 2020-05-02 21:08:10 +0200
  • 67a345e9bf Add adjacency mapping Marcel Schwarz 2020-05-02 20:47:17 +0200
  • 918979d750 Introduce column based layout Marcel Schwarz 2020-05-02 20:22:31 +0200
  • ffd4e0dfe0 Initialize team in Base model with default nil Marcel Schwarz 2020-05-02 20:13:31 +0200
  • c1bb6a47de Create Map Factory, remove texture name from base constructor Marcel Schwarz 2020-05-02 20:07:40 +0200
  • ad35c8eee1 Merge branch '25-protokoll-fur-map-interaktion' into 'development' Marcel Schwarz 2020-05-02 17:07:44 +0000
  • 5a7c29b3b8 Extract player bases, simplify layout definition Marcel Schwarz 2020-05-02 19:07:02 +0200
  • ffc4c05a46 Extract default test map, add map protocol to game scene Marcel Schwarz 2020-05-02 18:48:23 +0200
  • df58c822a1 Merge branch '25-protokoll-fur-map-interaktion' into 'development' Aldin Duraki 2020-05-02 16:12:05 +0000
  • a4c17c0fc9 Merge branch '25-protokoll-fur-map-interaktion' into 'development' Marcel Schwarz 2020-05-02 16:11:13 +0000
  • 4c37ac690c Move files to correct directory Marcel Schwarz 2020-05-02 18:11:01 +0200
  • 5eb9daa02b Create files for Map model Marcel Schwarz 2020-05-02 18:06:18 +0200
  • b8edc830fb Merge branch '18-auth-anbindung-an-gamecenter' into 'development' Aldin Duraki 2020-05-02 14:17:42 +0000
  • 58d6fb85dc Merge branch '18-auth-anbindung-an-gamecenter' into 'development' Jakob Haag 2020-05-02 14:17:16 +0000
  • 868e10e7a4 fix spelling Jakob Haag 2020-05-02 16:16:16 +0200
  • 311b19d9c2 add label of user is not logged in to GameCenter Jakob Haag 2020-05-02 16:15:03 +0200
  • cdb67f2d7c remove unused code and format Jakob Haag 2020-05-02 16:14:46 +0200
  • bb98c9d0a6 add rest of necessary swift files Jakob Haag 2020-05-02 14:04:08 +0200
  • c6d1adce9b init 100 units to the team-bases on init Jakob Haag 2020-05-02 14:03:41 +0200
  • e8654fbf54 move team-enum out of class Jakob Haag 2020-05-02 14:03:14 +0200
  • e9bd05c852 add GameCenterLogin-window to the GameViewController and fix size of the MenueScene Jakob Haag 2020-05-02 14:02:24 +0200
  • cdb4d69621 Add window to menu to see if the user is authenticated (ToDo) Jakob Haag 2020-05-02 14:01:05 +0200
  • 0a94e64a25 add GameCenterHelper to login to GameCenter and recognize authenticated user Jakob Haag 2020-05-02 13:59:34 +0200
  • 8a3357280e Merge branch '19-einheiten-bewegen' into 'development' Aldin Duraki 2020-05-01 23:24:42 +0000
  • bd0ef2039f Merge branch '19-einheiten-bewegen' into 'development' Tim Herbst 2020-05-01 23:24:23 +0000
  • aae0a49da0 add fire to homebase Niko Jochim 2020-05-02 01:22:53 +0200
  • cda2e08624 Merge branch '28-moving-background' into 'development' Aldin Duraki 2020-05-01 22:16:04 +0000
  • 0e2f03ff61 Merge branch '28-moving-background' into 'development' Tim Herbst 2020-05-01 22:15:51 +0000
  • 5b7c5039e1 add background to menu-scene Niko Jochim 2020-05-02 00:14:21 +0200
  • 8d1aa1de66 added moving cloudy background Niko Jochim 2020-05-01 23:57:23 +0200
  • d8d80b8eb7 add asset SkyBackground and Components 127-Z3R0 2020-05-01 23:43:37 +0200
  • 473bf86c92 Merge branch '23-arc-architektur-des-projektes' into 'development' Aldin Duraki 2020-05-01 21:35:46 +0000
  • aa035d0aa0 Merge branch '23-arc-architektur-des-projektes' into 'development' Aldin Duraki 2020-05-01 21:35:09 +0000
  • 3b80b945c4 impl. hud Niko Jochim 2020-05-01 23:33:46 +0200
  • b7ca10acf7 Merge branch 'fix-teamComponents' into 'development' Aldin Duraki 2020-05-01 20:04:13 +0000
  • adfddef1ad Merge branch 'fix-teamComponents' into 'development' Aldin Duraki 2020-05-01 20:04:09 +0000
  • 323ca45e51 fix teamComponents reference Niko Jochim 2020-05-01 22:02:26 +0200
  • f7fbeba1cc Merge branch '17-popup-action-auf-basis-click' into 'development' Aldin Duraki 2020-05-01 19:50:23 +0000
  • b195d5002e Merge branch '17-popup-action-auf-basis-click' into 'development' Aldin Duraki 2020-05-01 19:49:39 +0000
  • 2ff1a1d705 add pop-Up base-details Niko Jochim 2020-05-01 21:47:43 +0200
  • 579eae6c57 Merge branch '23-arc-architektur-des-projektes' into 'development' Aldin Duraki 2020-05-01 15:58:07 +0000
  • 7a14c3d943 Merge branch '23-arc-architektur-des-projektes' into 'development' Tim Herbst 2020-05-01 15:57:13 +0000
  • 706c879351 change architecture to entity-component Niko Jochim 2020-05-01 17:55:42 +0200
  • 6127f89e78 impf. EntityManager Aldin Duraki 2020-05-01 15:28:47 +0200
  • 21b7fc00f7 Init Entity-Component Folder Structure Aldin Duraki 2020-05-01 15:09:46 +0200
  • 54f6cf3cf1 Merge branch 'sprint_2_architecture_init' into 'development' Aldin Duraki 2020-05-01 12:56:22 +0000
  • deb1c08a1e Merge branch 'sprint_2_architecture_init' into 'development' Aldin Duraki 2020-05-01 12:53:29 +0000
  • 9f569c30fa Flatten Project Aldin Duraki 2020-05-01 14:49:55 +0200
  • fd1ad465a0 Merge branch 'sprint_1_delivery' into 'master' Aldin Duraki 2020-04-23 21:06:59 +0000
  • 4a2361a51a Merge branch 'sprint_1_delivery' into 'master' Aldin Duraki 2020-04-23 21:06:32 +0000
  • 73a632056d Merge branch '14-view-hud' into 'development' Aldin Duraki 2020-04-23 21:02:15 +0000
  • 1b838e574a Merge branch '14-view-hud' into 'development' Aldin Duraki 2020-04-23 21:02:04 +0000