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

444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aldin Duraki
c7d9d63752 Merge branch '90-ueberarbeitung-einzelner-hud-elemente' into 'development' 
Resolve "Ueberarbeitung einzelner HUD Elemente"

Closes #90

See merge request marcel.schwarz/software-projekt-2!142
 2020-06-26 01:04:08 +00: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
Aldin Duraki
742123ea63 Merge branch '112-elo-system-report-score-to-all-leaderboards' into 'development' 
Resolve "Elo system report score to all leaderboards"

Closes #112

See merge request marcel.schwarz/software-projekt-2!139
 2020-06-25 20:18:34 +00:00
Marcel Schwarz
43e474467b Introduce error logging for elo system 2020-06-25 21:41:34 +02:00
Marcel Schwarz
2d00bc363a New leaderboard for best elo 2020-06-25 21:41:34 +02:00
Marcel Schwarz
890d43edca Report scores to multiple leaderboards 2020-06-25 21:41:34 +02:00
Aldin Duraki
528f32f788 Merge branch '37-disconnect-error-handle-events' into 'development' 
Resolve "Disconnect Error Handle Events"

Closes #37

See merge request marcel.schwarz/software-projekt-2!134
 2020-06-25 19:39:40 +00:00
Aldin Duraki
da4b5cda63 Impl. Heartbeat and DC check 2020-06-25 21:04:59 +02:00
Aldin Duraki
6cfd91b659 Merge branch '114-adjust-menu-scene-for-smaller-ipads' into 'development' 
Resolve "Adjust menu scene for smaller iPads"

Closes #114

See merge request marcel.schwarz/software-projekt-2!141
 2020-06-25 19:03:31 +00:00
Marcel Schwarz
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
207315af30 Merge branch '72-spielabbruch-button' into 'development' 
Resolve "Spielabbruch Button"

Closes #72

See merge request marcel.schwarz/software-projekt-2!106
 2020-06-25 17:33:15 +00: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
Simon Kellner
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
Aldin Duraki
d925369745 Merge branch '100-soundeffekte' into 'development' 
Resolve "Soundeffekte"

Closes #100

See merge request marcel.schwarz/software-projekt-2!138
 2020-06-25 16:30:25 +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
Marcel Schwarz
dd9d91eab8 Fix missing os import and log init 2020-06-25 16:41:27 +02:00
Aldin Duraki
d6627a4872 Merge branch '111-alles-in-deutsch-ubersetzen' into 'development' 
Resolve "Alles in Deutsch übersetzen"

Closes #111

See merge request marcel.schwarz/software-projekt-2!135
 2020-06-25 14:40:58 +00:00
Jakob Haag
9ff8bcb6e5 Change all english label to german 2020-06-25 16:35:57 +02:00
Marcel Schwarz
5e76c68997 Revert "Merge branch '100-soundeffekte' into 'development'" 
This reverts commit 5d89636ebd, reversing
changes made to 2b2c86a4de.
 2020-06-25 16:29:50 +02:00
Aldin Duraki
49c6017d8a Merge branch '88-cooldown-fur-skills' into 'development' 
Resolve "Cooldown für Skills"

Closes #88

See merge request marcel.schwarz/software-projekt-2!123
 2020-06-25 13:20:05 +00:00
Aldin Duraki
9b3ca1060e Alpha value fix for buttons 2020-06-25 15:17:24 +02:00
Simon Kellner
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
1665e3e6f0 Merge branch '109-minuscount-fehler' into 'development' 
Resolve "Minuscount Fehler"

Closes #109

See merge request marcel.schwarz/software-projekt-2!131
 2020-06-25 10:40:33 +00:00
Aldin Duraki
c344ff82f4 Fix for #109 & #110 2020-06-25 12:39:53 +02:00