|
0a82dc362f
|
Hotfix Sign update Exception
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-03-01 13:35:10 +01:00 |
|
|
afb3b07b87
|
Hotfix async exception
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-27 19:10:34 +01:00 |
|
|
443ffb725d
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-21 06:36:45 +01:00 |
|
|
9885225466
|
Merge branch 'autoStart' of SteamWar/FightSystem into master
|
2020-02-11 17:43:15 +01:00 |
|
|
81fd8329fc
|
Merge branch '1.15' of SteamWar/FightSystem into master
|
2020-02-11 17:41:50 +01:00 |
|
|
b11fba3280
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 21:34:24 +01:00 |
|
|
dba3872a25
|
Autostarting fight with end of setup countdown (like in events)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 14:31:37 +01:00 |
|
|
c9c6529bdf
|
Give Ready-Button in Eventmode for faster startup
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 13:08:11 +01:00 |
|
|
684ed70219
|
Fixing Waterremover and deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 10:32:21 +01:00 |
|
|
01ec60c4e4
|
Hotfix event countdown naming
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-08 07:03:40 +01:00 |
|
|
4aee1f4c72
|
Preventing arrow pickups
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-01 14:28:46 +01:00 |
|
|
11251727bf
|
Dirty hotfix of Points NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-27 17:36:00 +01:00 |
|
|
67ad92bc90
|
Merge branch 'hide_sign_content' of SteamWar/FightSystem into master
|
2020-01-27 06:47:13 +01:00 |
|
|
61ff397458
|
Merge branch 'master' into personalKit
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
# FightSystem_Main/src/de/steamwar/fightsystem/commands/GUI.java
# FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
|
2020-01-27 06:31:41 +01:00 |
|
|
668f2c948f
|
Useless commit to test building
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-26 08:46:47 +01:00 |
|
|
0ebc7e5616
|
Fixing bugs occured with testing
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 19:57:21 +01:00 |
|
|
0c21251720
|
Loading personalKits to player
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 17:40:48 +01:00 |
|
|
e053ecf286
|
Adding fight statistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 17:33:29 +01:00 |
|
|
c5c6e8c32b
|
Implement personal kits (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 08:31:32 +01:00 |
|
|
2ac00294f9
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-21 17:49:04 +01:00 |
|
|
7fe4f09a08
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-20 18:48:40 +01:00 |
|
|
542547fd5b
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-20 18:46:52 +01:00 |
|
|
a4f8251680
|
Merge branch 'master' into hide_sign_content
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/TechHider.java
|
2020-01-20 17:51:58 +01:00 |
|
|
5a9e281c95
|
Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master
|
2020-01-20 17:47:42 +01:00 |
|
|
ad87077b15
|
Merge branch 'remove_pair' of SteamWar/FightSystem into master
|
2020-01-20 06:48:46 +01:00 |
|
|
3c4d5123da
|
Ignore Public Only rule (for historic gamemodes)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:32:29 +01:00 |
|
|
00967a2d3e
|
WIP Adding personal kits
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:25:11 +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 |
|
|
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 |
|
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 |
|
|
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 |
|
|
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 |
|