Aldin Duraki
|
3ab40f94cb
|
Merge branch '36-runde-beenden-mit-berechnetem-angriff' into 'development'
Resolve "Runde beenden mit berechnetem Angriff"
Closes #36
See merge request marcel.schwarz/software-projekt-2!78
|
2020-05-21 13:52:11 +00:00 |
|
Aldin Duraki
|
841bda9d9b
|
Readded sleep
|
2020-05-21 15:48:32 +02:00 |
|
Aldin Duraki
|
8e22f02c7a
|
* Impl. debugging move on MapGeneration
* Changed fire particle with master designer niko von jochim
|
2020-05-21 03:18:07 +02:00 |
|
Aldin Duraki
|
9fd34d9a6c
|
Minor fixes
|
2020-05-21 02:44:38 +02:00 |
|
Aldin Duraki
|
ad44ba8302
|
Synching players timer since playermoves would not register before calculating
|
2020-05-21 00:29:19 +02:00 |
|
Aldin Duraki
|
5df7fd3dac
|
TEST: playermoves not synched in same second
|
2020-05-20 23:46:40 +02:00 |
|
Aldin Duraki
|
a8c42fa0b0
|
Fix slider min max unit values
|
2020-05-20 23:36:48 +02:00 |
|
Aldin Duraki
|
5f7b12c28c
|
* Changed slider behavior to not take MAX and 0 value as unit counts to send
|
2020-05-20 23:20:05 +02:00 |
|
Aldin Duraki
|
458d50e4b3
|
FIXME solved by extending the TeamComponent behavior
|
2020-05-20 22:59:32 +02:00 |
|
Aldin Duraki
|
604001a365
|
* Impl. a usecase of a fight scenario
* Reset playermoves when necessary
|
2020-05-20 22:14:29 +02:00 |
|
Aldin Duraki
|
fbe8dbde9d
|
Merge branch '56-attack-boost-faehigkeit-implementieren' into 'development'
Resolve "Attack/Defence Boost Faehigkeit implementieren"
Closes #57 and #56
See merge request marcel.schwarz/software-projekt-2!61
|
2020-05-20 19:04:41 +00:00 |
|
Aldin Duraki
|
fdb3877194
|
Merge branch 'development'
Conflicts:
GoldWars/GoldWars.xcodeproj/project.pbxproj
|
2020-05-20 21:00:15 +02:00 |
|
Aldin Duraki
|
582b59a216
|
Merge branch '59-map-generation-fur-zwei-spieler-c-elemente' into 'development'
Resolve "Map Generation für zwei Spieler - C-Elemente"
Closes #59
See merge request marcel.schwarz/software-projekt-2!73
|
2020-05-20 18:33:57 +00:00 |
|
|
|
fe1405d3fa
|
Send map model to other player over data service
|
2020-05-20 20:33:40 +02:00 |
|
|
|
71f556868f
|
Allow map to be loaded from predefined model
|
2020-05-20 20:33:40 +02:00 |
|
|
|
0fd409c00b
|
Add Ids to C-Elements and corresponding protocol
|
2020-05-20 20:33:39 +02:00 |
|
Jakob Haag
|
4fdd95bd76
|
Add CElements and Ways
|
2020-05-20 20:33:39 +02:00 |
|
Aldin Duraki
|
53705849f2
|
Merge branch '24-map-generation-fur-zwei-spieler-twoplayermap' into 'development'
Resolve "Map Generation für zwei Spieler - TwoPlayerMap"
Closes #24
See merge request marcel.schwarz/software-projekt-2!64
|
2020-05-20 18:33:12 +00:00 |
|
|
|
739a7120f9
|
Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren'
# Conflicts:
# GoldWars/GoldWars.xcodeproj/project.pbxproj
|
2020-05-20 16:33:37 +00:00 |
|
|
|
ee031f71c1
|
Add TwoPlayerMapGenerator
|
2020-05-20 17:03:04 +02:00 |
|
|
|
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 |
|
