SteamWar/FightSystem
Archiviert
13
1
Commit graph

1098 Commits

Autor SHA1 Nachricht Datum
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
da68b5672f Current state, 1.8 support
Alle Prüfungen waren erfolgreich
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
5abed0db7a Merge pull request 'TinyProtocol' (#290) from tinyProtocol into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #290
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-09-30 13:29:15 +02:00
431fd3697f Fix chunkhider
Alle Prüfungen waren erfolgreich
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
Alle Prüfungen waren erfolgreich
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
a17e522075 Remove todo
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-29 08:31:02 +02:00
31a04e8323 Full TinyProtocol implementation (some tests on 1.8 & 1.15)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-29 08:10:20 +02:00
b68508eec8 Full TinyProtocol implementation (some tests on 1.15, further untested)
Alle Prüfungen waren erfolgreich
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)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-28 18:25:45 +02:00
0e91cbdb06 Full TinyProtocol implementation (untested)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-28 13:08:10 +02:00
bc82b18fc6 Fight + partial REntity -> TinyProtocol
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
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
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2021-09-27 17:02:14 +02:00
9c2a854a14 SteamWarCI
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-27 17:01:18 +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
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-18 14:30:32 +02:00
194adf8970 Fix laggy schemselect
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-16 17:58:31 +02:00
a4148c8e6d TinyProtocol TechHider
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-13 21:38:26 +02:00
05d121fe63 Fix rotation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-11 22:27:28 +02:00
79658bf3aa Real spectator mode in own teamarea
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-11 18:31:58 +02:00
e01828a731 Merge branch 'master' into newFightUI 2021-09-11 18:26:17 +02:00
fd9628e5de Merge pull request 'WorldReset 1.8' (#287) from worldReset1.8 into master
Reviewed-on: #287
2021-09-11 17:59:08 +02:00
9c3c5f3400 Merge pull request 'Schematic pasting refactoring' (#286) from weRefactoring into master
Reviewed-on: #286
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2021-09-11 17:57:22 +02:00
d3cff066f5 Correct rotating?
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-04 23:09:50 +02:00
fe90f31c4a Possible 1.8 world reset fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-03 17:32:49 +02:00
5264bb0256 WIP new fight ui
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-03 17:32:00 +02:00
fe19c1656d TODO: Test if offsets vanished
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-03 17:30:18 +02:00
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
5826f7e8b1 Fix dimensions
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-01 17:27:00 +02:00
453dea774e Unify WE offset calculation
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-09-01 16:50:41 +02:00
eae23123c8 Worldedit refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
2021-08-31 17:01:45 +02:00