SteamWar/FightSystem
Archiviert
13
1
Commit graph

1030 Commits

Autor SHA1 Nachricht Datum
84c0e72713 Hotfix Bar header
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:17:32 +01:00
cdbde09d2e WIP new config
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-10 13:16:10 +01:00
95a7b4fd39 Hotfix inventory
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-09 11:05:32 +01:00
2413970b32 Merge pull request 'Neues Inventarhandling' (#301) from newInventory into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #301
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-11-09 10:58:09 +01:00
a6b0684351 Merge pull request 'Remove fighter movement height restriction, adding block placement restriction' (#302) from removeHeightRestriction into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #302
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-11-09 10:55:56 +01:00
673658fab0 WIP config refactoring #2
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-09 10:28:07 +01:00
2744eebb26 Remove fighter movement height restriction, adding block placement restriction
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-05 11:14:49 +01:00
e79bce8d6d Refactoring config to enable defaulting
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-05 11:07:16 +01:00
cf666a4cb3 Prevent ConcurrentModificatonException
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-01 16:23:46 +01:00
c995e148b2 Close TinyProtocol on shutdown
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-11-01 08:26:20 +01:00
fe0d522c85 Fix checking
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:53:46 +02:00
6400c960a9 Only allow TNT transfers to inventories
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:32:02 +02:00
1483bba0ff Show deprecation and use new apis
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-30 14:31:32 +02:00
3bc87bf555 Merge pull request 'Use SpigotCore VersionDependent' (#297) from useSpigotVersion into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #297
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:59:26 +02:00
5d504741ae Merge pull request 'Refactoring percent winconditions + WhitelistWincondition' (#296) from percentRefactor into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #296
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:59:15 +02:00
ead43fdbea Merge pull request 'Initialisation refactoring' (#299) from initRefactor into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #299
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:58:54 +02:00
270f850cf1 Merge pull request 'Fix skip entern' (#298) from fixSkip into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #298
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-29 11:58:39 +02:00
594816bb7d Initialisation refactoring
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:07:43 +02:00
3922588096 Fix skip entern
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:04:55 +02:00
a9d4785a42 Use SpigotCore VersionDependent
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 22:02:26 +02:00
bb2ef0e06d Refactoring percent winconditions + WhitelistWincondition
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-28 16:03:16 +02:00
221f5930c9 Merge pull request 'Various quality of life improvements' (#295) from qol into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #295
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-26 10:38:30 +02:00
4f2d1cb41d Various quality of life improvements
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-26 07:20:44 +02:00
436a1949e4 Merge pull request 'Multiling (nur Multling)' (#294) from multiling into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #294
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-24 19:38:30 +02:00
1e756abc18 Fix timing
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 16:01:25 +02:00
a5f06e6f7c Fix countdown replay
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:53:57 +02:00
15e425ac65 Fix mapdisplay
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:51:15 +02:00
d4590b5ca8 Merge branch 'master' into multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-10-24 15:14:41 +02:00
9eefaf9e6b Full multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-24 15:04:12 +02:00
46a97e779c More Multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-23 08:43:58 +02:00
9cdeae4328 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 09:01:19 +02:00
97c71ddbac Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:58:43 +02:00
e2956123d9 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:56:03 +02:00
fc4b2fa321 Hotfix paste aligned
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:52:45 +02:00
4bf27107c6 WIP multiling
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-13 08:50:49 +02:00
4fc9a6cd8e Merge branch 'master' into multiling
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
# 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
45c7e11087 Merge pull request 'Fix prepared schematics one too big' (#293) from fixExtendTooBig into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #293
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2021-10-10 14:34:14 +02:00
681df203da Fix prepared schematics one too big
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-10 14:31:43 +02:00
34f75bfeb7 Fix 345° Bossbar
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-10 08:26:31 +02:00
d064cb8f8f Waterremover adjustment for Underwater
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-08 07:48:56 +02:00
3208ee9ab9 Merge pull request 'Move to FightInfoPacket' (#291) from fightInfo into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #291
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-08 07:10:34 +02:00
c4d36e9be8 Merge pull request 'Fix start listening on Spectateserver' (#292) from fix_replayserver into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #292
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-07 10:25:38 +02:00
a9766d0265 Fix start listening on Spectateserver
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-07 09:56:34 +02:00
6ee276ca82 WIP multiling part 2
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-07 09:54:53 +02:00
c00dd470f1 Move to FightInfoPacket
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-03 20:35:37 +02:00
1cc57539e4 WIP first half multiling
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-02 11:44:12 +02:00
c983b40d9f Faster subtitles
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 17:36:54 +02:00
c3aca89836 Merge pull request 'New Fight UI' (#288) from newFightUI into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #288
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-10-01 17:25:55 +02:00
65e1315cca Add TPS watcher, fix tie
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 14:51:00 +02:00
e8e6b5fcfd New Fight UI
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-10-01 11:53:41 +02:00