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

Commit Graph

  • 23248876ba add method getBaseByPlayer and getBasesByPlayer, format code and import GameKit Jakob Haag 2020-05-15 12:01:26 +0200
  • c53ab5f857 init players to basePlayerOne and Two Jakob Haag 2020-05-15 12:00:01 +0200
  • f2c6de058c remove unnecessary code Jakob Haag 2020-05-15 11:59:42 +0200
  • 5eb8267266 import GameKit, format Code and change method to getBasesByPlayer Jakob Haag 2020-05-15 11:59:05 +0200
  • a12c915745 fix imports Jakob Haag 2020-05-15 11:33:53 +0200
  • d03a7fd70d adjust cote to init wayElement Jakob Haag 2020-05-15 11:22:13 +0200
  • ea53937e0f add WayElement, WayNote, DefaultWayComponent Jakob Haag 2020-05-15 11:21:57 +0200
  • 65f05b956c update and init CElements Jakob Haag 2020-05-15 11:21:12 +0200
  • 8843f8b133 add more CElements Jakob Haag 2020-05-15 11:20:31 +0200
  • c4a4b74a20 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Aldin Duraki 2020-05-15 09:10:51 +0000
  • 6d14399f7e Kommentare entfernt Chauntalle Schüle 2020-05-14 18:36:13 +0200
  • 38270b0c47 Bug fixed: gameScene blieb nach beenden der Anzeige von Modal Basis Informationen dunkel Chauntalle Schüle 2020-05-14 14:23:44 +0200
  • 5ac761e624 Bug: couldn't exit Modal showing Basis Informationen, now possible through Button zurück Chauntalle Schüle 2020-05-14 14:09:45 +0200
  • 6010915898 Adding Button to ModalEinheiten, you can now exit via Button and not anymore via Slider Chauntalle Schüle 2020-05-14 14:06:44 +0200
  • ce72654ff3 Adding modalButton to Entity Manager Chauntalle Schüle 2020-05-14 14:04:25 +0200
  • 3791472b64 add player to init method Jakob Haag 2020-05-12 18:27:21 +0200
  • 45ce498dbd refactor variables Jakob Haag 2020-05-11 19:44:31 +0200
  • e1291bcf38 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Marcel Schwarz 2020-05-10 16:48:04 +0000
  • 3a5d17c849 refactor variables Jakob Haag 2020-05-11 19:44:31 +0200
  • 41c51f4e18 remove code for testing Jakob Haag 2020-05-11 19:37:00 +0200
  • 783f717062 test Jakob Haag 2020-05-11 19:18:19 +0200
  • 16af1db0ca change method getBaseByTeam to getBaseByPlayer Jakob Haag 2020-05-11 18:06:35 +0200
  • d62e24524b init player1 to playerOneBase and player2 to playerTwoBase on init Jakob Haag 2020-05-11 18:05:43 +0200
  • efb2d7c6f6 add method getBaseByPlayer to entityManager Jakob Haag 2020-05-11 18:05:05 +0200
  • 0e792c3f1d add player to teamcomponent Jakob Haag 2020-05-11 18:04:35 +0200
  • 2c5c67d547 add gamegit and gkplayer to teamcomponent Jakob Haag 2020-05-11 18:03:45 +0200
  • 8b87dc59ad Merge branch 'revert-d595cb42' into 'development' Aldin Duraki 2020-05-15 09:18:46 +0000
  • 44ee066296 Merge branch 'revert-d595cb42' into 'development' Aldin Duraki 2020-05-15 09:15:30 +0000
  • e87e489e9e Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Aldin Duraki 2020-05-15 09:10:51 +0000
  • d595cb4235 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Aldin Duraki 2020-05-15 09:08:53 +0000
  • 2812d88838 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Jakob Haag 2020-05-15 09:08:38 +0000
  • 4a48ed9b17 Merge branch 'development' into '33-basisownership-anhand-des-gkplayers' Aldin Duraki 2020-05-15 09:08:26 +0000
  • 931161ccd7 Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' Aldin Duraki 2020-05-15 09:06:54 +0000
  • f4af7f0b85 Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' Chauntalle Schüle 2020-05-14 16:38:31 +0000
  • 1a1a821d9d Kommentare entfernt Chauntalle Schüle 2020-05-14 18:36:13 +0200
  • a86bb6860d Merge branch 'development' into 43-ueberarbeitung-angriffsmodal Merging new features from development into feature branch 43 Chauntalle Schüle 2020-05-14 17:57:46 +0200
  • 9ff3a801fa Workaround with CElement1 Jakob Haag 2020-05-14 16:33:01 +0200
  • 3f98b90289 init CElements1-8 Jakob Haag 2020-05-14 16:31:17 +0200
  • 0bfb2aadc4 Add CElements1-8 Jakob Haag 2020-05-14 16:29:47 +0200
  • 8342c2e550 Bug fixed: gameScene blieb nach beenden der Anzeige von Modal Basis Informationen dunkel Chauntalle Schüle 2020-05-14 14:23:44 +0200
  • 5feb831873 Bug: couldn't exit Modal showing Basis Informationen, now possible through Button zurück Chauntalle Schüle 2020-05-14 14:09:45 +0200
  • c14731dff6 Adding Button to ModalEinheiten, you can now exit via Button and not anymore via Slider Chauntalle Schüle 2020-05-14 14:06:44 +0200
  • a78b9269c0 Adding modalButton to Entity Manager Chauntalle Schüle 2020-05-14 14:04:25 +0200
  • f86ace95f0 merge origin/24-map-generation-fur-zwei-spieler-twoplayermap Jakob Haag 2020-05-14 11:12:17 +0200
  • 92dd65a93f Create RoundCalculatorService Aldin Duraki 2020-05-14 01:00:02 +0200
  • 24eced5859 add Animated Cylinder to MainScence Niko Jochim 2020-05-13 23:33:34 +0200
  • cfe01cde54 TEST: Change Host Identifier to displayName, since the ID is not working for some odd reasons Aldin Duraki 2020-05-13 22:32:05 +0200
  • 570099911f Test: Receiving Data on Hostdevice Aldin Duraki 2020-05-13 21:15:44 +0200
  • 917769ac24 Fix Typo Aldin Duraki 2020-05-13 20:22:48 +0200
  • ce4d2fe8a2 Impl. neccessary Server identifier Aldin Duraki 2020-05-13 20:22:23 +0200
  • d2f32f41ee Impl. PlayerMovesService for data transfer 127-Z3R0 2020-05-13 19:13:33 +0200
  • 924a3430ea Merge branch '34-erstellung-eines-datenuebertragungsmodell' into 35-datenubertragung-zwischen-spielern 127-Z3R0 2020-05-13 18:27:34 +0200
  • da36b5ba3d Merge branch 'development' 127-Z3R0 2020-05-13 16:51:13 +0200
  • 1b8fb6b126 Merge branch 'development' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 35-datenubertragung-zwischen-spielern 127-Z3R0 2020-05-13 16:19:14 +0200
  • df16ceeb7c Merge branch '44-settings-einfuegen' into 'development' Aldin Duraki 2020-05-13 14:17:07 +0000
  • a0a6bb9b28 create Base ID, added fromBase - toBase to sending data Niko Jochim 2020-05-13 15:47:53 +0200
  • 5cefd089c1 Merge branch '44-settings-einfuegen' into 'development' Tim Herbst 2020-05-13 13:08:26 +0000
  • a8e0bac437 Change send modifications Niko Jochim 2020-05-13 15:07:23 +0200
  • ec2510fd53 add Label to EntityManager and implement Labels to SettingsScene 127-Z3R0 2020-05-13 15:00:29 +0200
  • 1ca5399a2e add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation 127-Z3R0 2020-05-13 14:59:26 +0200
  • d553b72daf Change Datamodel to JSON Niko Jochim 2020-05-13 14:59:20 +0200
  • fb01faa1e5 TEST: Datamodel Niko Jochim 2020-05-13 13:34:34 +0200
  • 2a42379610 add sharedInstance, small cleanup Code 127-Z3R0 2020-05-13 12:59:55 +0200
  • 1f5a9f2365 add player to init method Jakob Haag 2020-05-12 18:27:21 +0200
  • 339be93865 refactor variables Jakob Haag 2020-05-11 19:44:31 +0200
  • 4189d0f634 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Marcel Schwarz 2020-05-10 16:48:04 +0000
  • bd5d142a43 refactor variables Jakob Haag 2020-05-11 19:44:31 +0200
  • 9c751cc84f remove code for testing Jakob Haag 2020-05-11 19:37:00 +0200
  • 41d5fc8a5c test Jakob Haag 2020-05-11 19:18:19 +0200
  • 282a729250 change method getBaseByTeam to getBaseByPlayer Jakob Haag 2020-05-11 18:06:35 +0200
  • 0c9abe0d08 init player1 to playerOneBase and player2 to playerTwoBase on init Jakob Haag 2020-05-11 18:05:43 +0200
  • 5b11dacbaa add method getBaseByPlayer to entityManager Jakob Haag 2020-05-11 18:05:05 +0200
  • 276d2cfa2e add player to teamcomponent Jakob Haag 2020-05-11 18:04:35 +0200
  • f67c673ca7 add gamegit and gkplayer to teamcomponent Jakob Haag 2020-05-11 18:03:45 +0200
  • d99878eb47 TEST: change Datamodel from NSData to Data 82joni1bif 2020-05-10 22:36:18 +0200
  • 106a0fe6de add print for debug 82joni1bif 2020-05-10 22:00:17 +0200
  • 99b6843606 Create first version of Datatransfermodel 82joni1bif 2020-05-10 21:58:42 +0200
  • 284cf1381b add button to SettingsScene for Background Movement 127-Z3R0 2020-05-10 21:16:28 +0200
  • 40890f4e37 forgot return type in func getVolume 127-Z3R0 2020-05-10 20:57:40 +0200
  • 3f56b033ba Merge branch 'development' into '44-settings-einfuegen' Tim Herbst 2020-05-10 18:11:14 +0000
  • b30abc4292 add button on-off to settingsScene 127-Z3R0 2020-05-10 20:08:05 +0200
  • a3361b3752 Merge branch 'revert-3f73a6f6' into 'development' Marcel Schwarz 2020-05-10 16:51:09 +0000
  • 9c4a61277c Merge branch 'revert-3f73a6f6' into 'development' Marcel Schwarz 2020-05-10 16:48:14 +0000
  • 8c85d6b6f5 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" Marcel Schwarz 2020-05-10 16:48:04 +0000
  • c143179df8 fix multiple calls from startMenuMusic with static Bool, stop music when enter Game 127-Z3R0 2020-05-10 18:47:42 +0200
  • 888d194676 add SettingsScene with background and music also boolean query for multiple audioplayer start 127-Z3R0 2020-05-10 18:10:36 +0200
  • 9c990cc897 add backgroundMusic for MenuScene with SoundManager for futher Sound-Management - music with commercial use 127-Z3R0 2020-05-10 17:44:54 +0200
  • 3f73a6f64d Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Marcel Schwarz 2020-05-09 16:39:03 +0000
  • 86351a677c Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' Jakob Haag 2020-05-09 16:31:31 +0000
  • fa1b40b263 change auto-format to better style Jakob Haag 2020-05-09 18:31:06 +0200
  • 6c28c49802 Auto-Format whole project Jakob Haag 2020-05-09 18:20:33 +0200
  • 7e369cc7f5 Change assertion of null-able values team and player Jakob Haag 2020-05-09 18:11:53 +0200
  • b2533d2a7d import missing GameKit Jakob Haag 2020-05-09 17:57:22 +0200
  • a76fd69267 exchange the tabs with withspaces Jakob Haag 2020-05-09 17:57:06 +0200
  • 6a847a0718 Update TwoPlayerDefaultTestMap.swift Jakob Haag 2020-05-09 14:37:20 +0000
  • 427e7931aa Merge branch '33-wip-basisownership-anhand-des-gkplayers' into 'development' Jakob Haag 2020-05-09 13:29:09 +0000
  • 3ab3887ab6 Update TwoPlayerDefaultTestMap.swift Jakob Haag 2020-05-09 13:29:07 +0000
  • 1428720dc2 add local player as ownerShipPlayer for base1. Not final version --> ToDo Jakob Haag 2020-05-09 15:23:45 +0200
  • 0dd1664506 change ownerShipPlayer on attackBase function Jakob Haag 2020-05-09 15:23:28 +0200
  • e1b0ac4d87 add nullable ownerShipPlayer to Base and add init of it to init-method Jakob Haag 2020-05-09 15:22:24 +0200