SteamWar/FightSystem
Archiviert
13
1
Commit graph

470 Commits

Autor SHA1 Nachricht Datum
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
72096710b3 WIP Splitting Setup and refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-11 12:53:31 +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
97c9022d75 Fixing freeze world
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-10 20:30:31 +01:00
d8f9c7a00c Freeze World during pasting
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-07 19:27:35 +01:00
e352862c5e Fixing missing time information
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-01-05 14:31:59 +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
d555589615 Adding pumpkin tech ko
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-28 11:22:18 +01:00
f9485da0e3 Adding new HeartRatioTimeoutWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-28 11:20:01 +01:00
00f22fe513 Adding 1.15 support
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-27 12:02:27 +01:00
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
6582b9a5c4 Adding SWSound for better Sound handling
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-27 10:09:03 +01:00
156df367f2 Fixing wincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-23 22:46:36 +01:00
afab77418f Fixing some issues regarding PointSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-22 21:58:18 +01:00
ad2e8d9e92 Merge branch 'newWinconditions' of SteamWar/FightSystem into master 2019-12-22 18:18:49 +01:00
9a4a36aeb9 Refactoring error (useless commit for starting dev server)
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-22 16:56:18 +01:00
9b1622c1e4 Adding missing if condition to effects
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-22 16:52:06 +01:00
be6693e85a Refactoring of KitSystem and adding of potion effects
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-22 16:38:51 +01:00
dbae65bf82 Finishing SG.eu Points Wincondition implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2019-12-22 15:20:50 +01:00
09acb366d3 WIP Wincondition points & Wincondition relative 2019-12-21 20:46:31 +01:00
c534a6b27b Fixing 1.14 sound 2019-12-11 18:37:41 +01:00
3bfd13a36e Renaming finalName for continouus deployment 2019-12-10 18:11:34 +01:00
dfa0e846e9 Merge branch '1_14-support'
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
2019-12-09 20:52:18 +01:00
a1ae843cb9 Merge branch '1_14-support' of steamwar.de:SteamWar/FightSystem into 1_14-support 2019-12-09 20:47:35 +01:00
BuildTools
ef78fd7280 code cleanup 2019-12-09 20:40:07 +01:00
BuildTools
0fc5730cf5 code cleanup; performance update 2019-12-09 20:37:18 +01:00
2ed8959f5d Merge branch '1_14-support' 2019-12-09 12:01:42 +01:00
09f7711fe2 Schematic Rework 2019-12-09 12:01:33 +01:00
BuildTools
efc7af3e55 hotfix 2019-12-06 22:52:03 +01:00
BuildTools
882336d910 added block-replacer as option 2019-12-06 22:51:26 +01:00
691f3d8cfa Full 1.14 untested support (with techhider) 2019-11-25 17:53:23 +01:00
b8445cd58a Merge branch 'sperren' of SteamWar/FightSystem into master 2019-11-25 17:51:50 +01:00
feb7939ee7 code cleanup 2019-11-23 22:08:04 +01:00
284542e23d hotfix 2019-11-23 20:55:28 +01:00
c6459884a0 code cleanup; bugfix 2019-11-23 20:50:21 +01:00
95e901115a Full untested 1.14 without 1.14 Techhider 2019-11-23 18:15:45 +01:00
39e4ab421e Maven refactoring 2019-11-23 16:42:49 +01:00
ab9e32a7ca Starting 1.14 support 2019-11-23 16:42:49 +01:00
c6efe8a5f4 code cleanup 2019-11-21 19:40:59 +01:00
1b8682807f Using Chat-ChatMessageType for chat messages 2019-11-21 17:58:29 +01:00
20d228567e Improve Countdown contrast 2019-11-21 17:56:11 +01:00
cc18882a52 hotfix 2019-11-21 16:23:02 +01:00
f0797c041d added new comment to lock schematic 2019-11-21 16:20:57 +01:00
2a6f28b935 implemented schematic locking 2019-11-21 16:09:58 +01:00
37f2de6f64 Countdown to Actionbar 2019-11-21 10:50:45 +01:00
7f8f1490ab HotbarGUI hotfix 2019-11-16 15:01:27 +01:00
595e7a0ea4 Refactoring for Multiversion-API 2019-11-16 08:37:33 +01:00
065dc58f98 FAWE free 1.8, Kit fixes 2019-11-15 08:22:16 +01:00
d1d0d4ee36 Disable Techhider on Version != 1.12 2019-11-11 19:04:23 +01:00
038d08a7aa Fixing 1.8 inventory bug 2019-11-11 00:15:22 +01:00
cc42c86549 Adding 1.8 Version Support 2019-11-10 22:34:22 +01:00