Niko Jochim
9a8e8ef663
Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'
2020-07-02 17:04:21 +02:00
127-Z3R0
2a17e81a3a
Change version for final delivery
2020-07-02 16:11:27 +02:00
Niko Jochim
2f056725d6
FIX BUGS
2020-07-02 13:55:26 +02:00
Aldin Duraki
43ba0be225
Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'
2020-07-02 13:01:37 +02:00
Aldin Duraki
cbb65769a3
Fix connection timeout
2020-07-02 13:01:21 +02:00
Niko Jochim
66aa21ccb4
Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'
2020-07-02 12:54:22 +02:00
Niko Jochim
985e4f48cb
FIX trigger GameQuit
2020-07-02 12:53:45 +02:00
Aldin Duraki
f4cd97cac7
Test crash bugfix
2020-07-02 12:48:51 +02:00
Niko Jochim
5d8df46361
change trigger GameEnd
2020-07-02 12:34:29 +02:00
Niko Jochim
568bc14d03
FIX
2020-06-26 03:03:19 +02:00
Niko Jochim
c7aa992790
FIX pauseGame Modal in GameEnd View
2020-06-26 02:55:02 +02:00
Niko Jochim
67c400a069
review changes
2020-06-26 02:44:09 +02:00
Niko Jochim
f689b54989
review changes
2020-06-26 02:18:57 +02:00
Niko Jochim
88ddf07a05
HUD Layout
2020-06-26 01:57:08 +02:00
Niko Jochim
6607d6739b
create new finish Button
2020-06-26 01:02:09 +02:00
Niko Jochim
0cf368fef0
add smaller Base Texture for better performance
2020-06-25 23:57:22 +02:00
43e474467b
Introduce error logging for elo system
2020-06-25 21:41:34 +02:00
2d00bc363a
New leaderboard for best elo
2020-06-25 21:41:34 +02:00
890d43edca
Report scores to multiple leaderboards
2020-06-25 21:41:34 +02:00
Aldin Duraki
da4b5cda63
Impl. Heartbeat and DC check
2020-06-25 21:04:59 +02:00
4a3d22596a
Fix size of menu scene text and logo
2020-06-25 20:52:22 +02:00
Aldin Duraki
89dc64db27
Merge branch '89-regelwerk' into 'development'
...
Resolve "Regelwerk"
Closes #89
See merge request marcel.schwarz/software-projekt-2!112
2020-06-25 17:36:44 +00:00
Chauntalle Schüle
d634727a60
deleted print
2020-06-25 19:34:27 +02:00
Aldin Duraki
86a16c1d78
...
2020-06-25 19:32:11 +02:00
Chauntalle Schüle
d5d2270b25
Merge branch 'development' into 89-regelwerk
2020-06-25 19:28:15 +02:00
3e35db1d42
Add Verlassen button with modal and end screen
2020-06-25 19:27:13 +02:00
Chauntalle Schüle
f9a14852f5
update Textures
2020-06-25 19:25:21 +02:00
Aldin Duraki
17332f3f54
Merge branch '113-fix-unitlabel-wenn-bei-aktivem-spy-angegriffen-wird' into 'development'
...
Resolve "Fix unitlabel wenn bei aktivem Spy angegriffen wird"
Closes #113
See merge request marcel.schwarz/software-projekt-2!140
2020-06-25 16:31:01 +00:00
Jakob Haag
880d2ef7c4
Check if the attacked base is an enemy base or not and update the label according to this
2020-06-25 18:28:13 +02:00
Daniel Steckert
51acc34fb2
Remove unnessary code
2020-06-25 18:25:22 +02:00
Daniel Steckert
6930c83918
Remove unnecessary code
2020-06-25 18:15:17 +02:00
Daniel Steckert
58f6032e06
Add possibility to disable sound effects
2020-06-25 17:47:25 +02:00
Daniel Steckert
9b1ff1d4ae
Add and trigger sound effects
2020-06-25 17:39:31 +02:00
Aldin Duraki
d189f799ca
Merge branch 'revert-soundeffekte' into 'development'
...
Revert "Merge branch '100-soundeffekte' into 'development'"
See merge request marcel.schwarz/software-projekt-2!136
2020-06-25 14:56:57 +00:00
dd9d91eab8
Fix missing os import and log init
2020-06-25 16:41:27 +02:00
Jakob Haag
9ff8bcb6e5
Change all english label to german
2020-06-25 16:35:57 +02:00
5e76c68997
Revert "Merge branch '100-soundeffekte' into 'development'"
...
This reverts commit 5d89636ebd2b2c86a4de
2020-06-25 16:29:50 +02:00
Aldin Duraki
9b3ca1060e
Alpha value fix for buttons
2020-06-25 15:17:24 +02:00
ff2ffc1164
Add skill cooldowns and new skill button assets
2020-06-25 14:59:45 +02:00
Aldin Duraki
26b3b13459
Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development'
...
Resolve "Status eines jeweiligen Settings sollte in den Settings erkennbar sein"
Closes #82
See merge request marcel.schwarz/software-projekt-2!132
2020-06-25 12:44:52 +00:00
127-Z3R0
77ffe9a815
delete unessecary files
2020-06-25 14:42:23 +02:00
127-Z3R0
bf50703b1c
Ignore the last two Commits -> stupidy impact
...
* Access to ButtonNode via Component
* revert work and implement everything needed
2020-06-25 14:39:31 +02:00
127-Z3R0
6970f27a61
Add new Buttons to SettingsScene
...
* Due to UserDefaults change label by start
* add logging in SoundManager
finish work
2020-06-25 14:20:16 +02:00
127-Z3R0
2f664712d0
Add designated SettingsButton for ButtonNode-Visibility
...
* modify EntityManager to add SettingsButton
* implement Method to toggle Status on/off
* in the ButtonNode make Label visible to change text after init
2020-06-25 14:19:24 +02:00
Chauntalle Schüle
2d38373590
Merge branch 'development' into 89-regelwerk
2020-06-25 13:12:05 +02:00
Aldin Duraki
c344ff82f4
Fix for #109 & #110
2020-06-25 12:39:53 +02:00
Chauntalle Schüle
3b6647b817
added Credits
2020-06-25 12:38:29 +02:00
Chauntalle Schüle
8758246798
Merge branch 'development' into 89-regelwerk
2020-06-25 00:39:54 +02:00
5cbe20e6c8
Delete unused sound-file
2020-06-24 22:00:16 +02:00
Daniel Steckert
7e1a80e33a
Add logging and remove local references to files
2020-06-24 21:16:16 +02:00
