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

267 Commits

Autor SHA1 Nachricht Datum
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
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
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
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
172166e211 Trigger recompilation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-07 12:00:07 +02:00
Lixfel
38b95a144b Fixing ConcurrentModificationException 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-06 21:34:46 +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
Lixfel
6ed7ae0180 Implementing scoreboard, schematics, items 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-01 19:41:30 +02:00
Lixfel
3948115254 Preparing open source release 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-26 18:24:44 +02:00
Lixfel
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
Lixfel
ab15562e06 Merge to writeUTF 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 11:05:31 +02:00
Lixfel
ce39b0a276 Rework recorder 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 10:45:40 +02:00
Lixfel
0f3943cd73 First player movement implementation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-22 10:01:57 +02:00
Lixfel
b24a8636da Merge branch 'master' into recordSystem 2020-08-22 09:11:22 +02:00
Lixfel
a563c672e3 Merge branch 'personalKitCreatorRework' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
 2020-08-22 08:36:12 +02:00
Lixfel
ddc5874fe9 It works 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-18 17:48:07 +02:00
Lixfel
ce67d0e4f1 Improve PersonalKitCreator 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-08-18 17:31:05 +02:00
Jan9103
67fcff7711 code nutzlos gemacht 2020-08-16 11:23:18 +02:00
jojo
19d7d719e8 Add SpectateConnection 2020-08-15 23:31:18 +02:00
Jan9103
bcd3cc976b Sleep Preventer 2020-08-13 23:23:22 +02:00
Lixfel
ed025915a6 Fix spawners 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-30 20:49:56 +02:00
Lixfel
1e327c3588 Implement mutual exclusivity to prevent stacking 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-26 12:13:36 +02:00
Lixfel
d0f97430ae Fix Redstone and Piston item 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-26 08:44:46 +02:00
Lixfel
f441f76f62 Fix 1.16 item selection 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 11:13:20 +02:00
Lixfel
b13362176c Fix multiple times techko 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:58:09 +02:00
Lixfel
10c9cf3ae5 More RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-25 09:55:05 +02:00
Lixfel
b73bc9ad5e Merge branch 'master' into recordSystem 2020-07-22 16:48:35 +02:00
Lixfel
2cb8c5e8b3 Fix ELO Calculation 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:37:48 +02:00
Lixfel
b2a9a4ed64 Fix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 19:16:54 +02:00
Lixfel
caa8b4aa6a Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:55:16 +02:00
Lixfel
7858a87b60 Fix join listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-19 15:53:10 +02:00
Lixfel
a95800e815 Hotfix countdown 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 10:31:18 +02:00
Lixfel
5879ca5e18 Hotfix piston listener 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:50:39 +02:00
Lixfel
620677d593 Fix entern countdown timer 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 08:48:17 +02:00
Lixfel
72d3d0314b Fixing fire arrow bug and kit gui bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:53:04 +02:00
Lixfel
0d33e8c508 Merge branch 'multi-stage-entern' 
# Conflicts:
#	FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
 2020-07-11 07:22:36 +02:00
