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 |
|
Niko Jochim
|
24eced5859
|
add Animated Cylinder to MainScence
|
2020-05-13 23:33:34 +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 |
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
3f73a6f64d
|
Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'
Resolve "Basisownership anhand des GKPlayers"
Closes #33
See merge request marcel.schwarz/software-projekt-2!54
|
2020-05-09 16:39:03 +00: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 |
|
