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

1360 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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
221f5930c9 Merge pull request 'Various quality of life improvements' (#295) from qol into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #295
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-26 10:38:30 +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
436a1949e4 Merge pull request 'Multiling (nur Multling)' (#294) from multiling into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #294
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-24 19:38:30 +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
45c7e11087 Merge pull request 'Fix prepared schematics one too big' (#293) from fixExtendTooBig into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #293
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2021-10-10 14:34:14 +02:00
Lixfel
681df203da Fix prepared schematics one too big
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-10-10 14:31:43 +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
c4d36e9be8 Merge pull request 'Fix start listening on Spectateserver' (#292) from fix_replayserver into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #292
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-07 10:25:38 +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
c3aca89836 Merge pull request 'New Fight UI' (#288) from newFightUI into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #288
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-10-01 17:25:55 +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
5abed0db7a Merge pull request 'TinyProtocol' (#290) from tinyProtocol into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Reviewed-on: #290
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2021-09-30 13:29:15 +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
a17e522075 Remove todo
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-29 08:31:02 +02:00
Lixfel
31a04e8323 Full TinyProtocol implementation (some tests on 1.8 & 1.15)
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Details 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-29 08:10:20 +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
9c2a854a14 SteamWarCI 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2021-09-27 17:01:18 +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