1266 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	5d504741ae	Merge pull request 'Refactoring percent winconditions + WhitelistWincondition' (#296) from percentRefactor into master ... 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 ... Reviewed-on: #299 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-29 11:58:54 +02:00
Lixfel	270f850cf1	Merge pull request 'Fix skip entern' (#298) from fixSkip into master ... Reviewed-on: #298 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-29 11:58:39 +02:00
Lixfel	594816bb7d	Initialisation refactoring ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-28 22:07:43 +02:00
Lixfel	3922588096	Fix skip entern ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-28 22:04:55 +02:00
Lixfel	a9d4785a42	Use SpigotCore VersionDependent ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-28 22:02:26 +02:00
Lixfel	bb2ef0e06d	Refactoring percent winconditions + WhitelistWincondition ... 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 ... Reviewed-on: #295 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-26 10:38:30 +02:00
Lixfel	4f2d1cb41d	Various quality of life improvements ... 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 ... Reviewed-on: #294 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-24 19:38:30 +02:00
Lixfel	1e756abc18	Fix timing ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-24 16:01:25 +02:00
Lixfel	a5f06e6f7c	Fix countdown replay ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-24 15:53:57 +02:00
Lixfel	15e425ac65	Fix mapdisplay ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-24 15:51:15 +02:00
Lixfel	d4590b5ca8	Merge branch 'master' into multiling	2021-10-24 15:14:41 +02:00
Lixfel	9eefaf9e6b	Full multiling ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-24 15:04:12 +02:00
Lixfel	46a97e779c	More Multiling ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-23 08:43:58 +02:00
Lixfel	9cdeae4328	Hotfix paste aligned ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-13 09:01:19 +02:00
Lixfel	97c71ddbac	Hotfix paste aligned ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-13 08:58:43 +02:00
Lixfel	e2956123d9	Hotfix paste aligned ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-13 08:56:03 +02:00
Lixfel	fc4b2fa321	Hotfix paste aligned ... 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 ... # 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 ... 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 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-10 14:31:43 +02:00
Lixfel	34f75bfeb7	Fix 345° Bossbar ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-10 08:26:31 +02:00
Lixfel	d064cb8f8f	Waterremover adjustment for Underwater ... 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 ... 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 ... Reviewed-on: #292 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-07 10:25:38 +02:00
Lixfel	a9766d0265	Fix start listening on Spectateserver ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-07 09:56:34 +02:00
Lixfel	6ee276ca82	WIP multiling part 2 ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-07 09:54:53 +02:00
Lixfel	c00dd470f1	Move to FightInfoPacket ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-03 20:35:37 +02:00
Lixfel	1cc57539e4	WIP first half multiling ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-02 11:44:12 +02:00
Lixfel	c983b40d9f	Faster subtitles ... 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 ... Reviewed-on: #288 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-10-01 17:25:55 +02:00
Lixfel	65e1315cca	Add TPS watcher, fix tie ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-01 14:51:00 +02:00
Lixfel	e8e6b5fcfd	New Fight UI ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-10-01 11:53:41 +02:00
Lixfel	da68b5672f	Current state, 1.8 support ... 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 ... Reviewed-on: #290 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2021-09-30 13:29:15 +02:00
Lixfel	431fd3697f	Fix chunkhider ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-09-30 13:20:40 +02:00
Lixfel	efc601e090	Fix rotational and additional issues ... 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 ... 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) ... 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) ... 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) ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-09-28 18:25:45 +02:00
Lixfel	0e91cbdb06	Full TinyProtocol implementation (untested) ... Signed-off-by: Lixfel <agga-games@gmx.de>	2021-09-28 13:08:10 +02:00
Lixfel	bc82b18fc6	Fight + partial REntity -> TinyProtocol ... 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	2021-09-27 17:02:14 +02:00