Lixfel
7af46a1f13 More WIP RecordSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-11 07:17:10 +02:00
Lixfel
7e66c9895c Only one spectate state init 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:36:56 +02:00
Lixfel
b5bcea06b7 Send ELO to players + fix potential crash issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:35:37 +02:00
Lixfel
8ebf509b4e Implementing ranked computation and setting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 19:07:11 +02:00
Lixfel
c1261a4fa2 First ranked (ranked saving still missing) 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-07 17:56:35 +02:00
Lixfel
727129fe8e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-06 17:39:45 +02:00
Lixfel
2aabded41e Faster Waterremover 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-05 16:29:21 +02:00
Lixfel
1261459b79 Fix fightstatistics 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 11:04:38 +02:00
Lixfel
c13b024f93 First sections of a record system 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 10:49:49 +02:00
Lixfel
228cb9e768 Fix non TNT-Kits only no tnt 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-04 09:33:31 +02:00
Lixfel
a9907b9ad1 Disable TNT explosions in testarenas in Pre running state 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 21:10:07 +02:00
Lixfel
d04d8f65b3 Fix GM3 in your head issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-07-03 20:41:08 +02:00
Lixfel
87f13942b1 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:16:54 +02:00
Lixfel
669a822bd6 Hotfix WaterRemover loop 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 17:14:45 +02:00
Lixfel
e4fe75693a Finish enter handler 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-22 09:40:29 +02:00
Lixfel
3b46d45bc0 Merge branch 'master' into multi-stage-entern 2020-06-22 08:58:58 +02:00
Lixfel
51fe8cfbe5 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 16:56:14 +02:00
Lixfel
cf8f36630e Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:27:28 +02:00
Lixfel
eb6f45a485 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:18:46 +02:00
Lixfel
d462d7d008 Hotfix flying in arena issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-04 13:16:54 +02:00
Lixfel
77133bf72a Revert "Sync WaterTechKO-Detector?" 
This reverts commit ff965cca

Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:22:53 +02:00
Lixfel
ff965cca75 Sync WaterTechKO-Detector? 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 11:21:50 +02:00
Lixfel
2ee2d74432 Hotfix watertechko + simplify and speedup 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:38:14 +02:00
Lixfel
aed86fc97b Some refactoring 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-06-03 10:19:57 +02:00
Lixfel
10c461f317 Merge pull request 'Add GamemodeCommand' (#162) from Gamemode into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
 2020-06-03 08:45:36 +02:00
jojo
4e8152d282 Add GamemodeCommand 2020-05-31 18:56:50 +02:00
Lixfel
c27f8bbd82 Merge pull request 'Rank-System für die neuen WS und WG' (#155) from ranks into master 
Reviewed-by: Jan9103 <jan9103@steamwar.de>
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-31 17:15:34 +02:00
Lixfel
b5dcedb645 Hotfix inventory size failure 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-26 14:17:52 +02:00
Lixfel
858e1b52ca Hotfix backport. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-24 18:15:10 +02:00
Lixfel
7dc7fa1f41 Removing all crafting possibilitys 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 17:02:25 +02:00
jojo
f8a2585621 Add BlockBreakEvent Add item not in Inventory 2020-05-22 16:40:27 +02:00
jojo
ad077e8eb2 Add BlockBreakEvent Debug Messages 2020-05-22 16:18:40 +02:00
jojo
4e844070ca Add BlockBreakEvent 2020-05-22 14:38:32 +02:00
Lixfel
4d192ab35d Implementing Rank-System 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-22 10:09:34 +02:00
Lixfel
aed114cda2 Merge pull request 'Simplified 1.12-Techhider' (#150) from simplified-techhider12-nonViaCompatible into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-05-22 07:54:24 +02:00
Lixfel
c1bb646579 Merge branch 'master' into ranks 2020-05-22 07:03:59 +02:00
Lixfel
aeda617a55 Make it possible to walk on the floor in prefight stage 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-21 08:42:39 +02:00
Lixfel
c7a48f36f2 Simplified 1.12-Techhider 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-19 09:42:49 +02:00
Lixfel
ab4852c717 Merge pull request 'Improving size of spectator space' (#148) from biggerSpectatorSpace into master 
Reviewed-by: Jan9103 <maxjanssen67@gmail.com>
 2020-05-19 08:45:59 +02:00
Lixfel
1608f895a8 Improving size of spectator space 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:59:35 +02:00
Lixfel
9f3e658636 First rank prototype 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-16 16:39:16 +02:00
Lixfel
13219dc352 Adding option for F3+N 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-05-11 13:25:45 +02:00
Lixfel
ac6b441815 Merge branch 'implementing-check-capability' 2020-05-10 19:18:30 +02:00
Lixfel
2c37646c79 Merge branch 'renameKitSelection' 2020-05-10 19:18:16 +02:00