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

Commit Graph

  • df7c86f57e Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Aldin Duraki 2020-05-21 17:44:26 +0000
  • a911771816 Merge branch 'sprint_3_delivery' into 'master' Aldin Duraki 2020-05-21 17:44:23 +0000
  • b38c75978d update Buildversion Niko Jochim 2020-05-21 19:43:24 +0200
  • 8b140b95b4 Merge branch '64-view-visibility-unitcount-and-playername' into 'development' Aldin Duraki 2020-05-21 17:41:51 +0000
  • fa5872fac2 Merge branch '64-view-visibility-unitcount-and-playername' into 'development' Niko Jochim 2020-05-21 17:41:27 +0000
  • b2f84bc3f4 set zPosistion on all Nodes update host and peer Label Nodes Niko Jochim 2020-05-21 19:40:46 +0200
  • bf8ce0c477 Merge branch 'development' Niko Jochim 2020-05-21 18:00:15 +0200
  • d16867f367 add label with 100000000 changes Niko Jochim 2020-05-21 17:59:19 +0200
  • 3ab40f94cb Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' Aldin Duraki 2020-05-21 13:52:11 +0000
  • 199eb9967f Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' Aldin Duraki 2020-05-21 13:50:16 +0000
  • 841bda9d9b Readded sleep Aldin Duraki 2020-05-21 15:48:32 +0200
  • 8e22f02c7a * Impl. debugging move on MapGeneration * Changed fire particle with master designer niko von jochim Aldin Duraki 2020-05-21 03:18:07 +0200
  • 9fd34d9a6c Minor fixes Aldin Duraki 2020-05-21 02:44:38 +0200
  • ad44ba8302 Synching players timer since playermoves would not register before calculating Aldin Duraki 2020-05-21 00:29:19 +0200
  • 5df7fd3dac TEST: playermoves not synched in same second Aldin Duraki 2020-05-20 23:46:40 +0200
  • a8c42fa0b0 Fix slider min max unit values Aldin Duraki 2020-05-20 23:36:48 +0200
  • 5f7b12c28c * Changed slider behavior to not take MAX and 0 value as unit counts to send Aldin Duraki 2020-05-20 23:20:05 +0200
  • 458d50e4b3 FIXME solved by extending the TeamComponent behavior Aldin Duraki 2020-05-20 22:59:32 +0200
  • 604001a365 * Impl. a usecase of a fight scenario * Reset playermoves when necessary Aldin Duraki 2020-05-20 22:14:29 +0200
  • fbe8dbde9d Merge branch '56-attack-boost-faehigkeit-implementieren' into 'development' Aldin Duraki 2020-05-20 19:04:41 +0000
  • 6774200539 Merge branch '56-attack-boost-faehigkeit-implementieren' into 'development' Simon Kellner 2020-05-20 19:04:02 +0000
  • fdb3877194 Merge branch 'development' Aldin Duraki 2020-05-20 21:00:15 +0200
  • 582b59a216 Merge branch '59-map-generation-fur-zwei-spieler-c-elemente' into 'development' Aldin Duraki 2020-05-20 18:33:57 +0000
  • aa2c90fc57 Merge branch '59-map-generation-fur-zwei-spieler-c-elemente' into 'development' Jakob Haag 2020-05-20 18:33:50 +0000
  • fe1405d3fa Send map model to other player over data service Marcel Schwarz 2020-05-20 20:30:06 +0200
  • 71f556868f Allow map to be loaded from predefined model Marcel Schwarz 2020-05-20 18:42:57 +0200
  • 0fd409c00b Add Ids to C-Elements and corresponding protocol Marcel Schwarz 2020-05-20 17:54:05 +0200
  • 4fdd95bd76 Add CElements and Ways Jakob Haag 2020-05-18 19:22:25 +0200
  • 53705849f2 Merge branch '24-map-generation-fur-zwei-spieler-twoplayermap' into 'development' Aldin Duraki 2020-05-20 18:33:12 +0000
  • 273cd2ffa7 Merge branch '24-map-generation-fur-zwei-spieler-twoplayermap' into 'development' Marcel Schwarz 2020-05-20 18:32:51 +0000
  • 739a7120f9 Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren' Simon Kellner 2020-05-20 16:33:37 +0000
  • ee031f71c1 Add TwoPlayerMapGenerator Marcel Schwarz 2020-05-17 19:34:44 +0200
  • e2bd0dc7cf Pull protocols in MapFactory Add TwoPlayerMapGenerator Add CenterElementProvider Introduce Logging for MapGenerator Marcel Schwarz 2020-05-13 22:24:15 +0200
  • 701a56248a Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development' Aldin Duraki 2020-05-20 14:59:52 +0000
  • 2ac82e5159 * Minor fixes * Open up calculator service Aldin Duraki 2020-05-20 01:41:48 +0200
  • f60e97a866 Solve missing lines on previous merge Aldin Duraki 2020-05-20 00:35:46 +0200
  • 98b8250fc8 Merge branch 'development' Aldin Duraki 2020-05-20 00:33:15 +0200
  • 4bb5b9ee48 * Undo removing Teamcomponent upfront since it causes errors when trying to find a team on initial owned base Aldin Duraki 2020-05-20 00:31:31 +0200
  • 1571a1e786 * Impl. combined forces attack * Minor refactoring * Fixed component updates on updating entities from snapshot * Fixed mapping for incoming player moves Aldin Duraki 2020-05-20 00:11:49 +0200
  • 28fa86c25c add SkillButtonNode, Attack and Defence Skill -change Unit enum to UnitType Simon Kellner 2020-05-17 19:18:00 +0200
  • 5b722b95fc Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' Aldin Duraki 2020-05-19 15:10:17 +0000
  • de5929d070 * Fix trying to add fire sprite node to existing component Aldin Duraki 2020-05-19 15:53:07 +0200
  • b04bbe5036 * Fixed TeamComponent when updating Entities * Minor refactor Aldin Duraki 2020-05-19 02:21:41 +0200
  • 7664199969 Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' Chauntalle Schüle 2020-05-18 19:44:36 +0000
  • f291c021b3 Merge remote-tracking branch 'refs/remotes/origin/development' Chauntalle Schüle 2020-05-18 21:37:35 +0200
  • 04170eb886 cleaned up code Chauntalle Schüle 2020-05-18 21:31:32 +0200
  • a41c9f4b30 Found Bug, base collision now always registered and bases with fire can still send units Chauntalle Schüle 2020-05-18 21:21:06 +0200
  • 8d4c136f6b Merge branch '60-global-accessible-entitymanager' into 'development' Aldin Duraki 2020-05-18 17:58:59 +0000
  • 2891ccc82d merge dev in feature branch Jakob Haag 2020-05-18 10:09:23 +0200
  • 311545a026 Merge remote-tracking branch 'origin/59-map-generation-fur-zwei-spieler-c-elemente' into 59-map-generation-fur-zwei-spieler-c-elemente Jakob Haag 2020-05-18 09:57:21 +0200
  • 04c877b624 merge dev in 59-map-generation-fur-zwei-spieler-c-elemente Jakob Haag 2020-05-15 12:45:49 +0200
  • be1df8456d add filechanges Jakob Haag 2020-05-15 12:43:23 +0200
  • 7ef10a0dd9 add wayNode to entitymanager Jakob Haag 2020-05-15 12:43:07 +0200
  • 517456a093 add ways to ui Jakob Haag 2020-05-15 12:42:45 +0200
  • c3b45d2282 remove unnecessary code Jakob Haag 2020-05-15 12:42:07 +0200
  • 914ed69901 fix imports Jakob Haag 2020-05-15 11:33:53 +0200
  • 0db2be8625 Test: trying to add the TeamComponent to the new captured base [unsafe-state] Aldin Duraki 2020-05-18 02:00:13 +0200
  • 4a1b43a70d TEST: Change dependencies of optional types Aldin Duraki 2020-05-18 01:03:25 +0200
  • e08d40dd4a TEST: snapshotModel not updating Aldin Duraki 2020-05-18 00:27:53 +0200
  • 1dc97c3bab Solve Mergeconflicts Aldin Duraki 2020-05-17 21:48:17 +0200
  • 69e41a9cd3 Merge branch '60-global-accessible-entitymanager' Aldin Duraki 2020-05-17 21:43:41 +0200
  • dc85d0179e * Impl. RoundCalculationService * Impl. SnapshotModel * Impl. DataTransfer for SnapshotModel * Impl. PlayerMoveType * Changed DataService functionality Aldin Duraki 2020-05-17 21:40:41 +0200
  • 7350654122 resolved Merge conflicts Chauntalle Schüle 2020-05-17 21:09:38 +0200
  • 9ec8158c4e Merge remote-tracking branch 'refs/remotes/origin/60-global-accessible-entitymanager' Chauntalle Schüle 2020-05-17 19:39:37 +0200
  • eb17b8ffb3 Merge branch '60-global-accessible-entitymanager' into 'development' Simon Kellner 2020-05-17 16:07:28 +0000
  • d80e80783a change entity manager implementation to singleton Simon Kellner 2020-05-16 16:38:46 +0200
  • 9b57a1bcea making smaller funcs in GameScene for betterUnderstanding Chauntalle Schüle 2020-05-16 20:12:32 +0200
  • 8db0b14b7f solving merge conflicts Chauntalle Schüle 2020-05-16 19:12:10 +0200
  • b79677a699 deleted comment and redundant if else Chauntalle Schüle 2020-05-16 18:50:55 +0200
  • 8fabdda718 Prints und Kommentare entfernt Chauntalle Schüle 2020-05-16 18:46:40 +0200
  • 25c57ceb74 cleaned up modal, added func for sending units Chauntalle Schüle 2020-05-16 18:25:22 +0200
  • a7e6cd9f10 Feuer ergreift neue Basis nur, wenn im Modal Einheiten senden gedrückt wurde und gesendete Einheiten kommen an Chauntalle Schüle 2020-05-16 18:09:41 +0200
  • 4b8b2b3b2d Merge branch '48-logo-in-der-mainscene' into 'development' Aldin Duraki 2020-05-16 12:52:48 +0000
  • 3239fea986 Merge branch '48-logo-in-der-mainscene' into 'development' Niko Jochim 2020-05-16 12:04:55 +0000
  • 46615176be reverse projrct.pbxproj Niko Jochim 2020-05-16 10:35:24 +0200
  • c341f5441a add SpinningLogo to EC-System and EM Niko Jochim 2020-05-16 09:37:07 +0200
  • 3ffbae79f2 Revert "add SpinningLogo to EC-System and EM" Niko Jochim 2020-05-15 21:34:19 +0200
  • c15234c974 add SpinningLogo to EC-System and EM Niko Jochim 2020-05-15 21:29:15 +0200
  • 009b39ca14 TEST: Get a List of overlapping moves Aldin Duraki 2020-05-15 20:45:52 +0200
  • 4cf9b8c95e Re-commit missing lines Aldin Duraki 2020-05-15 19:40:13 +0200
  • 84effcf6bf Added missing line Aldin Duraki 2020-05-15 17:21:06 +0200
  • d949f57a87 Merge branch 'development' into 36-runde-beenden-mit-berechnetem-angriff Aldin Duraki 2020-05-15 17:14:43 +0200
  • 6c61b97d2c add texture to 3D Cylinder Niko Jochim 2020-05-15 17:13:39 +0200
  • 9fe149e594 TEST: check if we can make a solid iterable foundation for player moves Aldin Duraki 2020-05-15 16:31:27 +0200
  • 7bebcf69df cleaned Code Chauntalle Schüle 2020-05-15 13:34:26 +0200
  • 938c35196b Resizing Button Abbrechen in ModalAttack Chauntalle Schüle 2020-05-15 13:30:56 +0200
  • 8b840b5089 Adding Abbrechen Button to ModalAttack Chauntalle Schüle 2020-05-15 13:29:03 +0200
  • 5d98027d8a Adding new Files for Cancel Button in ModalAttack Chauntalle Schüle 2020-05-15 13:19:57 +0200
  • f5b147259a Merge remote-tracking branch 'refs/remotes/origin/development' Niko Jochim 2020-05-15 13:08:59 +0200
  • cf7f5e01d4 merge dev in 59-map-generation-fur-zwei-spieler-c-elemente Jakob Haag 2020-05-15 12:45:49 +0200
  • 17a6bae46e add filechanges Jakob Haag 2020-05-15 12:43:23 +0200
  • 2dfb460d55 add wayNode to entitymanager Jakob Haag 2020-05-15 12:43:07 +0200
  • 03b986d9cb add ways to ui Jakob Haag 2020-05-15 12:42:45 +0200
  • b297a577ec remove unnecessary code Jakob Haag 2020-05-15 12:42:07 +0200
  • ae5875ca7c rename WayNode Jakob Haag 2020-05-15 12:41:21 +0200
  • df222bba84 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Aldin Duraki 2020-05-15 10:14:17 +0000
  • 10707be299 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Jakob Haag 2020-05-15 10:13:45 +0000
  • b24d93c399 add nullable assigment to ownershipPlayer Jakob Haag 2020-05-15 12:12:52 +0200
  • ac1ad05bac add player to teamcomponent Jakob Haag 2020-05-15 12:02:07 +0200
  • 43dd2aa853 import GameKit and add ownershipPlayer to component Jakob Haag 2020-05-15 12:01:55 +0200