Aldin Duraki
|
5b722b95fc
|
Merge branch '43-ueberarbeitung-angriffsmodal' into 'development'
Resolve "Ueberarbeitung Angriffsmodal" closes #43
Closes #43
See merge request marcel.schwarz/software-projekt-2!72
|
2020-05-19 15:10:17 +00:00 |
|
Chauntalle Schüle
|
f291c021b3
|
Merge remote-tracking branch 'refs/remotes/origin/development'
|
2020-05-18 21:37:35 +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
|
8d4c136f6b
|
Merge branch '60-global-accessible-entitymanager' into 'development'
Resolve "Global accessible EntityManager"
Closes #60
See merge request marcel.schwarz/software-projekt-2!71
|
2020-05-18 17:58:59 +00: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 |
|
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 |
|
Niko Jochim
|
6c61b97d2c
|
add texture to 3D Cylinder
|
2020-05-15 17:13:39 +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 |
|
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 |
|