1191 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	1890471609	Fix Items bugs ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-28 12:55:00 +01:00
Lixfel	1ba94af239	Merge branch 'master' into items	2023-02-24 14:18:30 +01:00
Lixfel	4252339d0b	Hotfix FightSystem ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-24 10:48:18 +01:00
Lixfel	19e8a7994a	Merge pull request 'Change extend area downwards' (#382) from piston-extend-area into master ... Reviewed-on: #382 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-02-17 14:56:48 +01:00
Lixfel	00d7a9567a	Increase period ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-17 11:02:23 +01:00
Lixfel	617246a211	Remove TODO ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-17 10:57:47 +01:00
Lixfel	6ea17557ea	Change extend area downwards ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-17 10:56:46 +01:00
Lixfel	0d3a4f3894	Merge pull request 'Prevent schem selection DOS' (#381) from prevent-spam into master ... Reviewed-on: #381 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-02-17 10:29:56 +01:00
Lixfel	8ffa6296b1	Prevent schem selection DOS ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-17 10:24:58 +01:00
Lixfel	5b02e98c35	Debug HotbarKit ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-02-08 22:51:09 +01:00
Lixfel	fe915ba85d	Merge branch 'master' into items ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java	2023-01-23 16:28:32 +01:00
Lixfel	239c0bf5f6	Fix 1.8 to 1.12 dispenser ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-01-22 22:19:53 +01:00
Lixfel	20e6501f68	Merge pull request 'Anti water in Dispenser' (#374) from BucketsInDispenser into master ... Reviewed-on: #374 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-01-22 21:27:56 +01:00
MoBrot	b0c91b59fc	Anti water in Dispenser cleanup	2023-01-22 21:17:40 +01:00
MoBrot	914bf4f353	Anti water in Dispenser	2023-01-22 21:12:47 +01:00
Lixfel	eaf4305bd9	Merge pull request 'added arena afk stopper' (#372) from afk_stopper into master ... Reviewed-on: #372 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-01-22 21:08:53 +01:00
Lixfel	14753ebe99	Merge branch 'master' into items	2023-01-20 12:02:07 +01:00
BuildTools	09adc97a20	added arena afk stopper	2023-01-18 21:37:04 +01:00
Lixfel	7dec79e022	Merge pull request 'Make use of CoreEntity' (#371) from coreEntity into master ... Reviewed-on: #371 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-01-15 19:13:03 +01:00
Lixfel	00d743d63e	Fix unintentional debug code ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-01-15 19:06:39 +01:00
Lixfel	f1b6fc8db9	Adjust CI config for new CI ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-01-15 12:05:10 +01:00
Lixfel	890e9eaed0	Make use of CoreEntity ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-01-15 12:04:12 +01:00
Lixfel	5ec0fc20e6	Fix schemId 0 with autoselected schem ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-12-14 16:00:49 +01:00
Lixfel	6d574bd89d	Merge pull request 'Adapt to CommonDB' (#366) from commonDB into master ... Reviewed-on: #366 Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>	2022-10-29 12:44:19 +02:00
Lixfel	022264b1f5	Merge branch 'master' into commonDB ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java	2022-10-29 12:26:54 +02:00
Lixfel	f9984eb157	Merge remote-tracking branch 'origin/items' into items ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java # FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java	2022-10-24 10:43:37 +02:00
Lixfel	b909371fed	Reactivating items ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-10-24 10:42:35 +02:00
Lixfel	cc079c1476	Merge pull request 'Hotfix FightTeam' (#368) from AmongUS into master ... Reviewed-on: #368	2022-10-08 18:49:34 +02:00
yoyosource	5b05fb1914	Hotfix FightTeam	2022-10-08 18:46:28 +02:00
Lixfel	1786be83b9	Merge pull request 'AmongUS' (#367) from AmongUS into master ... Reviewed-on: #367 Reviewed-by: Lixfel <lixfel@steamwar.de>	2022-10-08 18:30:10 +02:00
yoyosource	9b4eaa7a57	Fix WinconditionAmongUs	2022-10-08 18:00:31 +02:00
yoyosource	80a98a998a	Update	2022-10-08 17:56:22 +02:00
yoyosource	d0a5e0c96f	Update messages	2022-10-08 17:52:40 +02:00
yoyosource	facee211dd	Update messages	2022-10-08 17:51:24 +02:00
yoyosource	67a0d0f5e9	Add messages	2022-10-08 17:28:39 +02:00
yoyosource	f1e9dda0fa	Update handleDeath method	2022-10-08 17:07:05 +02:00
yoyosource	b24e9a8b89	Add message	2022-10-08 17:00:44 +02:00
yoyosource	b750433f91	Add initial message	2022-10-08 16:56:02 +02:00
yoyosource	c4116cba97	Update InFightDamage ... Add WinconditionAmongUs	2022-10-08 16:47:32 +02:00
Lixfel	83eb9bfa13	Fix ClickAnalyzer ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-10-07 17:30:49 +02:00
Lixfel	9d4df5b715	Support new world height in replays ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-10-07 17:23:00 +02:00
Lixfel	4531816792	Fix SGEU replay ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-10-07 16:58:01 +02:00
Lixfel	6941cc98f0	Fix Replay entities ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-25 19:01:53 +02:00
Lixfel	097f23d59f	Adapt to CommonDB ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-09-24 20:24:41 +02:00
Lixfel	ea9c02e1f3	Hotfix check ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-31 18:23:26 +02:00
Lixfel	228fe18ac4	Fix test arena reset ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-30 16:05:22 +02:00
Lixfel	6c9fd65719	Fix burning prior out of game, fix no ready button in test mode ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-30 15:56:50 +02:00
Lixfel	148811b827	Fix PersonalKitCreator ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-30 15:46:23 +02:00
Lixfel	413b08bdac	Fix Kit/Schemchoose overlap ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-30 15:41:06 +02:00
Lixfel	94378770e3	Fix Cases ... Signed-off-by: Lixfel <agga-games@gmx.de>	2022-08-23 20:32:49 +02:00