SteamWar/FightSystem
Archiviert
13
1
Commit graph

536 Commits

Autor SHA1 Nachricht Datum
ec5fbcade6 Merge pull request 'Fixing...' (#206) from scoreboard-reimplement into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-11-17 09:35:20 +01:00
Chaoscaot
0dec2b8946 Fixing... 2020-11-17 09:31:28 +01:00
aa98d455df Merge pull request 'Changed Fight Scoreboard to SWScoreboard' (#194) from scoreboard-reimplement into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-11-17 09:29:40 +01:00
Chaoscaot
e460b04a67 Fixing... 2020-11-17 08:58:50 +01:00
Chaoscaot
26e71da87a Add Record System 2020-11-16 21:36:28 +01:00
Chaoscaot
7dbd3ab5cb Fixing Scoreboard 2020-11-16 21:31:03 +01:00
Chaoscaot
57d5d0fadc Merge branch 'master' into scoreboard-reimplement
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
2020-11-16 20:54:25 +01:00
59a000d3f2 Fix closed channel packets
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-15 11:24:57 +01:00
aa3d9f4a8a Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-12 14:25:38 +01:00
680994aed9 Fix small fightstate bug
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-10 09:59:19 +01:00
c423d8ea22 Hothotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-09 19:25:21 +01:00
4a06f4fe2d Merge pull request 'Implementing tps scoreboard parameter' (#200) from tpsScoreboard into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-11-09 06:30:05 +01:00
1848622a50 Implementing tps scoreboard parameter
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-07 11:40:01 +01:00
2317505494 Double disconnect fix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 18:32:33 +01:00
fc1400a73a Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 18:07:09 +01:00
3147783ef8 Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 17:53:57 +01:00
247396bffd Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 17:37:28 +01:00
c0887a87d0 Start recording all event fights
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 17:23:15 +01:00
ea63704c38 Kick non players and record more blocks (to prevent ghost blocks)
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 17:11:18 +01:00
5b12e10b98 Fix player despawn
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 12:13:57 +01:00
d9dede725b Fix fightscoreboard recording
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-02 10:41:45 +01:00
790042dcba Merge pull request 'RecordSystem (Beta)' (#199) from recordSystem into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-11-01 20:11:45 +01:00
014cee20a8 Temporary only record if recording
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-11-01 16:17:00 +01:00
06960ffda7 Merge branch 'master' into recordSystem
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
#	FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
2020-11-01 16:11:00 +01:00
6189b7278a Hotfix gm 31 in testarena & tablist
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 22:04:04 +01:00
fa03bc0609 Merge pull request 'Kick all nonparticipants if Event with SpectateSystem' (#198) from kickNonParticipants into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2020-10-30 21:42:40 +01:00
55b27082cb Kick all nonparticipants if Event with SpectateSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 14:06:38 +01:00
acb83e7fbb Hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 07:52:08 +01:00
81224b9495 Merge pull request 'tablistName' (#197) from tablistName into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-30 07:31:36 +01:00
924ed3b30a Disable TablistPacket on test arenas
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-30 07:31:21 +01:00
3281469772 Adjust explosion size
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 21:40:28 +01:00
886e624bac Impl. tablist name capability
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 20:51:45 +01:00
a5c19e04c0 Merge pull request 'GameMode 1 Spectator' (#190) from gm1Spectator into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-29 19:57:47 +01:00
f04a9edb41 Fix sound strength
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 12:24:43 +01:00
259ca31f2b Tablist name impl. as comments.
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-29 12:19:23 +01:00
7af16ed9a7 Merge pull request 'Might fix #192' (#196) from captainLeave into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-29 08:45:59 +01:00
9b4744ae05 Don't autoban
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-28 11:18:06 +01:00
97dd9794ef Merge branch 'master' into gm1Spectator 2020-10-28 11:16:32 +01:00
192602625b Blocked spectator mode
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-28 11:16:25 +01:00
84fa4e8dd0 Might fix #192
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-28 10:21:13 +01:00
525804016e Merge pull request 'This should fix the waterlogged waterremover problem' (#195) from fixWaterlogged into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
2020-10-28 10:17:38 +01:00
70b90b467b This should fix the waterlogged waterremover problem
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-27 15:50:24 +01:00
bef28a99b2 Commit recent changes
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-27 15:33:44 +01:00
jojo
6db5d46af3 Add fileSuffix .recording 2020-10-21 18:32:20 +02:00
8d33e25bec Fix exceptions
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-16 09:11:10 +02:00
da26ddf179 Merge remote-tracking branch 'origin/recordSystem' into recordSystem 2020-10-15 22:10:15 +02:00
20f14670df Despawn all tnt at end of fight
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-15 22:10:08 +02:00
jojo
c04029fb92 Add clearity into RecordSystem comment 2020-10-15 18:55:43 +02:00
cc8b7bd96e Reduce block change packets
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-10-15 18:42:31 +02:00
0d1a0390fd Merge branch 'master' into recordSystem
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
2020-10-15 18:03:05 +02:00