1343 Commits

Dieser Branch

Dieser Branch

Alle Branches

Autor	SHA1	Nachricht	Datum
Lixfel	1a13446548	Merge pull request 'Fix item pickup and exploding chests' (#392) from itemFixes into master ... Reviewed-on: #392 Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>	2023-06-06 18:10:08 +02:00
Lixfel	72ef2bc486	Fix item pickup and exploding chests ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-06 18:08:18 +02:00
Lixfel	6081c5f565	Prevent players from switching teams ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-06 17:55:55 +02:00
Lixfel	1a2eabaea4	Bugfixes: No multiple player instances, spectator kit after death, confirmation message, allow request command while in team ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-06 11:47:37 +02:00
Lixfel	98a376a62b	Bugfixes, Simplify UX to requests-Command ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-05 17:00:45 +02:00
Lixfel	0020b2b152	Fix build ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-05 16:10:41 +02:00
Lixfel	c91f22658b	Merge branch 'master' into joinAnytime ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/FightSystem.properties # FightSystem_Core/src/de/steamwar/fightsystem/FightSystem_de.properties # FightSystem_Core/src/de/steamwar/fightsystem/countdown/EnternCountdown.java # FightSystem_Core/src/de/steamwar/fightsystem/fight/FightTeam.java # FightSystem_Core/src/de/steamwar/fightsystem/fight/HotbarKit.java	2023-06-05 16:08:57 +02:00
Lixfel	0fc36cea4e	Lavaremover ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-06-03 14:19:10 +02:00
Lixfel	a708a12b99	Merge pull request 'Add Gradle Plugin' (#391) from gradle_plugin into master ... Reviewed-on: #391 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-05-22 09:27:20 +02:00
Chaoscaot	f6bf5398a9	Add Gradle Plugin	2023-05-21 20:53:50 +02:00
Lixfel	c7248cfb45	Remove explosion workaround ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-18 20:38:34 +02:00
Lixfel	089b702910	Spawn items on player block destruction ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-18 20:34:01 +02:00
Lixfel	5b76af19d1	Fix 1.8-1.10 PlayerPickupItemEvent ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-14 07:50:34 +02:00
Lixfel	f7485eb603	Fix long to int conversation ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-11 09:14:14 +02:00
Lixfel	f404dafa8d	Merge pull request 'Add duration to FightStatistics.disable' (#390) from DurationFieldInFightEndsPacket into master ... Reviewed-on: #390 Reviewed-by: Lixfel <lixfel@steamwar.de>	2023-05-11 09:11:12 +02:00
YoyoNow	b48577d325	„FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern	2023-05-11 09:07:43 +02:00
YoyoNow	706e6c5ffd	„FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern	2023-05-11 09:06:06 +02:00
Lixfel	5ed1e0f024	Fix TNT prior to start ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-10 20:57:48 +02:00
yoyosource	1f032ff3c8	Add duration to FightStatistics.disable	2023-05-10 17:11:00 +02:00
Lixfel	4ac1c3759a	Fix Handswapping ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-05-09 21:15:15 +02:00
Lixfel	c1ed222a24	Merge pull request 'Reenable Items' (#373) from items into master ... Reviewed-on: #373 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-05-09 16:43:13 +02:00
Lixfel	6e9197acaa	Test fix clipping while crouching ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-29 22:38:41 +02:00
Lixfel	6048e64db4	Test fix clipping while crouching ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-29 22:36:30 +02:00
Lixfel	3c43733ab2	Test fix clipping while crouching ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-29 22:29:35 +02:00
Lixfel	87dfd28636	Test fix clipping while crouching ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-29 22:21:55 +02:00
Lixfel	8977cb1c6e	Merge pull request 'Prevent placing solid block clipping with player position' (#389) from preventClipping into master ... Reviewed-on: #389 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-04-13 19:25:37 +02:00
Lixfel	e6823ca496	Prevent placing solid block clipping with player position ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-13 15:26:06 +02:00
Lixfel	461157714d	Merge pull request 'Shuffle new leader selection' (#388) from shufflePlayer into master ... Reviewed-on: #388 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-04-11 11:43:39 +02:00
Lixfel	a726166dc3	Shuffle new leader selection ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-11 11:37:31 +02:00
Lixfel	cb4cb1d6fe	Merge branch 'master' into items ... # Conflicts: # FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java	2023-04-11 11:27:21 +02:00
Lixfel	6a2a7ff9f7	Merge pull request 'Unlimited preparation phase option' (#387) from unlimitedPrepare into master ... Reviewed-on: #387 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-04-11 11:04:34 +02:00
Lixfel	70d4f96999	Unlimited preparation phase option ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-04-11 11:00:24 +02:00
Lixfel	98cd6f5b25	Remove delay ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 21:46:33 +01:00
Lixfel	896665a405	Fix NametagVisibility ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 21:14:19 +01:00
Lixfel	bdb708a7a8	Fix ReplayServer race condition ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 21:05:58 +01:00
Lixfel	301a51bcd9	Delay Team adding ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 20:43:47 +01:00
Lixfel	b9e87de241	Hotfix click recording ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 19:56:44 +01:00
Lixfel	5f7faabbff	Hotfix click recording ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-11 19:49:02 +01:00
Lixfel	cb9b757369	Fix Spectate Nametags ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-04 13:18:49 +01:00
Lixfel	e2e677c789	Fix Arenas below 0 in Replays ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-04 13:10:30 +01:00
Lixfel	b8199eb04d	Fix ConcurrentModificationException ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-04 12:10:33 +01:00
Lixfel	d7348befbc	Fix Nametags in Replay spectate mode ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-04 11:36:03 +01:00
Lixfel	ce94130343	Merge pull request 'Add spectate team to hide nametags' (#384) from spectate into master ... Reviewed-on: #384 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-03-04 11:31:00 +01:00
Lixfel	10f8e597f8	Add spectate team to hide nametags ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-04 07:32:03 +01:00
Lixfel	75800e0033	Merge pull request 'Multiversion simplification & 1.19.3 compatibility' (#375) from 1.19.3 into master ... Reviewed-on: #375 Reviewed-by: YoyoNow <jwsteam@nidido.de>	2023-03-03 16:19:28 +01:00
Lixfel	410c9fd3d0	Fix getHandle ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-01 22:17:12 +01:00
Lixfel	34ff467261	Merge branch 'master' into 1.19.3	2023-03-01 20:32:36 +01:00
Lixfel	22c22bab87	Merge pull request 'Fix arena border, piston border, and y-Damage' (#383) from fixBordersAndDamage into master ... Reviewed-on: #383 Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>	2023-03-01 20:06:13 +01:00
Lixfel	704f79a166	Fix arena border, piston border, and y-Damage ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-01 20:00:32 +01:00
Lixfel	ded764002f	Fix modifying other inventories in PersonalKitCreator ... Signed-off-by: Lixfel <agga-games@gmx.de>	2023-03-01 17:03:43 +01:00