SteamWar/FightSystem
Archiviert
13
1
Commit graph

690 Commits

Autor SHA1 Nachricht Datum
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
Chaoscaot
2bc9bded5c Fixing Scoreboard 2020-10-15 13:14:34 +02:00
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
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
9346011f5b Merge branch 'master' into recordSystem 2020-09-25 16:47:12 +02:00
2b3f08aae2 Set spectators in halfcreative mode
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-25 16:35:16 +02:00
b05a0df77b Merge branch 'master' into gm1Spectator 2020-09-09 21:04:32 +02:00
aedbd69e66 Fix full chunk bug
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-09 20:48:38 +02:00
de0d7d7340 Gamemode 1 packet
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-09 20:47:50 +02:00
92a3eaefb9 Trigger recompile
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 18:53:57 +02:00
e48c1e7007 Merge branch 'master' into recordSystem 2020-09-08 16:29:17 +02:00
84f23f47c2 Hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 16:28:51 +02:00
7028bfbd98 SchemID
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 16:25:14 +02:00
4a26a490d7 Merge branch 'master' into recordSystem 2020-09-08 16:01:06 +02:00
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
46151ba73f Improving multiversion capability
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 15:58:56 +02:00
a495700f6f Merge branch 'master' into recordSystem 2020-09-08 12:45:33 +02:00
cd1185c464 Simplify multiversioning with removing fall-through code
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-08 09:52:25 +02:00
6aa99d2d4c Implementing sending teams
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-07 18:24:28 +02:00
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
172166e211 Trigger recompilation
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-07 12:00:07 +02:00
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
38b95a144b Fixing ConcurrentModificationException
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-06 21:34:46 +02:00
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
859e404536 Implementing sound at player
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-06 11:43:09 +02:00
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
88f6bed639 Open source release merge
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-05 22:22:20 +02:00
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
80416f3cdb Additional work
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-05 21:43:14 +02:00
e4cd7755b2 Schematic now nullable
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-04 17:59:15 +02:00
148cedaf63 Fix new building procedure 2020-09-03 19:57:22 +02:00
80f0907805 Merge branch 'master' into prepare_open_source_release 2020-09-03 19:55:31 +02:00
a6f7e62509 Hotfix one off error
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-03 19:05:04 +02:00
6ed7ae0180 Implementing scoreboard, schematics, items
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-09-01 19:41:30 +02:00
3948115254 Preparing open source release
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-26 18:24:44 +02:00
7e6e4f0312 Working prototype (missing player details & schematic pasting)
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-22 19:18:11 +02:00
jojo
626dbe9660 Add SpectateConnection chat 2020-08-22 15:08:35 +02:00
ab15562e06 Merge to writeUTF
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-22 11:05:31 +02:00
ce39b0a276 Rework recorder
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-22 10:45:40 +02:00
0f3943cd73 First player movement implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
2020-08-22 10:01:57 +02:00
b24a8636da Merge branch 'master' into recordSystem 2020-08-22 09:11:22 +02:00