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 |
|
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 |
|
82joni1bif
|
c196ba721f
|
...
|
2020-05-07 20:14:53 +02: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
|
423ccc3208
|
Implement timer during rounds
|
2020-05-05 22:34:08 +02:00 |
|
Daniel Steckert
|
58d7a01fd1
|
Implement TimerComponent
|
2020-05-05 21:37:58 +02:00 |
|
Aldin Duraki
|
3b417cbe0e
|
Minor code cleanup
|
2020-05-05 11:16:27 -07:00 |
|
Simon Kellner
|
084b79a7c0
|
Add flag(--no-matchmaking) to prevent matchmaking process and instantly open GameScene
|
2020-05-05 18:15:18 +02:00 |
|
Chauntalle Schüle
|
d97b124b83
|
cleaned up code
|
2020-05-05 11:44:33 +02:00 |
|
Chauntalle Schüle
|
3aef30b495
|
Kommentare eingefügt
Spielerzuweisung wird getestet
|
2020-05-05 11:00:11 +02:00 |
|
Ömer Özel
|
b8b37de349
|
Push MM
|
2020-05-05 00:35:27 +02:00 |
|
Chauntalle Schüle
|
e1d5af8a4a
|
matchmaking funktioniert
|
2020-05-04 23:44:23 +02:00 |
|
Chauntalle Schüle
|
e21395d0db
|
Checken ob match gefunden wurde
|
2020-05-04 21:44:50 +02:00 |
|
Chauntalle Schüle
|
54d31d929d
|
Update MatchMakerHelper, added methods
|
2020-05-04 20:34:58 +02:00 |
|
Chauntalle Schüle
|
017e99183b
|
add File to Project Tree
|
2020-05-04 15:22:48 +02:00 |
|
Chauntalle Schüle
|
71a59f2fa0
|
Add MatchmakingViewController
|
2020-05-04 15:13:04 +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
|
94d7be35ff
|
implemented ButtonEntity
|
2020-05-02 23:12:37 +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 |
|
|
|
5eed82803b
|
Remove unnecessary field form MapFactory
|
2020-05-02 21:55:08 +02:00 |
|
|
|
7fc4a5145f
|
Do some polishing
|
2020-05-02 21:52:43 +02:00 |
|
|
|
0dbcbe5eb0
|
Move adjacency list into base
Fix typo in MapProtocol
Improve MapFactory
Generalize MapProtocol
|
2020-05-02 21:45:21 +02:00 |
|
|
|
54813ab44d
|
Fix indentation in Base entity
|
2020-05-02 21:08:10 +02:00 |
|
|
|
67a345e9bf
|
Add adjacency mapping
|
2020-05-02 20:47:33 +02:00 |
|
|
|
918979d750
|
Introduce column based layout
|
2020-05-02 20:22:31 +02:00 |
|
|
|
ffd4e0dfe0
|
Initialize team in Base model with default nil
|
2020-05-02 20:13:31 +02:00 |
|
|
|
c1bb6a47de
|
Create Map Factory, remove texture name from base constructor
|
2020-05-02 20:08:30 +02:00 |
|
|
|
5a7c29b3b8
|
Extract player bases, simplify layout definition
|
2020-05-02 19:07:02 +02:00 |
|
|
|
ffc4c05a46
|
Extract default test map, add map protocol to game scene
|
2020-05-02 18:48:23 +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
|
868e10e7a4
|
fix spelling
|
2020-05-02 16:16:16 +02:00 |
|
Jakob Haag
|
311b19d9c2
|
add label of user is not logged in to GameCenter
|
2020-05-02 16:15:03 +02:00 |
|
Jakob Haag
|
cdb67f2d7c
|
remove unused code and format
|
2020-05-02 16:14:46 +02:00 |
|
Jakob Haag
|
bb98c9d0a6
|
add rest of necessary swift files
|
2020-05-02 14:04:08 +02:00 |
|
Jakob Haag
|
c6d1adce9b
|
init 100 units to the team-bases on init
|
2020-05-02 14:03:41 +02:00 |
|
Jakob Haag
|
e8654fbf54
|
move team-enum out of class
|
2020-05-02 14:03:14 +02:00 |
|
Jakob Haag
|
e9bd05c852
|
add GameCenterLogin-window to the GameViewController and fix size of the MenueScene
|
2020-05-02 14:02:24 +02:00 |
|
Jakob Haag
|
cdb4d69621
|
Add window to menu to see if the user is authenticated (ToDo)
|
2020-05-02 14:01:05 +02:00 |
|
Jakob Haag
|
0a94e64a25
|
add GameCenterHelper to login to GameCenter and recognize authenticated user
|
2020-05-02 13:59:34 +02:00 |
|
Niko Jochim
|
aae0a49da0
|
add fire to homebase
|
2020-05-02 01:22:53 +02:00 |
|
Niko Jochim
|
5b7c5039e1
|
add background to menu-scene
|
2020-05-02 00:14:21 +02:00 |
|
Niko Jochim
|
8d1aa1de66
|
added moving cloudy background
|
2020-05-01 23:57:23 +02:00 |
|
127-Z3R0
|
d8d80b8eb7
|
add asset SkyBackground and Components
|
2020-05-01 23:43:37 +02:00 |
|
Niko Jochim
|
3b80b945c4
|
impl. hud
|
2020-05-01 23:33:46 +02:00 |
|
