288438884e
Refactor complete entity component model
2020-05-26 18:57:32 +02:00
Niko Jochim
d16867f367
add label with 100000000 changes
2020-05-21 17:59:19 +02:00
Aldin Duraki
fdb3877194
Merge branch 'development'
...
Conflicts:
GoldWars/GoldWars.xcodeproj/project.pbxproj
2020-05-20 21:00:15 +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
98b8250fc8
Merge branch 'development'
...
Conflicts:
GoldWars/GoldWars/Entities/Modal.swift
GoldWars/GoldWars/Scenes/GameScene.swift
2020-05-20 00:33:15 +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
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
8db0b14b7f
solving merge conflicts
2020-05-16 19:12:10 +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
Chauntalle Schüle
5d98027d8a
Adding new Files for Cancel Button in ModalAttack
2020-05-15 13:19:57 +02:00
Niko Jochim
24eced5859
add Animated Cylinder to MainScence
2020-05-13 23:33:34 +02:00
Aldin Duraki
570099911f
Test: Receiving Data on Hostdevice
2020-05-13 21:15:44 +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
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
82joni1bif
99b6843606
Create first version of Datatransfermodel
2020-05-10 21:58: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
82joni1bif
91bc4fa59c
change Build version
2020-05-07 21:02:23 +02:00
82joni1bif
b602841f8d
Merge branch 'development'
...
Conflicts:
GoldWars/GoldWars.xcodeproj/project.pbxproj
GoldWars/GoldWars/Entities/EntityManager.swift
2020-05-07 20:19:40 +02:00
Aldin Duraki
6b8b11d14e
Merge branch 'development' into '19-einheiten-bewegen'
...
# Conflicts:
# GoldWars/GoldWars/GameViewController.swift
2020-05-07 18:17:24 +00:00
Niko Jochim
3580d5537e
fix SliderComponent
2020-05-06 12:57:41 +02:00
Niko Jochim
185358a3d5
* Impl. basic attacking functionality
...
* added attacking Modal
2020-05-06 02:17:25 +02:00
Daniel Steckert
58d7a01fd1
Implement TimerComponent
2020-05-05 21:37:58 +02:00
Chauntalle Schüle
017e99183b
add File to Project Tree
2020-05-04 15:22:48 +02:00
Niko
9b3bdbf34b
implemented touch functionality
2020-05-03 15:46:48 +02:00
Niko
d72c10fa75
implement Background Entity and Component
2020-05-03 00:14:32 +02:00
Niko
fcf49e656d
Merge remote-tracking branch 'origin/29-uberarbeitung-der-menuscene-button' into cleanup_scenes
2020-05-02 22:31:12 +02:00
Niko
fae2855bf9
stash
2020-05-02 22:29:16 +02:00
0dbcbe5eb0
Move adjacency list into base
...
Fix typo in MapProtocol
Improve MapFactory
Generalize MapProtocol
2020-05-02 21:45:21 +02:00
c1bb6a47de
Create Map Factory, remove texture name from base constructor
2020-05-02 20:08:30 +02:00
4c37ac690c
Move files to correct directory
2020-05-02 18:11:01 +02:00
5eb9daa02b
Create files for Map model
2020-05-02 18:06:18 +02:00
Jakob Haag
bb98c9d0a6
add rest of necessary swift files
2020-05-02 14:04:08 +02:00
Niko Jochim
aae0a49da0
add fire to homebase
2020-05-02 01:22:53 +02:00
Niko Jochim
3b80b945c4
impl. hud
2020-05-01 23:33:46 +02:00
Niko Jochim
323ca45e51
fix teamComponents reference
2020-05-01 22:02:26 +02:00
Niko Jochim
2ff1a1d705
add pop-Up base-details
2020-05-01 21:47:43 +02:00
Niko Jochim
706c879351
change architecture to entity-component
2020-05-01 17:55:42 +02:00
Aldin Duraki
6127f89e78
impf. EntityManager
2020-05-01 15:28:47 +02:00
