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

214 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aldin Duraki
4a1b43a70d TEST: Change dependencies of optional types 2020-05-18 01:03:25 +02:00
Aldin Duraki
e08d40dd4a TEST: snapshotModel not updating 2020-05-18 00:27:53 +02:00
Aldin Duraki
1dc97c3bab Solve Mergeconflicts 2020-05-17 21:48:17 +02:00
Aldin Duraki
69e41a9cd3 Merge branch '60-global-accessible-entitymanager' 
Conflicts:
	GoldWars/GoldWars/Scenes/GameScene.swift
 2020-05-17 21:43:41 +02:00
Aldin Duraki
dc85d0179e * Impl. RoundCalculationService 
* Impl. SnapshotModel
* Impl. DataTransfer for SnapshotModel
* Impl. PlayerMoveType
* Changed DataService functionality
 2020-05-17 21:40:41 +02:00
Simon Kellner
d80e80783a change entity manager implementation to singleton 2020-05-17 18:00:49 +02:00
Aldin Duraki
4b8b2b3b2d Merge branch '48-logo-in-der-mainscene' into 'development' 
Resolve "Logo in der MainScene"

Closes #48

See merge request marcel.schwarz/software-projekt-2!63
 2020-05-16 12:52:48 +00:00
Niko Jochim
46615176be reverse projrct.pbxproj 2020-05-16 10:35:24 +02:00
Niko Jochim
c341f5441a add SpinningLogo to EC-System and EM 2020-05-16 09:37:07 +02:00
Niko Jochim
3ffbae79f2 Revert "add SpinningLogo to EC-System and EM" 
This reverts commit c15234c974.
 2020-05-15 21:34:19 +02:00
Niko Jochim
c15234c974 add SpinningLogo to EC-System and EM 2020-05-15 21:29:15 +02:00
Aldin Duraki
009b39ca14 TEST: Get a List of overlapping moves 2020-05-15 20:45:52 +02:00
Aldin Duraki
4cf9b8c95e Re-commit missing lines 2020-05-15 19:40:13 +02:00
Aldin Duraki
84effcf6bf Added missing line 2020-05-15 17:21:06 +02:00
Aldin Duraki
d949f57a87 Merge branch 'development' into 36-runde-beenden-mit-berechnetem-angriff 
# Conflicts:
#	GoldWars/GoldWars/Entities/Base.swift
#	GoldWars/GoldWars/Entities/EntityManager.swift
#	GoldWars/GoldWars/MatchmakingHelper.swift
 2020-05-15 17:14:43 +02:00
Niko Jochim
6c61b97d2c add texture to 3D Cylinder 2020-05-15 17:13:39 +02:00
Aldin Duraki
9fe149e594 TEST: check if we can make a solid iterable foundation for player moves 2020-05-15 16:31:27 +02:00
Niko Jochim
f5b147259a Merge remote-tracking branch 'refs/remotes/origin/development' 2020-05-15 13:08:59 +02:00
Aldin Duraki
df222bba84 Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' 
Resolve "Basisownership anhand des GKPlayers"

Closes #33

See merge request marcel.schwarz/software-projekt-2!68
 2020-05-15 10:14:17 +00:00
Jakob Haag
b24d93c399 add nullable assigment to ownershipPlayer 2020-05-15 12:12:52 +02:00
Jakob Haag
ac1ad05bac add player to teamcomponent 2020-05-15 12:02:07 +02:00
Jakob Haag
43dd2aa853 import GameKit and add ownershipPlayer to component 2020-05-15 12:01:55 +02:00
Jakob Haag
23248876ba add method getBaseByPlayer and getBasesByPlayer, format code and import GameKit 2020-05-15 12:01:26 +02:00
Jakob Haag
c53ab5f857 init players to basePlayerOne and Two 2020-05-15 12:00:01 +02:00
Jakob Haag
f2c6de058c remove unnecessary code 2020-05-15 11:59:42 +02:00
Jakob Haag
5eb8267266 import GameKit, format Code and change method to getBasesByPlayer 2020-05-15 11:59:05 +02:00
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