hft-informatik/software-projekt-2-gold-wars
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
402 Commits 11 Branches 0 Tags 8.8 MiB
58f6032e06
Commit Graph

402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marcel Schwarz
a3361b3752 Merge branch 'revert-3f73a6f6' into 'development' 
Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"

See merge request marcel.schwarz/software-projekt-2!56
 2020-05-10 16:51:09 +00:00
Marcel Schwarz
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
Marcel Schwarz
3f73a6f64d Merge branch '33-basisownership-anhand-des-gkplayers' into 'development' 
Resolve "Basisownership anhand des GKPlayers"

Closes #33

See merge request marcel.schwarz/software-projekt-2!54
 2020-05-09 16:39:03 +00:00
Jakob Haag
fa1b40b263 change auto-format to better style 2020-05-09 18:31:06 +02:00
Jakob Haag
6c28c49802 Auto-Format whole project 2020-05-09 18:20:33 +02:00
Jakob Haag
7e369cc7f5 Change assertion of null-able values team and player 2020-05-09 18:11:53 +02:00
Jakob Haag
b2533d2a7d import missing GameKit 2020-05-09 17:57:22 +02:00
Jakob Haag
a76fd69267 exchange the tabs with withspaces 2020-05-09 17:57:06 +02:00
Jakob Haag
6a847a0718 Update TwoPlayerDefaultTestMap.swift 2020-05-09 14:37:20 +00:00
Jakob Haag
1428720dc2 add local player as ownerShipPlayer for base1. Not final version --> ToDo 2020-05-09 15:23:45 +02:00
Jakob Haag
0dd1664506 change ownerShipPlayer on attackBase function 2020-05-09 15:23:28 +02:00
Jakob Haag
e1b0ac4d87 add nullable ownerShipPlayer to Base and add init of it to init-method 2020-05-09 15:22:24 +02:00
Aldin Duraki
6e7758767f Merge branch 'sprint_2_version' into 'development' 
change Build version

See merge request marcel.schwarz/software-projekt-2!46
 2020-05-07 19:04:54 +00:00
82joni1bif
91bc4fa59c change Build version 2020-05-07 21:02:23 +02:00
Aldin Duraki
5bd8aa2083 Merge branch '20-timer-anbindung-an-gamecenter' into 'development' 
Resolve "[TIMER] Anbindung an GameCenter"

See merge request marcel.schwarz/software-projekt-2!42
 2020-05-07 18:43:34 +00: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
dcd4a10d08 Merge branch '19-einheiten-bewegen' into 'development' 
Resolve "Einheiten bewegen"

Closes #19

See merge request marcel.schwarz/software-projekt-2!41
 2020-05-07 18:17:42 +00: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
7254183d9e Merge remote-tracking branch 'refs/remotes/origin/20-timer-anbindung-an-gamecenter' 2020-05-05 21:39: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
Marcel Schwarz
0b4e9ad48e Merge branch '31-debug-flag-fur-matchmaking' into 'development' 
Resolve "Debug Flag für Matchmaking"

Closes #31

See merge request marcel.schwarz/software-projekt-2!43
 2020-05-05 16:19:35 +00:00
Simon Kellner
084b79a7c0 Add flag(--no-matchmaking) to prevent matchmaking process and instantly open GameScene 2020-05-05 18:15:18 +02:00
Daniel Steckert
9a7a8adaf8 Implement TimerComponent 2020-05-05 17:19:04 +02:00
Aldin Duraki
350682cf82 Merge branch '26-mm-anbindung-an-gamecenter' into 'development' 
Resolve "[MM] Anbindung an GameCenter"

Closes #26

See merge request marcel.schwarz/software-projekt-2!40
 2020-05-05 13:09:39 +00: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