|
|
e2bd0dc7cf
|
Pull protocols in MapFactory
Add TwoPlayerMapGenerator
Add CenterElementProvider
Introduce Logging for MapGenerator
|
2020-05-20 17:03:04 +02:00 |
|
Aldin Duraki
|
701a56248a
|
Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development'
Resolve "Runde beenden mit berechnetem Angriff"
Closes #34, #35, and #36
See merge request marcel.schwarz/software-projekt-2!59
|
2020-05-20 14:59:52 +00:00 |
|
Aldin Duraki
|
2ac82e5159
|
* Minor fixes
* Open up calculator service
|
2020-05-20 01:41:48 +02:00 |
|
Aldin Duraki
|
f60e97a866
|
Solve missing lines on previous merge
|
2020-05-20 00:35:46 +02:00 |
|
Aldin Duraki
|
98b8250fc8
|
Merge branch 'development'
Conflicts:
GoldWars/GoldWars/Entities/Modal.swift
GoldWars/GoldWars/Scenes/GameScene.swift
|
2020-05-20 00:33:15 +02:00 |
|
Aldin Duraki
|
4bb5b9ee48
|
* Undo removing Teamcomponent upfront since it causes errors when trying to find a team on initial owned base
|
2020-05-20 00:31:31 +02:00 |
|
Aldin Duraki
|
1571a1e786
|
* Impl. combined forces attack
* Minor refactoring
* Fixed component updates on updating entities from snapshot
* Fixed mapping for incoming player moves
|
2020-05-20 00:11:49 +02:00 |
|
Simon Kellner
|
28fa86c25c
|
add SkillButtonNode, Attack and Defence Skill -change Unit enum to UnitType
|
2020-05-19 19:13:56 +02:00 |
|
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 |
|
Aldin Duraki
|
de5929d070
|
* Fix trying to add fire sprite node to existing component
|
2020-05-19 15:53:07 +02:00 |
|
Aldin Duraki
|
b04bbe5036
|
* Fixed TeamComponent when updating Entities
* Minor refactor
|
2020-05-19 02:21:41 +02: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 |
|
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 |
|
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 |
|
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 |
|
