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

235 Commits

Author SHA1 Message Date
Aldin Duraki
b04bbe5036 * Fixed TeamComponent when updating Entities 
* Minor refactor
 2020-05-19 02:21:41 +02:00
Chauntalle Schüle
04170eb886 cleaned up code 2020-05-18 21:31:32 +02:00
Chauntalle Schüle
a41c9f4b30 Found Bug, base collision now always registered and bases with fire can still send units 2020-05-18 21:21:06 +02:00
Aldin Duraki
0db2be8625 Test: trying to add the TeamComponent to the new captured base [unsafe-state] 2020-05-18 02:00:13 +02:00
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
Chauntalle Schüle
7350654122 resolved Merge conflicts 2020-05-17 21:09:38 +02:00
Chauntalle Schüle
9ec8158c4e Merge remote-tracking branch 'refs/remotes/origin/60-global-accessible-entitymanager' 
Conflicts:
	GoldWars/GoldWars/Scenes/GameScene.swift
 2020-05-17 19:39:37 +02:00
Simon Kellner
d80e80783a change entity manager implementation to singleton 2020-05-17 18:00:49 +02:00
Chauntalle Schüle
9b57a1bcea making smaller funcs in GameScene for betterUnderstanding 2020-05-16 20:12:32 +02:00
Chauntalle Schüle
8db0b14b7f solving merge conflicts 2020-05-16 19:12:10 +02:00
Chauntalle Schüle
b79677a699 deleted comment and redundant if else 2020-05-16 18:50:55 +02:00
Chauntalle Schüle
8fabdda718 Prints und Kommentare entfernt 2020-05-16 18:46:40 +02:00
Chauntalle Schüle
25c57ceb74 cleaned up modal, added func for sending units 2020-05-16 18:25:22 +02:00
Chauntalle Schüle
a7e6cd9f10 Feuer ergreift neue Basis nur, wenn im Modal Einheiten senden gedrückt wurde und gesendete Einheiten kommen an 2020-05-16 18:09:41 +02: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
Chauntalle Schüle
7bebcf69df cleaned Code 2020-05-15 13:34:26 +02:00
Chauntalle Schüle
938c35196b Resizing Button Abbrechen in ModalAttack 2020-05-15 13:30:56 +02:00
Chauntalle Schüle
8b840b5089 Adding Abbrechen Button to ModalAttack 2020-05-15 13:29:03 +02:00
Chauntalle Schüle
5d98027d8a Adding new Files for Cancel Button in ModalAttack 2020-05-15 13:19:57 +02:00
Niko Jochim
f5b147259a Merge remote-tracking branch 'refs/remotes/origin/development' 2020-05-15 13:08:59 +02: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
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
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
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
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
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
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
127-Z3R0
888d194676 add SettingsScene with background and music also boolean query for multiple audioplayer start 2020-05-10 18:10:36 +02:00
127-Z3R0
9c990cc897 add backgroundMusic for MenuScene with SoundManager for futher Sound-Management - music with commercial use 2020-05-10 17:44:54 +02:00
Jakob Haag
fa1b40b263 change auto-format to better style 2020-05-09 18:31:06 +02:00
Jakob Haag
6c28c49802 Auto-Format whole project 2020-05-09 18:20:33 +02:00
Jakob Haag
7e369cc7f5 Change assertion of null-able values team and player 2020-05-09 18:11:53 +02:00
Jakob Haag
b2533d2a7d import missing GameKit 2020-05-09 17:57:22 +02:00
Jakob Haag
a76fd69267 exchange the tabs with withspaces 2020-05-09 17:57:06 +02:00
Jakob Haag
6a847a0718 Update TwoPlayerDefaultTestMap.swift 2020-05-09 14:37:20 +00:00
Jakob Haag
1428720dc2 add local player as ownerShipPlayer for base1. Not final version --> ToDo 2020-05-09 15:23:45 +02:00
Jakob Haag
0dd1664506 change ownerShipPlayer on attackBase function 2020-05-09 15:23:28 +02:00
Jakob Haag
e1b0ac4d87 add nullable ownerShipPlayer to Base and add init of it to init-method 2020-05-09 15:22:24 +02:00
82joni1bif
91bc4fa59c change Build version 2020-05-07 21:02:23 +02:00
82joni1bif
b602841f8d Merge branch 'development' 
Conflicts:
	GoldWars/GoldWars.xcodeproj/project.pbxproj
	GoldWars/GoldWars/Entities/EntityManager.swift
 2020-05-07 20:19:40 +02:00
Aldin Duraki
6b8b11d14e Merge branch 'development' into '19-einheiten-bewegen' 
# Conflicts:
#   GoldWars/GoldWars/GameViewController.swift
 2020-05-07 18:17:24 +00:00
82joni1bif
c196ba721f ... 2020-05-07 20:14:53 +02:00
Niko Jochim
3580d5537e fix SliderComponent 2020-05-06 12:57:41 +02:00
Niko Jochim
185358a3d5 * Impl. basic attacking functionality 
* added attacking Modal
 2020-05-06 02:17:25 +02:00