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

1061 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
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
Lixfel
148cedaf63 Fix new building procedure 2020-09-03 19:57:22 +02:00
Lixfel
80f0907805 Merge branch 'master' into prepare_open_source_release 2020-09-03 19:55:31 +02:00
Lixfel
a6f7e62509 Hotfix one off error 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-09-03 19:05:04 +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
bbbe0ef174 Merge pull request 'Sleep Preventer' (#178) from Insomnia into master 
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2020-08-18 17:49:45 +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
4de9f5a8e8 Merge pull request 'Implementation of ELO-Based 1 vs 1 ranked games' (#172) from firstRanked into master 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2020-07-11 07:17:45 +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