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

390 Commits

Autor SHA1 Nachricht Datum
Lixfel
d9d154f4eb Fix piston boundary
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-21 21:08:11 +01:00
Lixfel
f0a9c5c314 Configuration
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-19 16:58:52 +01:00
zOnlyKroks
9beb9f5aad Little Typo
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-12-19 14:47:17 +01:00
zOnlyKroks
0c6cfba029 Anti Ice and Snow Melt
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-12-19 14:45:19 +01:00
yoyosource
d544ecbcf5 Fix EnterHandler
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-12-18 17:26:24 +01:00
Lixfel
766d539728 Fix defaults
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-04 20:35:09 +01:00
Chaoscaot
1125788433 Merge remote-tracking branch 'origin/fightnodes' into fightnodes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-12-03 14:15:47 +01:00
Chaoscaot
796c58a3d2 Fix Inventory Location 2021-12-03 14:15:33 +01:00
Chaoscaot
d7a48a56ba Merge branch 'master' into fightnodes
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details
2021-12-03 14:11:47 +01:00
Lixfel
b17fc09d87 Fix typeconfig
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-12-02 14:30:08 +01:00
Lixfel
641f99ff2f Merge pull request 'Single file gamemode, arena, schematic config' (#304) from configRefactoring into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #304
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-12-02 14:26:19 +01:00
Lixfel
fd74b8fe59 Current default config
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-28 16:38:36 +01:00
Chaoscaot
a8a15c6828 Update from Depricated Methods
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details
2021-11-27 10:19:52 +01:00
Chaoscaot
ab7602879c Yeeeeeeeeeeeeeeeeeet
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details
2021-11-21 10:58:47 +01:00
Chaoscaot
85d8675b4c Changing to SchematicNodes (Requires SchematicSystem)
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details
2021-11-21 10:37:44 +01:00
Lixfel
cf9ebcd093 Update config
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-12 17:15:29 +01:00
Lixfel
faab60aad2 Fix PersonalKitCreator
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-11 06:58:36 +01:00
Lixfel
3b5a282789 Improve behaviour during check session
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-10 20:01:21 +01:00
Lixfel
c44bda9266 Hotfix spectator above team area
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-10 13:32:10 +01:00
Lixfel
cc22902ff5 Hotfix Kampfleiterentscheidung
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-10 13:26:50 +01:00
Lixfel
84c0e72713 Hotfix Bar header
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-10 13:17:32 +01:00
Lixfel
cdbde09d2e WIP new config 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-10 13:16:10 +01:00
Lixfel
95a7b4fd39 Hotfix inventory
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-09 11:05:32 +01:00
Lixfel
2413970b32 Merge pull request 'Neues Inventarhandling' (#301) from newInventory into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #301
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-11-09 10:58:09 +01:00
Lixfel
673658fab0 WIP config refactoring #2 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-09 10:28:07 +01:00
Lixfel
2744eebb26 Remove fighter movement height restriction, adding block placement restriction
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-05 11:14:49 +01:00
Lixfel
e79bce8d6d Refactoring config to enable defaulting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-05 11:07:16 +01:00
Lixfel
cf666a4cb3 Prevent ConcurrentModificatonException
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-01 16:23:46 +01:00
Lixfel
c995e148b2 Close TinyProtocol on shutdown
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-11-01 08:26:20 +01:00
Lixfel
fe0d522c85 Fix checking
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-30 14:53:46 +02:00
Lixfel
6400c960a9 Only allow TNT transfers to inventories
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-30 14:32:02 +02:00
Lixfel
1483bba0ff Show deprecation and use new apis
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-30 14:31:32 +02:00
Lixfel
3bc87bf555 Merge pull request 'Use SpigotCore VersionDependent' (#297) from useSpigotVersion into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #297
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-29 11:59:26 +02:00
Lixfel
5d504741ae Merge pull request 'Refactoring percent winconditions + WhitelistWincondition' (#296) from percentRefactor into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #296
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-29 11:59:15 +02:00
Lixfel
ead43fdbea Merge pull request 'Initialisation refactoring' (#299) from initRefactor into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #299
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-29 11:58:54 +02:00
Lixfel
594816bb7d Initialisation refactoring
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-28 22:07:43 +02:00
Lixfel
3922588096 Fix skip entern
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-28 22:04:55 +02:00
Lixfel
a9d4785a42 Use SpigotCore VersionDependent
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-28 22:02:26 +02:00
Lixfel
bb2ef0e06d Refactoring percent winconditions + WhitelistWincondition
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-28 16:03:16 +02:00
Lixfel
4f2d1cb41d Various quality of life improvements
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-26 07:20:44 +02:00
Lixfel
1e756abc18 Fix timing
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 16:01:25 +02:00
Lixfel
a5f06e6f7c Fix countdown replay
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 15:53:57 +02:00
Lixfel
15e425ac65 Fix mapdisplay
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 15:51:15 +02:00
Lixfel
d4590b5ca8 Merge branch 'master' into multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-10-24 15:14:41 +02:00
Lixfel
9eefaf9e6b Full multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-24 15:04:12 +02:00
Lixfel
46a97e779c More Multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-23 08:43:58 +02:00
Lixfel
9cdeae4328 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-13 09:01:19 +02:00
Lixfel
97c71ddbac Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-13 08:58:43 +02:00
Lixfel
e2956123d9 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-13 08:56:03 +02:00
Lixfel
fc4b2fa321 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-13 08:52:45 +02:00
Lixfel
4bf27107c6 WIP multiling 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-13 08:50:49 +02:00
Lixfel
4fc9a6cd8e Merge branch 'master' into multiling
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details 
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java
#	FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
 2021-10-10 14:40:50 +02:00
Lixfel
34f75bfeb7 Fix 345° Bossbar
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-10 08:26:31 +02:00
Lixfel
d064cb8f8f Waterremover adjustment for Underwater
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-08 07:48:56 +02:00
Lixfel
3208ee9ab9 Merge pull request 'Move to FightInfoPacket' (#291) from fightInfo into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #291
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-08 07:10:34 +02:00
Lixfel
a9766d0265 Fix start listening on Spectateserver
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-07 09:56:34 +02:00
Lixfel
6ee276ca82 WIP multiling part 2
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-07 09:54:53 +02:00
Lixfel
c00dd470f1 Move to FightInfoPacket
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-03 20:35:37 +02:00
Lixfel
1cc57539e4 WIP first half multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-02 11:44:12 +02:00
Lixfel
c983b40d9f Faster subtitles
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 17:36:54 +02:00
Lixfel
65e1315cca Add TPS watcher, fix tie
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 14:51:00 +02:00
Lixfel
e8e6b5fcfd New Fight UI
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-01 11:53:41 +02:00
Lixfel
da68b5672f Current state, 1.8 support
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 17:32:32 +02:00
Lixfel
7551481881 Merge branch 'master' into newFightUI 2021-09-30 17:30:45 +02:00
Lixfel
431fd3697f Fix chunkhider
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 13:20:40 +02:00
Lixfel
efc601e090 Fix rotational and additional issues
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-30 13:20:28 +02:00
Lixfel
a37ae72b6a Merge branch 'tinyProtocol' into newFightUI 2021-09-30 12:34:26 +02:00
Lixfel
b68508eec8 Full TinyProtocol implementation (some tests on 1.15, further untested)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-28 22:21:30 +02:00
Lixfel
b0cbf622df Full TinyProtocol implementation (it initializes on 1.15, further untested)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-28 18:25:45 +02:00
Lixfel
0e91cbdb06 Full TinyProtocol implementation (untested)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-28 13:08:10 +02:00
Lixfel
bc82b18fc6 Fight + partial REntity -> TinyProtocol
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-27 21:14:34 +02:00
Lixfel
8ce5e7f7f8 Merge branch 'master' into tinyProtocol 2021-09-27 19:41:28 +02:00
Lixfel
6f79713f73 Merge branch 'master' into newFightUI
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details
2021-09-27 17:02:14 +02:00
Lixfel
84ebd02311 Merge pull request 'Real spectator mode in own teamarea' (#289) from realGM3 into master 
Reviewed-on: #289
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-09-27 08:01:55 +02:00
Lixfel
56096d5070 TinyProtocol Recording
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-18 14:30:32 +02:00
Lixfel
194adf8970 Fix laggy schemselect 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-16 17:58:31 +02:00
Lixfel
a4148c8e6d TinyProtocol TechHider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-13 21:38:26 +02:00
Lixfel
05d121fe63 Fix rotation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-11 22:27:28 +02:00
Lixfel
79658bf3aa Real spectator mode in own teamarea 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-11 18:31:58 +02:00
Lixfel
e01828a731 Merge branch 'master' into newFightUI 2021-09-11 18:26:17 +02:00
Lixfel
d3cff066f5 Correct rotating? 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-04 23:09:50 +02:00
Lixfel
5264bb0256 WIP new fight ui 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-03 17:32:00 +02:00
Lixfel
0556b9de9a Fix one off offsets with doubles + aligned pasting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-02 11:23:10 +02:00
Lixfel
5826f7e8b1 Fix dimensions 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-01 17:27:00 +02:00
Lixfel
453dea774e Unify WE offset calculation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-01 16:50:41 +02:00
Lixfel
eae23123c8 Worldedit refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 17:01:45 +02:00
Lixfel
1c428cdacc Remove ITechHider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 12:12:54 +02:00
Lixfel
f61c6cbf6d Full 1.8 compilation support 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 12:09:34 +02:00
Lixfel
765a9e4f6c Reduce overhead and add a World of Colors! 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 11:19:56 +02:00
Lixfel
96bd358d29 New VersionDependent system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-08-31 10:42:42 +02:00