SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität
1.321 Commits 8 Branches 0 Tags 7,6 MiB
90d8492d9a
Commit graph

1321 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
f72869c43d Reworking default config 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 13:01:07 +01:00
Lixfel
b9bf52cc5f Merge branch 'master' into setupSplitting 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/listener/NormalJoinListener.java
 2020-01-12 12:52:20 +01:00
Lixfel
21c0d95927 Hotfix team join order 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 12:20:47 +01:00
Lixfel
3fd6bac585 Setting mainCountdown when entern 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 17:23:01 +01:00
Lixfel
7d4c397809 Fixing possible double cancelling issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 15:58:02 +01:00
Lixfel
5e85488d80 Adding PreSchemPaste countdown 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 15:56:31 +01:00
Lixfel
9f4769594e Merge branch 'master' into setupSplitting 2020-01-11 15:46:57 +01:00
Lixfel
049c51f2a9 Finishing setup split (untested) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 15:45:01 +01:00
Lixfel
126a9b3ab4 Hotfix kit preview color 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 15:45:00 +01:00
Lixfel
af5b7d5240 Adding a kit preview during kit selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 15:45:00 +01:00
Lixfel
bafe06723a Hotfix kit preview color 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 12:54:37 +01:00
Lixfel
72096710b3 WIP Splitting Setup and refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-11 12:53:31 +01:00
Lixfel
647f9d3bb5 Merge branch 'kitPreview' of SteamWar/FightSystem into master 2020-01-11 12:50:40 +01:00
Lixfel
5734ada17b Adding a kit preview during kit selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-10 22:38:14 +01:00
Lixfel
37955438ba Merge branch 'ReplaceCarpetWithTeamcolor' of SteamWar/FightSystem into master 2020-01-10 21:35:44 +01:00
Jan9103
860a91ba1f Iml Dateien löschen (2) 2020-01-10 21:32:38 +01:00
Jan9103
843ba2ecae iml löschen (1) 2020-01-10 21:32:15 +01:00
Lixfel
97c9022d75 Fixing freeze world 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-10 20:30:31 +01:00
Lixfel
9b2efa029b Merge branch 'techhiderConfigReworkFor1.14/1.15' of SteamWar/FightSystem into master 2020-01-09 17:31:49 +01:00
BuildTools
c03d4709fc Pinker Teppich im Fightsystem zu Teamfarbe replacen hinzugefügt (1.8 + 1.14) 2020-01-08 20:05:54 +01:00
Lixfel
c5e35e9580 Merge branch 'freezeWorld' of SteamWar/FightSystem into master 2020-01-07 20:30:01 +01:00
Lixfel
d8f9c7a00c Freeze World during pasting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-07 19:27:35 +01:00
BuildTools
88f9f8608a Pinker Teppich im Fightsystem zu Teamfarbe replacen hinzugefügt (1.8 + 1.14) 2020-01-06 21:14:51 +01:00
Lixfel
45abf6a5c0 Reworking Techhider HiddenBlock configuration for usage in 1.14 and 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-06 20:37:41 +01:00
Lixfel
e352862c5e Fixing missing time information 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-05 14:31:59 +01:00
Lixfel
318a88bd51 Fixing NBTTagList #2 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-01 20:46:58 +01:00
Lixfel
0de2dd0d41 Fixing NBTTagList 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-01 20:46:58 +01:00
Lixfel
ebefab135a Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master 2020-01-01 19:51:16 +01:00
Lixfel
8a0141c709 Fixing NBTTagList 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-01 19:39:41 +01:00
Lixfel
995ef3472c Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master 2020-01-01 18:28:42 +01:00
Lixfel
d45f0892a7 TechHider 1.14+ actualisation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-31 17:04:00 +01:00
Lixfel
0797c44984 Fixing flushQueue/flushSession discrepance 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-31 16:47:34 +01:00
Lixfel
93da83cec7 Fixing Colorsetting for 1.14+ 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-31 16:39:43 +01:00
Lixfel
9a248969d4 Merge branch 'winconditionPumpkinTechKO' of SteamWar/FightSystem into master 2019-12-28 11:23:52 +01:00
Lixfel
f40dad05e3 Merge remote-tracking branch 'origin/winconditionPumpkinTechKO' into winconditionPumpkinTechKO 2019-12-28 11:22:39 +01:00
Lixfel
d555589615 Adding pumpkin tech ko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-28 11:22:18 +01:00
Lixfel
4e328c8cc1 Merge branch 'winconditionHeartRatioTimeout' of SteamWar/FightSystem into master 2019-12-28 11:21:28 +01:00
Lixfel
30d54d7d88 Merge remote-tracking branch 'origin/winconditionHeartRatioTimeout' into winconditionHeartRatioTimeout 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
 2019-12-28 11:21:02 +01:00
Lixfel
f9485da0e3 Adding new HeartRatioTimeoutWincondition 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-28 11:20:01 +01:00
Lixfel
b8d1893f0f Merge branch 'newVersions' of SteamWar/FightSystem into master 2019-12-28 11:09:42 +01:00
Lixfel
5bfee9f3d9 Adding pumpkin tech ko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-27 12:32:15 +01:00
Lixfel
00f22fe513 Adding 1.15 support 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-27 12:02:27 +01:00
Lixfel
27808e35e0 Refactoring 1.14 support to vanilla WorldEdit compatibility 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-27 11:06:09 +01:00
Lixfel
692cd609bc Adding 1.9 and 1.10 support, also refactoring Multiversion Support to current norm 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-27 11:05:12 +01:00
Lixfel
6582b9a5c4 Adding SWSound for better Sound handling 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-27 10:09:03 +01:00
Lixfel
80005a73b6 Adding new HeartRatioTimeoutWincondition 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-24 14:38:42 +01:00
Lixfel
9901c4edb8 Merge branch 'RelativePercentFix' of SteamWar/FightSystem into master 2019-12-24 12:52:01 +01:00
Lixfel
156df367f2 Fixing wincondition 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-23 22:46:36 +01:00
Lixfel
afab77418f Fixing some issues regarding PointSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-22 21:58:18 +01:00
Lixfel
ad2e8d9e92 Merge branch 'newWinconditions' of SteamWar/FightSystem into master 2019-12-22 18:18:49 +01:00