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

424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Marcel Schwarz
5d89636ebd Merge branch '100-soundeffekte' into 'development' 
Resolve "Soundeffekte"

Closes #100

See merge request marcel.schwarz/software-projekt-2!118
 2020-06-24 20:06:44 +00:00
Marcel Schwarz
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
Daniel Steckert
bd1d29d6ac Change sound files and remove sound effect for timer 2020-06-24 21:16:16 +02:00
Daniel Steckert
e53e3953dc Trigger sound effects 2020-06-24 21:16:16 +02:00
Daniel Steckert
6370d40e25 Add soundfiles 2020-06-24 21:16:16 +02:00
Aldin Duraki
2b2c86a4de Merge branch '108-fix-label-wenn-basis-von-2-basen-angegriffen-werden' into 'development' 
Resolve "Fix Label wenn Basis von 2 Basen angegriffen werden"

Closes #108

See merge request marcel.schwarz/software-projekt-2!129
 2020-06-24 13:15:53 +00:00
Marcel Schwarz
13bc1b46d5 Update base label only when was not empty before 2020-06-23 20:52:55 +02:00
Marcel Schwarz
d05364708b Use player move type to update unit count label 2020-06-23 20:52:27 +02:00
Marcel Schwarz
9a041c7310 Remove unnecessary complexity, Reformat code 2020-06-23 19:59:28 +02:00
Chauntalle Schüle
a52e4cd8d1 changes after review 2020-06-23 18:55:47 +02:00
Chauntalle Schüle
23cd0ade20 changed questionmark asset 2020-06-21 23:25:58 +02:00
Chauntalle Schüle
29adaf14a7 same functionality just cleaned up code 2020-06-20 01:23:19 +02:00
Chauntalle Schüle
b945f1e236 adding all Rules as Textures 2020-06-20 01:11:19 +02:00
Chauntalle Schüle
0985e02c3d Merge branch 'development' into 89-regelwerk 2020-06-19 13:46:36 +02:00
Chauntalle Schüle
e878016e4f - added new asset questionmark 
- added new Scene: RulesScene
- added button to menuScene to load RulesScene
- finished layout of RulesScene
- finished rules of Spielbeschreibung
 2020-06-19 02:15:51 +02:00
Marcel Schwarz
0b2b552d16 Merge branch '102-ueberarbeitung-slider' into 'development' 
Resolve "Ueberarbeitung Slider"

Closes #102

See merge request marcel.schwarz/software-projekt-2!128
 2020-06-18 21:10:50 +00:00
Marcel Schwarz
c8bdc40c12 Set gray overlay for done to invisible for better understanding 2020-06-18 23:07:24 +02:00