SteamWar/FightSystem
Archiviert
13
1

Splitting Setup #94

Zusammengeführt
Lixfel hat 11 Commits von setupSplitting nach master 2020-01-12 16:57:30 +01:00 zusammengeführt

11 Commits

Autor SHA1 Nachricht Datum
4362599f4d Bowfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-12 13:29:08 +01:00
f72869c43d Reworking default config
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-12 13:01:07 +01:00
b9bf52cc5f Merge branch 'master' into setupSplitting
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/listener/NormalJoinListener.java
2020-01-12 12:52:20 +01:00
3fd6bac585 Setting mainCountdown when entern
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 17:23:01 +01:00
7d4c397809 Fixing possible double cancelling issue
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 15:58:02 +01:00
5e85488d80 Adding PreSchemPaste countdown
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 15:56:31 +01:00
9f4769594e Merge branch 'master' into setupSplitting 2020-01-11 15:46:57 +01:00
049c51f2a9 Finishing setup split (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 15:45:01 +01:00
126a9b3ab4 Hotfix kit preview color
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 15:45:00 +01:00
af5b7d5240 Adding a kit preview during kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 15:45:00 +01:00
72096710b3 WIP Splitting Setup and refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 12:53:31 +01:00