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

338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldin Duraki
8b87dc59ad Merge branch 'revert-d595cb42' into 'development' 
Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"

See merge request marcel.schwarz/software-projekt-2!67
 2020-05-15 09:18:46 +00:00
Aldin Duraki
e87e489e9e Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" 
This reverts merge request !60
 2020-05-15 09:10:51 +00:00
Aldin Duraki
d595cb4235 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' 
Resolve "Basisownership anhand des GKPlayers"

Closes #33

See merge request marcel.schwarz/software-projekt-2!60
 2020-05-15 09:08:53 +00:00
Aldin Duraki
4a48ed9b17 Merge branch 'development' into '33-basisownership-anhand-des-gkplayers' 
# Conflicts:
#   GoldWars/GoldWars/Components/BackgroundComponent.swift
#   GoldWars/GoldWars/Components/TeamComponent.swift
#   GoldWars/GoldWars/Entities/Base.swift
#   GoldWars/GoldWars/Entities/EntityManager.swift
#   GoldWars/GoldWars/Entities/Modal.swift
#   GoldWars/GoldWars/Map/TwoPlayerDefaultTestMap.swift
#   GoldWars/GoldWars/Scenes/GameScene.swift
#   GoldWars/GoldWars/Scenes/MenuScene.swift
 2020-05-15 09:08:26 +00:00
Aldin Duraki
931161ccd7 Merge branch '43-ueberarbeitung-angriffsmodal' into 'development' 
Resolve "Ueberarbeitung Angriffsmodal"

Closes #43

See merge request marcel.schwarz/software-projekt-2!62
 2020-05-15 09:06:54 +00:00
Chauntalle Schüle
1a1a821d9d Kommentare entfernt 2020-05-14 18:36:13 +02:00
Chauntalle Schüle
a86bb6860d Merge branch 'development' into 43-ueberarbeitung-angriffsmodal 
Merging new features from development into feature branch 43
 2020-05-14 17:57:46 +02:00
Chauntalle Schüle
8342c2e550 Bug fixed: gameScene blieb nach beenden der Anzeige von Modal Basis Informationen dunkel 2020-05-14 14:23:44 +02:00
Chauntalle Schüle
5feb831873 Bug: couldn't exit Modal showing Basis Informationen, now possible through Button zurück 2020-05-14 14:09:45 +02:00
Chauntalle Schüle
c14731dff6 Adding Button to ModalEinheiten, you can now exit via Button and not anymore via Slider 2020-05-14 14:06:44 +02:00
Chauntalle Schüle
a78b9269c0 Adding modalButton to Entity Manager 2020-05-14 14:04:25 +02:00
Aldin Duraki
92dd65a93f Create RoundCalculatorService 2020-05-14 01:00:02 +02:00
Niko Jochim
24eced5859 add Animated Cylinder to MainScence 2020-05-13 23:33:34 +02:00
Aldin Duraki
cfe01cde54 TEST: Change Host Identifier to displayName, since the ID is not working for some odd reasons 2020-05-13 22:32:05 +02:00
Aldin Duraki
570099911f Test: Receiving Data on Hostdevice 2020-05-13 21:15:44 +02:00
Aldin Duraki
917769ac24 Fix Typo 2020-05-13 20:22:48 +02:00
Aldin Duraki
ce4d2fe8a2 Impl. neccessary Server identifier 2020-05-13 20:22:23 +02:00
127-Z3R0
d2f32f41ee Impl. PlayerMovesService for data transfer 2020-05-13 19:13:33 +02:00
127-Z3R0
924a3430ea Merge branch '34-erstellung-eines-datenuebertragungsmodell' into 35-datenubertragung-zwischen-spielern 
* 34-erstellung-eines-datenuebertragungsmodell:
 2020-05-13 18:27:34 +02:00
127-Z3R0
da36b5ba3d Merge branch 'development' 2020-05-13 16:51:13 +02:00
127-Z3R0
1b8fb6b126 Merge branch 'development' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 35-datenubertragung-zwischen-spielern 
* 'development' of https://gitlab.com/marcel.schwarz/software-projekt-2:
  add Label to EntityManager and implement Labels to SettingsScene
  add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation
  add sharedInstance, small cleanup Code
  add button to SettingsScene for Background Movement
  forgot return type in func getVolume
  add button on-off to settingsScene
  fix multiple calls from startMenuMusic with static Bool, stop music when enter Game
  add SettingsScene with background and music also boolean query for multiple audioplayer start
  add backgroundMusic for MenuScene with SoundManager for futher Sound-Management - music with commercial use
 2020-05-13 16:19:14 +02:00
