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
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
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
Daniel Steckert
423ccc3208
Implement timer during rounds
2020-05-05 22:34:08 +02:00
Daniel Steckert
58d7a01fd1
Implement TimerComponent
2020-05-05 21:37:58 +02:00
Aldin Duraki
3b417cbe0e
Minor code cleanup
2020-05-05 11:16:27 -07:00
Simon Kellner
084b79a7c0
Add flag(--no-matchmaking) to prevent matchmaking process and instantly open GameScene
2020-05-05 18:15:18 +02:00
Chauntalle Schüle
d97b124b83
cleaned up code
2020-05-05 11:44:33 +02:00
Chauntalle Schüle
3aef30b495
Kommentare eingefügt
...
Spielerzuweisung wird getestet
2020-05-05 11:00:11 +02:00
Ömer Özel
b8b37de349
Push MM
2020-05-05 00:35:27 +02:00
Chauntalle Schüle
e1d5af8a4a
matchmaking funktioniert
2020-05-04 23:44:23 +02:00
Chauntalle Schüle
e21395d0db
Checken ob match gefunden wurde
2020-05-04 21:44:50 +02:00
Chauntalle Schüle
54d31d929d
Update MatchMakerHelper, added methods
2020-05-04 20:34:58 +02:00
Chauntalle Schüle
017e99183b
add File to Project Tree
2020-05-04 15:22:48 +02:00
Chauntalle Schüle
71a59f2fa0
Add MatchmakingViewController
2020-05-04 15:13:04 +02:00
Niko
9b3bdbf34b
implemented touch functionality
2020-05-03 15:46:48 +02:00
Niko
d72c10fa75
implement Background Entity and Component
2020-05-03 00:14:32 +02:00
Niko
94d7be35ff
implemented ButtonEntity
2020-05-02 23:12:37 +02:00
Niko
fcf49e656d
Merge remote-tracking branch 'origin/29-uberarbeitung-der-menuscene-button' into cleanup_scenes
2020-05-02 22:31:12 +02:00
Niko
fae2855bf9
stash
2020-05-02 22:29:16 +02:00
5eed82803b
Remove unnecessary field form MapFactory
2020-05-02 21:55:08 +02:00
7fc4a5145f
Do some polishing
2020-05-02 21:52:43 +02:00
0dbcbe5eb0
Move adjacency list into base
...
Fix typo in MapProtocol
Improve MapFactory
Generalize MapProtocol
2020-05-02 21:45:21 +02:00
54813ab44d
Fix indentation in Base entity
2020-05-02 21:08:10 +02:00
67a345e9bf
Add adjacency mapping
2020-05-02 20:47:33 +02:00
918979d750
Introduce column based layout
2020-05-02 20:22:31 +02:00
ffd4e0dfe0
Initialize team in Base model with default nil
2020-05-02 20:13:31 +02:00
c1bb6a47de
Create Map Factory, remove texture name from base constructor
2020-05-02 20:08:30 +02:00
5a7c29b3b8
Extract player bases, simplify layout definition
2020-05-02 19:07:02 +02:00
ffc4c05a46
Extract default test map, add map protocol to game scene
2020-05-02 18:48:23 +02:00
4c37ac690c
Move files to correct directory
2020-05-02 18:11:01 +02:00
5eb9daa02b
Create files for Map model
2020-05-02 18:06:18 +02:00
Jakob Haag
868e10e7a4
fix spelling
2020-05-02 16:16:16 +02:00
Jakob Haag
311b19d9c2
add label of user is not logged in to GameCenter
2020-05-02 16:15:03 +02:00
Jakob Haag
cdb67f2d7c
remove unused code and format
2020-05-02 16:14:46 +02:00
Jakob Haag
bb98c9d0a6
add rest of necessary swift files
2020-05-02 14:04:08 +02:00
Jakob Haag
c6d1adce9b
init 100 units to the team-bases on init
2020-05-02 14:03:41 +02:00
Jakob Haag
e8654fbf54
move team-enum out of class
2020-05-02 14:03:14 +02:00
Jakob Haag
e9bd05c852
add GameCenterLogin-window to the GameViewController and fix size of the MenueScene
2020-05-02 14:02:24 +02:00
Jakob Haag
cdb4d69621
Add window to menu to see if the user is authenticated (ToDo)
2020-05-02 14:01:05 +02:00
Jakob Haag
0a94e64a25
add GameCenterHelper to login to GameCenter and recognize authenticated user
2020-05-02 13:59:34 +02:00
Niko Jochim
aae0a49da0
add fire to homebase
2020-05-02 01:22:53 +02:00
Niko Jochim
5b7c5039e1
add background to menu-scene
2020-05-02 00:14:21 +02:00
Niko Jochim
8d1aa1de66
added moving cloudy background
2020-05-01 23:57:23 +02:00
127-Z3R0
d8d80b8eb7
add asset SkyBackground and Components
2020-05-01 23:43:37 +02:00
Niko Jochim
3b80b945c4
impl. hud
2020-05-01 23:33:46 +02:00
Niko Jochim
323ca45e51
fix teamComponents reference
2020-05-01 22:02:26 +02:00
Niko Jochim
2ff1a1d705
add pop-Up base-details
2020-05-01 21:47:43 +02:00
Niko Jochim
706c879351
change architecture to entity-component
2020-05-01 17:55:42 +02:00
Aldin Duraki
6127f89e78
impf. EntityManager
2020-05-01 15:28:47 +02:00
Aldin Duraki
21b7fc00f7
Init Entity-Component Folder Structure
2020-05-01 15:09:46 +02:00
Aldin Duraki
9f569c30fa
Flatten Project
2020-05-01 14:49:55 +02:00
Aldin Duraki
996800bc01
Impl. HUD for GameScene
2020-04-23 23:01:19 +02:00
Aldin Duraki
5ffe6fe81c
Finalize MenuScene
2020-04-23 21:31:43 +02:00
Aldin Duraki
647ca473c3
Merge branch '15-logo-erstellen' into 'development'
...
add missing iPad icons
Closes #15
See merge request marcel.schwarz/software-projekt-2!19
2020-04-23 18:11:28 +00:00
c207e2a354
add missing iPad icons
2020-04-23 18:35:41 +02:00
Aldin Duraki
f21ca69061
Merge branch '15-logo-erstellen' into 'development'
...
Resolve "Logo erstellen"
Closes #15
See merge request marcel.schwarz/software-projekt-2!13
2020-04-23 16:30:47 +00:00
3ce979303e
add logo 20 pt and 26 pt
2020-04-23 18:18:02 +02:00
72haja
31143265f6
add unitCount and unitType for basePlayer1 and basePlayer2
2020-04-22 18:17:07 +02:00
72haja
d8adce88d2
add attributes to Base for unitCount and unitType. Init attributes in constructor with default parameters
2020-04-22 18:16:25 +02:00
72haja
6c68a569b9
Change struct Unit to enum Unit
2020-04-22 18:14:27 +02:00
127-Z3R0
807ecdd75e
Merge branch '15-logo-erstellen' of https://gitlab.com/marcel.schwarz/software-projekt-2 into 15-logo-erstellen
2020-04-22 16:59:21 +02:00
Aldin Duraki
fdbce8e56d
Merge branch '11-view-background' into 'development'
...
Background add
Closes #11
See merge request marcel.schwarz/software-projekt-2!18
2020-04-22 14:49:41 +00:00
Aldin Duraki
6f8487e16e
Refactor Unit class
2020-04-22 16:43:58 +02:00
Aldin Duraki
d5058afebb
Merge branch '12-model-einheiten' into 'development'
...
Finalised Issue - Model Einheiten
Closes #12
See merge request marcel.schwarz/software-projekt-2!12
2020-04-22 14:34:39 +00:00
127-Z3R0
b87eb3dd53
delete portrait-mode and more refactoring with master Aldin
2020-04-22 16:29:28 +02:00
127-Z3R0
6712398f6a
forgive me master
2020-04-22 16:25:06 +02:00
Ömer Özel
dffcb320b2
Background add
2020-04-22 16:22:06 +02:00
127-Z3R0
e91b2c3220
refactoring with master Aldin
2020-04-22 15:59:31 +02:00
127-Z3R0
d596442015
add physicsbody to base 6-7 and removal to func addPhysicsBodyToBase()
2020-04-22 14:04:40 +02:00
127-Z3R0
7b128a7ee8
delete commented Code and prints
2020-04-21 20:07:36 +02:00
Chauntalle Schüle
9be1401506
Change Variables
2020-04-21 19:16:35 +02:00
Simon Kellner
f2be3a955b
add logo files in different sizes, update filenames in Contents.json
2020-04-21 16:24:01 +02:00
Chauntalle Schüle
06a4bea38d
add struct für die Einheiten im File Unit.swift
2020-04-21 13:59:06 +02:00
127-Z3R0
f3036a5b33
fix interaction-menu with base - zPosition
2020-04-20 14:32:34 +02:00
127-Z3R0
4acd12ddc5
add PhysicsBody for Drag&Drop Functionality
2020-04-20 14:21:55 +02:00
127-Z3R0
7d57decb93
fix bound.size problem
2020-04-20 14:17:09 +02:00
