|
|
2413970b32
|
Merge pull request 'Neues Inventarhandling' (#301) from newInventory into master
SteamWarCI Build successful
Reviewed-on: #301
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-11-09 10:58:09 +01:00 |
|
|
|
2744eebb26
|
Remove fighter movement height restriction, adding block placement restriction
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-05 11:14:49 +01:00 |
|
|
|
cf666a4cb3
|
Prevent ConcurrentModificatonException
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-01 16:23:46 +01:00 |
|
|
|
c995e148b2
|
Close TinyProtocol on shutdown
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-11-01 08:26:20 +01:00 |
|
|
|
fe0d522c85
|
Fix checking
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
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
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
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
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
SteamWarCI Build successful
Reviewed-on: #299
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-29 11:58:54 +02:00 |
|
|
|
594816bb7d
|
Initialisation refactoring
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-28 22:07:43 +02:00 |
|
|
|
3922588096
|
Fix skip entern
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-28 22:04:55 +02:00 |
|
|
|
a9d4785a42
|
Use SpigotCore VersionDependent
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-28 22:02:26 +02:00 |
|
|
|
bb2ef0e06d
|
Refactoring percent winconditions + WhitelistWincondition
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-28 16:03:16 +02:00 |
|
|
|
4f2d1cb41d
|
Various quality of life improvements
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-26 07:20:44 +02:00 |
|
|
|
1e756abc18
|
Fix timing
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-24 16:01:25 +02:00 |
|
|
|
a5f06e6f7c
|
Fix countdown replay
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-24 15:53:57 +02:00 |
|
|
|
15e425ac65
|
Fix mapdisplay
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
SteamWarCI Build successful
|
2021-10-24 15:14:41 +02:00 |
|
|
|
9eefaf9e6b
|
Full multiling
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-24 15:04:12 +02:00 |
|
|
|
46a97e779c
|
More Multiling
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-23 08:43:58 +02:00 |
|
|
|
9cdeae4328
|
Hotfix paste aligned
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-13 09:01:19 +02:00 |
|
|
|
97c71ddbac
|
Hotfix paste aligned
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-13 08:58:43 +02:00 |
|
|
|
e2956123d9
|
Hotfix paste aligned
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-13 08:56:03 +02:00 |
|
|
|
fc4b2fa321
|
Hotfix paste aligned
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
# 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 |
|
|
|
34f75bfeb7
|
Fix 345° Bossbar
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-10 08:26:31 +02:00 |
|
|
|
d064cb8f8f
|
Waterremover adjustment for Underwater
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
SteamWarCI Build successful
Reviewed-on: #291
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2021-10-08 07:10:34 +02:00 |
|
|
|
a9766d0265
|
Fix start listening on Spectateserver
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-07 09:56:34 +02:00 |
|
|
|
6ee276ca82
|
WIP multiling part 2
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-07 09:54:53 +02:00 |
|
|
|
c00dd470f1
|
Move to FightInfoPacket
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-03 20:35:37 +02:00 |
|
|
|
1cc57539e4
|
WIP first half multiling
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-02 11:44:12 +02:00 |
|
|
|
c983b40d9f
|
Faster subtitles
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 17:36:54 +02:00 |
|
|
|
65e1315cca
|
Add TPS watcher, fix tie
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 14:51:00 +02:00 |
|
|
|
e8e6b5fcfd
|
New Fight UI
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-10-01 11:53:41 +02:00 |
|
|
|
da68b5672f
|
Current state, 1.8 support
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 17:32:32 +02:00 |
|
|
|
7551481881
|
Merge branch 'master' into newFightUI
|
2021-09-30 17:30:45 +02:00 |
|
|
|
431fd3697f
|
Fix chunkhider
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 13:20:40 +02:00 |
|
|
|
efc601e090
|
Fix rotational and additional issues
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-30 13:20:28 +02:00 |
|
|
|
a37ae72b6a
|
Merge branch 'tinyProtocol' into newFightUI
|
2021-09-30 12:34:26 +02:00 |
|
|
|
b68508eec8
|
Full TinyProtocol implementation (some tests on 1.15, further untested)
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-28 22:21:30 +02:00 |
|
|
|
b0cbf622df
|
Full TinyProtocol implementation (it initializes on 1.15, further untested)
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-28 18:25:45 +02:00 |
|
|
|
0e91cbdb06
|
Full TinyProtocol implementation (untested)
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-28 13:08:10 +02:00 |
|
|
|
bc82b18fc6
|
Fight + partial REntity -> TinyProtocol
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-27 21:14:34 +02:00 |
|
|
|
8ce5e7f7f8
|
Merge branch 'master' into tinyProtocol
|
2021-09-27 19:41:28 +02:00 |
|
|
|
6f79713f73
|
Merge branch 'master' into newFightUI
SteamWarCI Build successful
|
2021-09-27 17:02:14 +02:00 |
|
|
|
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 |
|
|
|
56096d5070
|
TinyProtocol Recording
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2021-09-18 14:30:32 +02:00 |
|