Aldin Duraki
df16ceeb7c Merge branch '44-settings-einfuegen' into 'development' 
Resolve "Settings einfuegen"

Closes #44

See merge request marcel.schwarz/software-projekt-2!55
 2020-05-13 14:17:07 +00:00
Niko Jochim
a0a6bb9b28 create Base ID, added fromBase - toBase to sending data 2020-05-13 15:47:53 +02:00
Niko Jochim
a8e0bac437 Change send modifications 2020-05-13 15:07:23 +02:00
127-Z3R0
ec2510fd53 add Label to EntityManager and implement Labels to SettingsScene 2020-05-13 15:00:29 +02:00
127-Z3R0
1ca5399a2e add LabelEntity, LabelNode and Labelcomponent - ability to customize and add a Label with animation 2020-05-13 14:59:26 +02:00
Niko Jochim
d553b72daf Change Datamodel to JSON 2020-05-13 14:59:20 +02:00
Niko Jochim
fb01faa1e5 TEST: Datamodel 2020-05-13 13:34:34 +02:00
127-Z3R0
2a42379610 add sharedInstance, small cleanup Code 2020-05-13 12:59:55 +02:00
Jakob Haag
1f5a9f2365 add player to init method 2020-05-12 18:27:21 +02:00
Jakob Haag
339be93865 refactor variables 2020-05-11 19:59:34 +02:00
Marcel Schwarz
4189d0f634 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" 
This reverts merge request !54
 2020-05-11 19:58:15 +02:00
Jakob Haag
bd5d142a43 refactor variables 2020-05-11 19:44:31 +02:00
Jakob Haag
9c751cc84f remove code for testing 2020-05-11 19:37:00 +02:00
Jakob Haag
41d5fc8a5c test 2020-05-11 19:18:19 +02:00
Jakob Haag
282a729250 change method getBaseByTeam to getBaseByPlayer 2020-05-11 18:06:35 +02:00
Jakob Haag
0c9abe0d08 init player1 to playerOneBase and player2 to playerTwoBase on init 2020-05-11 18:05:43 +02:00
Jakob Haag
5b11dacbaa add method getBaseByPlayer to entityManager 2020-05-11 18:05:05 +02:00
Jakob Haag
276d2cfa2e add player to teamcomponent 2020-05-11 18:04:35 +02:00
Jakob Haag
f67c673ca7 add gamegit and gkplayer to teamcomponent 2020-05-11 18:03:45 +02:00
82joni1bif
d99878eb47 TEST: change Datamodel from NSData to Data 2020-05-10 22:36:18 +02:00
82joni1bif
106a0fe6de add print for debug 2020-05-10 22:00:17 +02:00
82joni1bif
99b6843606 Create first version of Datatransfermodel 2020-05-10 21:58:42 +02:00
127-Z3R0
284cf1381b add button to SettingsScene for Background Movement 2020-05-10 21:16:28 +02:00
127-Z3R0
40890f4e37 forgot return type in func getVolume 2020-05-10 20:57:40 +02:00
Tim Herbst
3f56b033ba Merge branch 'development' into '44-settings-einfuegen' 
# Conflicts:
#   GoldWars/GoldWars/Scenes/MenuScene.swift
 2020-05-10 18:11:14 +00:00
127-Z3R0
b30abc4292 add button on-off to settingsScene 2020-05-10 20:08:05 +02:00
Marcel Schwarz
a3361b3752 Merge branch 'revert-3f73a6f6' into 'development' 
Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"

See merge request marcel.schwarz/software-projekt-2!56
 2020-05-10 16:51:09 +00:00
Marcel Schwarz
8c85d6b6f5 Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'" 
This reverts merge request !54
 2020-05-10 16:48:04 +00:00
127-Z3R0
c143179df8 fix multiple calls from startMenuMusic with static Bool, stop music when enter Game 2020-05-10 18:47:42 +02:00