|
d02ede97e0
|
Merge branch 'fixTestarenaEventarenaExceptions' of SteamWar/FightSystem into master
|
2020-01-19 17:19:07 +01:00 |
|
|
03e5cf62a2
|
Removing pair from fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:38:54 +01:00 |
|
|
8353139d2c
|
Fixing exceptions occuring in test and event arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:23:02 +01:00 |
|
|
e6194a7a67
|
Adding only public schems to techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:13:10 +01:00 |
|
|
7c57b6251c
|
Hide sign contents with packet filter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:12:22 +01:00 |
|
|
11da798b4e
|
Merge branch 'schematiclessPublicOnly' of SteamWar/FightSystem into master
|
2020-01-18 14:43:37 +01:00 |
|
|
1dd3b79ee9
|
Allowing only public schematics if one leader has no private
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-18 08:31:13 +01:00 |
|
|
45305ee3cc
|
Merge branch 'player_hider' of SteamWar/FightSystem into master
|
2020-01-16 17:04:41 +01:00 |
|
Yaruma3341
|
23a8f9ba84
|
code cleanup; semi version independent
|
2020-01-15 18:44:34 +01:00 |
|
Yaruma3341
|
c463823c05
|
implemented version independence
|
2020-01-14 22:16:12 +01:00 |
|
Yaruma3341
|
eabd9ab50b
|
added spec hider
|
2020-01-13 21:37:36 +01:00 |
|
|
320083fb08
|
Hotfix 1.8
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-13 17:49:59 +01:00 |
|
|
ac2f012ab9
|
Hotfix spawning gamemode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:19:49 +01:00 |
|
|
36925fad13
|
Hotfix choose schematic in testmode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:15:01 +01:00 |
|
|
33b9f03926
|
Hotfix is setup phase check
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:05:41 +01:00 |
|
|
713044064c
|
Merge branch 'setupSplitting' of SteamWar/FightSystem into master
|
2020-01-12 16:57:24 +01:00 |
|
|
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 |
|
|
21c0d95927
|
Hotfix team join order
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 12:20:47 +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 |
|
|
bafe06723a
|
Hotfix kit preview color
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 12:54:37 +01:00 |
|
|
72096710b3
|
WIP Splitting Setup and refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 12:53:31 +01:00 |
|
|
647f9d3bb5
|
Merge branch 'kitPreview' of SteamWar/FightSystem into master
|
2020-01-11 12:50:40 +01:00 |
|
|
5734ada17b
|
Adding a kit preview during kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 22:38:14 +01:00 |
|
|
37955438ba
|
Merge branch 'ReplaceCarpetWithTeamcolor' of SteamWar/FightSystem into master
|
2020-01-10 21:35:44 +01:00 |
|
|
860a91ba1f
|
Iml Dateien löschen (2)
|
2020-01-10 21:32:38 +01:00 |
|
|
843ba2ecae
|
iml löschen (1)
|
2020-01-10 21:32:15 +01:00 |
|
|
97c9022d75
|
Fixing freeze world
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 20:30:31 +01:00 |
|
|
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 |
|
|
c5e35e9580
|
Merge branch 'freezeWorld' of SteamWar/FightSystem into master
|
2020-01-07 20:30:01 +01:00 |
|
|
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 |
|
|
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 |
|
|
e352862c5e
|
Fixing missing time information
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-05 14:31:59 +01:00 |
|
|
318a88bd51
|
Fixing NBTTagList #2
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 20:46:58 +01:00 |
|
|
0de2dd0d41
|
Fixing NBTTagList
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 20:46:58 +01:00 |
|
|
ebefab135a
|
Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master
|
2020-01-01 19:51:16 +01:00 |
|
|
8a0141c709
|
Fixing NBTTagList
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-01 19:39:41 +01:00 |
|
|
995ef3472c
|
Merge branch 'techhider1.14+compatibility' of SteamWar/FightSystem into master
|
2020-01-01 18:28:42 +01:00 |
|
|
d45f0892a7
|
TechHider 1.14+ actualisation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 17:04:00 +01:00 |
|
|
0797c44984
|
Fixing flushQueue/flushSession discrepance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:47:34 +01:00 |
|
|
93da83cec7
|
Fixing Colorsetting for 1.14+
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:39:43 +01:00 |
|