Aldin Duraki
08894325a5
Impl. Modal Overlay
2020-06-02 11:55:17 +02:00
Jakob Haag
2ba541e369
Resize Button, adjust position and change text
2020-06-02 11:12:14 +02:00
Aldin Duraki
42f4537dc6
Fixed scope issue on collected playerMoves
2020-06-02 11:01:15 +02:00
Jakob Haag
eaa71d1d73
fix crash on spamming finish button
2020-06-02 09:34:32 +02:00
Jakob Haag
a086a7779b
fix rebase issues
2020-06-01 22:47:11 +02:00
Jakob Haag
eadcec10d8
init function of finish button
2020-06-01 22:47:11 +02:00
Jakob Haag
99b57cc4cd
add finishButton to HUD
2020-06-01 22:47:11 +02:00
Jakob Haag
bddd226ffd
Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer
2020-06-01 22:47:11 +02:00
Jakob Haag
37fba97953
Add RoundTimer and adjust TimerComponent
2020-06-01 22:47:11 +02:00
Aldin Duraki
9cd87c6bf5
Changed captured bases behavior so that they are not allowed to move units in same Round
...
Fixed Merge errors
Fixed calculation on a specific fight scenario
Fixed RoundTimer
Fixed forced unwrap on boost nil object
2020-06-01 22:43:02 +02:00
Aldin Duraki
96eb25de65
Impl. global unit count increasement functionality after each round
2020-06-01 19:40:08 +02:00
729ee968b3
Delete TimerComponent file
2020-06-01 19:22:13 +02:00
Jakob Haag
f882b7e615
Remove TimeComponent and set TimerLabel in the HUD. Reset Timer via RoundTimer
2020-06-01 19:18:19 +02:00
Jakob Haag
5c6ee9fd7e
Add RoundTimer and adjust TimerComponent
2020-06-01 19:18:19 +02:00
dab98b9256
Fix ownership after snapshotReveive
2020-06-01 19:12:47 +02:00
64d2c04fcb
Swap playWithMaxUnits after applying boosts
2020-06-01 18:29:17 +02:00
2820c7357a
Remove optionals on localRoundData
2020-06-01 17:37:43 +02:00
4c9d83c7cb
Add localRoundData
...
Send boosts
2020-06-01 17:27:13 +02:00
a423942182
Send boosts with snapshot model, increase unit counts accordingly
2020-05-31 23:14:06 +02:00
6b1d0eac12
Add atk and def boost to PlayerMove struct
2020-05-31 19:04:58 +02:00
0d20cc6716
Collect baseSpecificMoves in separate function
2020-05-31 14:45:57 +02:00
Jakob Haag
bd1848a629
remove false ways
2020-05-29 17:19:32 +02:00
Jakob Haag
915d726160
remove SkillComponents and PlayerInfoComponent and implement them in the HUD class. Adjust the EntityManager
2020-05-29 17:19:32 +02:00
61f3ab14fc
Update log subsystem in MapFactory
2020-05-29 16:51:43 +02:00
ed5d5caa15
Remove orphan files
2020-05-29 16:39:12 +02:00
387303af3a
Pull getMapModel in the MapModelStruct
2020-05-29 16:32:17 +02:00
08dfe6a922
Pull TwoPlayerMapGenerator in as MapFactory
2020-05-29 16:23:56 +02:00
40ba0f4468
Remove MapProtocol
2020-05-29 16:14:14 +02:00
b210e04d38
Remove TestMap
2020-05-29 16:09:42 +02:00
Jakob Haag
f1e54a6da4
Set different header and text in the submit button for attack an enemy base or move units between own bases
2020-05-29 14:28:31 +02:00
Niko Jochim
84ef233f9f
add new Assets
...
* change Base Texture
* change Background Texture
* change ModalBackgrund Texture
* add RedCross Texture
* set Button Texture in SettingsScene
* adjust Texture Positions
2020-05-29 11:45:28 +02:00
Niko Jochim
9329978981
* create new GameCenterManager
...
* send RandomNumber to all Peers Method
2020-05-27 20:41:05 +00:00
Jakob Haag
f7e4188143
Add limit of moves
...
* set limit of moves. 1 attack and 5 own unit moves
* update move-limiter after submit button of modal
* increase number of attack to two able attacks
2020-05-26 20:11:16 +02:00
288438884e
Refactor complete entity component model
2020-05-26 18:57:32 +02:00
2c31d923c6
Reset all bases when moveTouch is finished
2020-05-24 14:48:17 +02:00
127-Z3R0
7e2b1b7a54
* Refactor for Master of the Universe
2020-05-23 19:02:39 +02:00
127-Z3R0
e447a37757
* Add 3 Instances for each Scene
...
* Refactor in Code that the right instances is called
* Probs to Aldin und nicht an Niko, der nur im Bett liegt
2020-05-23 18:36:59 +02:00
Aldin Duraki
df7c86f57e
Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"
...
This reverts merge request !60
2020-05-21 17:44:26 +00:00
Niko Jochim
b2f84bc3f4
set zPosistion on all Nodes
...
update host and peer Label Nodes
2020-05-21 19:40:46 +02:00
Niko Jochim
bf8ce0c477
Merge branch 'development'
2020-05-21 18:00:15 +02:00
Niko Jochim
d16867f367
add label with 100000000 changes
2020-05-21 17:59:19 +02: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
fdb3877194
Merge branch 'development'
...
Conflicts:
GoldWars/GoldWars.xcodeproj/project.pbxproj
2020-05-20 21:00:15 +02: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
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
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
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
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
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
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
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
