SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität
1.051 Commits 8 Branches 0 Tags 7,6 MiB
f8ef582a7e
Commit graph

1051 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Lixfel
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
Lixfel
9b4744ae05 Don't autoban 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 11:18:06 +01:00
Lixfel
97dd9794ef Merge branch 'master' into gm1Spectator 2020-10-28 11:16:32 +01:00
Lixfel
192602625b Blocked spectator mode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 11:16:25 +01:00
Lixfel
84fa4e8dd0 Might fix #192 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-28 10:21:13 +01:00
Lixfel
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
Lixfel
70b90b467b This should fix the waterlogged waterremover problem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-27 15:50:24 +01:00
Lixfel
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
Lixfel
8d33e25bec Fix exceptions 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-16 09:11:10 +02:00
Lixfel
da26ddf179 Merge remote-tracking branch 'origin/recordSystem' into recordSystem 2020-10-15 22:10:15 +02:00
Lixfel
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
Lixfel
cc8b7bd96e Reduce block change packets 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-15 18:42:31 +02:00
Lixfel
0d1a0390fd Merge branch 'master' into recordSystem 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
 2020-10-15 18:03:05 +02:00
Chaoscaot
2bc9bded5c Fixing Scoreboard 2020-10-15 13:14:34 +02:00
Lixfel
66b6e5a6dd Reduce blocking on spectatesystem-blackout 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-15 10:52:06 +02:00
Chaoscaot
e575d7a493 Scoreboard Improvement 2020-10-11 10:22:07 +02:00
jojo
ac1af7ffeb Add CommentPacket 2020-10-10 21:45:14 +02:00
Chaoscaot
1acd3878f5 Changed Fight Scoreboard to SWScoreboard 2020-10-06 23:39:47 +02:00
Lixfel
0299e35766 Merge pull request 'Scoreboard 0 Health Fix' (#191) from scoreboard-0-fix into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-09-27 19:15:02 +02:00
Chaoscaot
2d06766270 Scoreboard Health 0 Fix 2020-09-27 18:11:46 +02:00
Lixfel
9346011f5b Merge branch 'master' into recordSystem 2020-09-25 16:47:12 +02:00
Lixfel
2b3f08aae2 Set spectators in halfcreative mode 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-25 16:35:16 +02:00
Lixfel
b05a0df77b Merge branch 'master' into gm1Spectator 2020-09-09 21:04:32 +02:00
Lixfel
aedbd69e66 Fix full chunk bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-09 20:48:38 +02:00
Lixfel
de0d7d7340 Gamemode 1 packet 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-09 20:47:50 +02:00
Lixfel
92a3eaefb9 Trigger recompile 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 18:53:57 +02:00
Lixfel
e48c1e7007 Merge branch 'master' into recordSystem 2020-09-08 16:29:17 +02:00
Lixfel
84f23f47c2 Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 16:28:51 +02:00
Lixfel
7028bfbd98 SchemID 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 16:25:14 +02:00
Lixfel
4a26a490d7 Merge branch 'master' into recordSystem 2020-09-08 16:01:06 +02:00
Lixfel
efb653ca13 Merge pull request 'Simplify multiversioning with removing fall-through code' (#188) from simplifyMultiversioning into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-09-08 15:59:31 +02:00
Lixfel
46151ba73f Improving multiversion capability 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 15:58:56 +02:00
Lixfel
a495700f6f Merge branch 'master' into recordSystem 2020-09-08 12:45:33 +02:00
Lixfel
cd1185c464 Simplify multiversioning with removing fall-through code 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-08 09:52:25 +02:00
Lixfel
6aa99d2d4c Implementing sending teams 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 18:24:28 +02:00
Lixfel
477bfafb93 Merge pull request 'Prevent thread stacking with syncing up' (#187) from preventThreadStacking into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-09-07 16:41:30 +02:00
Lixfel
172166e211 Trigger recompilation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 12:00:07 +02:00
Lixfel
9a8ea2f1d4 Prevent thread stacking with syncing up 
Sending mbc-Packet sync takes now around 0-2ms, so its okeyish

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 11:52:02 +02:00
Lixfel
38b95a144b Fixing ConcurrentModificationException 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 21:34:46 +02:00
Lixfel
13e4d94501 Merge pull request 'Schematic now nullable' (#185) from fix_statistics_issue into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-09-06 20:06:16 +02:00
Lixfel
859e404536 Implementing sound at player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 11:43:09 +02:00
Lixfel
90737ca915 Implementing sound at player 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 11:39:16 +02:00
jojo
c68d967a82 Add onLeaveEvent 2020-09-05 22:53:25 +02:00
Lixfel
88f6bed639 Open source release merge 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-05 22:22:20 +02:00
Lixfel
d621042f89 Merge branch 'master' into recordSystem 2020-09-05 22:20:56 +02:00
jojo
d6a8974439 Add GZIPOutputStream improvement 2020-09-05 21:46:43 +02:00
Lixfel
80416f3cdb Additional work 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-05 21:43:14 +02:00
Lixfel
e4cd7755b2 Schematic now nullable 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-04 17:59:15 +02:00