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

290 Commits

Autor SHA1 Nachricht Datum
Lixfel
eb6f45a485 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:18:46 +02:00
Lixfel
d462d7d008 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:16:54 +02:00
Lixfel
77133bf72a Revert "Sync WaterTechKO-Detector?" 
This reverts commit ff965cca

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:22:53 +02:00
Lixfel
ff965cca75 Sync WaterTechKO-Detector? 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:21:50 +02:00
Lixfel
2ee2d74432 Hotfix watertechko + simplify and speedup 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:38:14 +02:00
Lixfel
aed86fc97b Some refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:19:57 +02:00
Lixfel
10c461f317 Merge pull request 'Add GamemodeCommand' (#162) from Gamemode into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
 2020-06-03 08:45:36 +02:00
jojo
4e8152d282 Add GamemodeCommand 2020-05-31 18:56:50 +02:00
Lixfel
c27f8bbd82 Merge pull request 'Rank-System für die neuen WS und WG' (#155) from ranks into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-31 17:15:34 +02:00
Lixfel
b5dcedb645 Hotfix inventory size failure 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-26 14:17:52 +02:00
Lixfel
858e1b52ca Hotfix backport. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-24 18:15:10 +02:00
Lixfel
7dc7fa1f41 Removing all crafting possibilitys 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 17:02:25 +02:00
jojo
f8a2585621 Add BlockBreakEvent Add item not in Inventory 2020-05-22 16:40:27 +02:00
jojo
ad077e8eb2 Add BlockBreakEvent Debug Messages 2020-05-22 16:18:40 +02:00
jojo
4e844070ca Add BlockBreakEvent 2020-05-22 14:38:32 +02:00
Lixfel
4d192ab35d Implementing Rank-System 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 10:09:34 +02:00
Lixfel
aed114cda2 Merge pull request 'Simplified 1.12-Techhider' (#150) from simplified-techhider12-nonViaCompatible into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-22 07:54:24 +02:00
Lixfel
c1bb646579 Merge branch 'master' into ranks 2020-05-22 07:03:59 +02:00
Lixfel
aeda617a55 Make it possible to walk on the floor in prefight stage 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-21 08:42:39 +02:00
Lixfel
c7a48f36f2 Simplified 1.12-Techhider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-19 09:42:49 +02:00
Lixfel
ab4852c717 Merge pull request 'Improving size of spectator space' (#148) from biggerSpectatorSpace into master 
Reviewed-by: Jan9103 <maxjanssen67@gmail.com>
 2020-05-19 08:45:59 +02:00
Lixfel
1608f895a8 Improving size of spectator space 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:59:35 +02:00
Lixfel
9f3e658636 First rank prototype 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:39:16 +02:00
Lixfel
13219dc352 Adding option for F3+N 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-11 13:25:45 +02:00
Lixfel
ac6b441815 Merge branch 'implementing-check-capability' 2020-05-10 19:18:30 +02:00
Lixfel
2c37646c79 Merge branch 'renameKitSelection' 2020-05-10 19:18:16 +02:00
Lixfel
100868b04d Hotfix percent stopping 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-03 15:42:53 +02:00
Lixfel
219d7acbe2 Preventing copying 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-01 11:05:31 +02:00
Lixfel
04b5fa34f8 Adapting permissions 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-30 16:10:20 +02:00
Lixfel
bf3baed537 Implementing check capability into TestArenas 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-30 16:09:24 +02:00
Lixfel
1367305e26 Force backport 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-28 09:54:10 +02:00
Lixfel
0f9480f69e Replace blocks without blockupdates 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-21 10:08:02 +02:00
Lixfel
8f7d3c74b7 Event hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-19 20:28:07 +02:00
Lixfel
1c72ac9251 Fix freezer to more seconds 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-17 14:49:50 +02:00
Lixfel
50a864de1e Rename Kit selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-15 17:10:41 +02:00
Lixfel
26d8fe4451 Merge branch 'master' into 1.15TechhiderFullChunk 2020-04-13 11:55:08 +02:00
Lixfel
043810bb14 Hotfix kit creation breakout bugs 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:26:36 +02:00
Lixfel
ff6182fad4 Techhider 2 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-11 12:06:01 +02:00
Lixfel
c7bc8163ed Merge branch 'kitreset' of SteamWar/FightSystem into master 2020-04-01 12:56:12 +02:00
Lixfel
01f9ffb6de Improve world freezing for MWG 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-01 12:30:36 +02:00
Lixfel
c3e1e93578 Resetting Kit creator with creative inventory clear, FightTeam nametag fix for 1.15 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-04-01 11:59:37 +02:00
Lixfel
6ea8001cf5 Hotfix #119 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-28 08:53:16 +01:00
Lixfel
0a82dc362f Hotfix Sign update Exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-03-01 13:35:10 +01:00
Lixfel
afb3b07b87 Hotfix async exception 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-27 19:10:34 +01:00
Lixfel
443ffb725d Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-21 06:36:45 +01:00
Lixfel
9885225466 Merge branch 'autoStart' of SteamWar/FightSystem into master 2020-02-11 17:43:15 +01:00
Lixfel
81fd8329fc Merge branch '1.15' of SteamWar/FightSystem into master 2020-02-11 17:41:50 +01:00
Lixfel
b11fba3280 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 21:34:24 +01:00
Lixfel
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
Lixfel
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
Lixfel
684ed70219 Fixing Waterremover and deadlock 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-10 10:32:21 +01:00
Lixfel
01ec60c4e4 Hotfix event countdown naming 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-08 07:03:40 +01:00
Lixfel
4aee1f4c72 Preventing arrow pickups 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-02-01 14:28:46 +01:00
Lixfel
11251727bf Dirty hotfix of Points NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-27 17:36:00 +01:00
Lixfel
67ad92bc90 Merge branch 'hide_sign_content' of SteamWar/FightSystem into master 2020-01-27 06:47:13 +01:00
Lixfel
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
Lixfel
668f2c948f Useless commit to test building 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-26 08:46:47 +01:00
Lixfel
0ebc7e5616 Fixing bugs occured with testing 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 19:57:21 +01:00
Lixfel
0c21251720 Loading personalKits to player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:40:48 +01:00
Lixfel
e053ecf286 Adding fight statistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 17:33:29 +01:00
Lixfel
c5c6e8c32b Implement personal kits (untested) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-23 08:31:32 +01:00
Lixfel
2ac00294f9 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-21 17:49:04 +01:00
Lixfel
7fe4f09a08 Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:48:40 +01:00
Lixfel
542547fd5b Hotfix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-20 18:46:52 +01:00
Lixfel
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
Lixfel
5a9e281c95 Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master 2020-01-20 17:47:42 +01:00
Lixfel
ad87077b15 Merge branch 'remove_pair' of SteamWar/FightSystem into master 2020-01-20 06:48:46 +01:00
Lixfel
3c4d5123da Ignore Public Only rule (for historic gamemodes) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:32:29 +01:00
Lixfel
00967a2d3e WIP Adding personal kits 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 17:25:11 +01:00
Lixfel
03e5cf62a2 Removing pair from fight system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 07:38:54 +01:00
Lixfel
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
Lixfel
e6194a7a67 Adding only public schems to techhider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 07:13:10 +01:00
Lixfel
7c57b6251c Hide sign contents with packet filter 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-19 07:12:22 +01:00
Lixfel
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
Lixfel
320083fb08 Hotfix 1.8 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-13 17:49:59 +01:00
Lixfel
ac2f012ab9 Hotfix spawning gamemode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 17:19:49 +01:00
Lixfel
36925fad13 Hotfix choose schematic in testmode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 17:15:01 +01:00
Lixfel
33b9f03926 Hotfix is setup phase check 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 17:05:41 +01:00
Lixfel
4362599f4d Bowfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-12 13:29:08 +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
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
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
97c9022d75 Fixing freeze world 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-10 20:30:31 +01:00
Lixfel
d8f9c7a00c Freeze World during pasting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-01-07 19:27:35 +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
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
d555589615 Adding pumpkin tech ko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-28 11:22:18 +01:00
Lixfel
f9485da0e3 Adding new HeartRatioTimeoutWincondition 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-28 11:20:01 +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
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
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
Lixfel
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
Lixfel
9b1622c1e4 Adding missing if condition to effects 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-22 16:52:06 +01:00
Lixfel
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
Lixfel
dbae65bf82 Finishing SG.eu Points Wincondition implementation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2019-12-22 15:20:50 +01:00
Lixfel
09acb366d3 WIP Wincondition points & Wincondition relative 2019-12-21 20:46:31 +01:00
Lixfel
c534a6b27b Fixing 1.14 sound 2019-12-11 18:37:41 +01:00
Lixfel
dfa0e846e9 Merge branch '1_14-support' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
 2019-12-09 20:52:18 +01:00
Lixfel
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
Lixfel
2ed8959f5d Merge branch '1_14-support' 2019-12-09 12:01:42 +01:00
Lixfel
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
Lixfel
691f3d8cfa Full 1.14 untested support (with techhider) 2019-11-25 17:53:23 +01:00
Lixfel
b8445cd58a Merge branch 'sperren' of SteamWar/FightSystem into master 2019-11-25 17:51:50 +01:00
Yaruma3341
feb7939ee7 code cleanup 2019-11-23 22:08:04 +01:00
Yaruma3341
284542e23d hotfix 2019-11-23 20:55:28 +01:00
Yaruma3341
c6459884a0 code cleanup; bugfix 2019-11-23 20:50:21 +01:00
Lixfel
95e901115a Full untested 1.14 without 1.14 Techhider 2019-11-23 18:15:45 +01:00
Lixfel
ab9e32a7ca Starting 1.14 support 2019-11-23 16:42:49 +01:00
Yaruma3341
c6efe8a5f4 code cleanup 2019-11-21 19:40:59 +01:00
Lixfel
1b8682807f Using Chat-ChatMessageType for chat messages 2019-11-21 17:58:29 +01:00
Lixfel
20d228567e Improve Countdown contrast 2019-11-21 17:56:11 +01:00
Yaruma3341
cc18882a52 hotfix 2019-11-21 16:23:02 +01:00
Yaruma3341
f0797c041d added new comment to lock schematic 2019-11-21 16:20:57 +01:00
Yaruma3341
2a6f28b935 implemented schematic locking 2019-11-21 16:09:58 +01:00
Lixfel
37f2de6f64 Countdown to Actionbar 2019-11-21 10:50:45 +01:00
Lixfel
7f8f1490ab HotbarGUI hotfix 2019-11-16 15:01:27 +01:00
Lixfel
595e7a0ea4 Refactoring for Multiversion-API 2019-11-16 08:37:33 +01:00
Lixfel
065dc58f98 FAWE free 1.8, Kit fixes 2019-11-15 08:22:16 +01:00
Lixfel
d1d0d4ee36 Disable Techhider on Version != 1.12 2019-11-11 19:04:23 +01:00
Lixfel
038d08a7aa Fixing 1.8 inventory bug 2019-11-11 00:15:22 +01:00
Lixfel
cc42c86549 Adding 1.8 Version Support 2019-11-10 22:34:22 +01:00