SteamWar/FightSystem
Archiviert
13
1
Commit graph

1307 Commits

Autor SHA1 Nachricht Datum
adeb4e1d32 Merge pull request 'Fight info command' (#395) from infoCommand into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #395
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-08-25 21:46:16 +02:00
09bc0d8fbb Fight info command
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 21:43:27 +02:00
1a8255e94c Do not replace Obsidian and Bedrock in prepare arenas
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-25 15:52:48 +02:00
19d12df834 Merge pull request 'Move Spawnoffset to GameMode config' (#394) from spawnoffset into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #394
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-08-19 11:26:41 +02:00
13e1610f61 Move Spawnoffset to GameMode config
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-08-19 11:12:22 +02:00
0cad5fa3ae Fix /leader
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-07-01 22:06:21 +02:00
9da8e33360 Fix checking
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:40:06 +02:00
fd5db46700 Fix reset
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 21:06:35 +02:00
722a8748d5 Merge pull request 'join anytime' (#359) from joinAnytime into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #359
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-06-25 20:11:51 +02:00
89682fe044 Merge pull request '1.20 support' (#393) from 1.20 into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #393
2023-06-25 20:09:39 +02:00
5e4190ea75 Limit JoinAnytime to variable teams
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-25 20:07:41 +02:00
e9e1667de4 1.20 support
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-23 16:24:44 +02:00
cbb0dcf8eb Some of the requested changes
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-13 22:00:43 +02:00
43e63b4201 Bugfixes: Offline players, rejoining
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:44:17 +02:00
1a13446548 Merge pull request 'Fix item pickup and exploding chests' (#392) from itemFixes into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #392
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
2023-06-06 18:10:08 +02:00
72ef2bc486 Fix item pickup and exploding chests
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 18:08:18 +02:00
6081c5f565 Prevent players from switching teams
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 17:55:55 +02:00
1a2eabaea4 Bugfixes: No multiple player instances, spectator kit after death, confirmation message, allow request command while in team
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-06 11:47:37 +02:00
98a376a62b Bugfixes, Simplify UX to requests-Command
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 17:00:45 +02:00
0020b2b152 Fix build
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-05 16:10:41 +02:00
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
0fc36cea4e Lavaremover
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-06-03 14:19:10 +02:00
a708a12b99 Merge pull request 'Add Gradle Plugin' (#391) from gradle_plugin into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #391
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-05-22 09:27:20 +02:00
Chaoscaot
f6bf5398a9 Add Gradle Plugin
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
2023-05-21 20:53:50 +02:00
c7248cfb45 Remove explosion workaround
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-18 20:38:34 +02:00
089b702910 Spawn items on player block destruction
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-18 20:34:01 +02:00
5b76af19d1 Fix 1.8-1.10 PlayerPickupItemEvent
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-14 07:50:34 +02:00
f7485eb603 Fix long to int conversation
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-11 09:14:14 +02:00
f404dafa8d Merge pull request 'Add duration to FightStatistics.disable' (#390) from DurationFieldInFightEndsPacket into master
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
Reviewed-on: #390
Reviewed-by: Lixfel <lixfel@steamwar.de>
2023-05-11 09:11:12 +02:00
b48577d325 „FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2023-05-11 09:07:43 +02:00
706e6c5ffd „FightSystem_Core/src/de/steamwar/fightsystem/utils/FightStatistics.java“ ändern
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2023-05-11 09:06:06 +02:00
5ed1e0f024 Fix TNT prior to start
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-10 20:57:48 +02:00
yoyosource
1f032ff3c8 Add duration to FightStatistics.disable
Einige Prüfungen sind fehlgeschlagen
SteamWarCI Build failed
2023-05-10 17:11:00 +02:00
4ac1c3759a Fix Handswapping
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-05-09 21:15:15 +02:00
c1ed222a24 Merge pull request 'Reenable Items' (#373) from items into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #373
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-05-09 16:43:13 +02:00
6e9197acaa Test fix clipping while crouching
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-29 22:38:41 +02:00
6048e64db4 Test fix clipping while crouching
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-29 22:36:30 +02:00
3c43733ab2 Test fix clipping while crouching
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-29 22:29:35 +02:00
87dfd28636 Test fix clipping while crouching
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-29 22:21:55 +02:00
8977cb1c6e Merge pull request 'Prevent placing solid block clipping with player position' (#389) from preventClipping into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #389
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-04-13 19:25:37 +02:00
e6823ca496 Prevent placing solid block clipping with player position
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-13 15:26:06 +02:00
461157714d Merge pull request 'Shuffle new leader selection' (#388) from shufflePlayer into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #388
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-04-11 11:43:39 +02:00
a726166dc3 Shuffle new leader selection
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-11 11:37:31 +02:00
cb4cb1d6fe Merge branch 'master' into items
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
# Conflicts:
#	FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
2023-04-11 11:27:21 +02:00
6a2a7ff9f7 Merge pull request 'Unlimited preparation phase option' (#387) from unlimitedPrepare into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Reviewed-on: #387
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2023-04-11 11:04:34 +02:00
70d4f96999 Unlimited preparation phase option
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-04-11 11:00:24 +02:00
98cd6f5b25 Remove delay
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 21:46:33 +01:00
896665a405 Fix NametagVisibility
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 21:14:19 +01:00
bdb708a7a8 Fix ReplayServer race condition
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 21:05:58 +01:00
301a51bcd9 Delay Team adding
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
2023-03-11 20:43:47 +01:00