|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
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 |
|
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 |
|
|
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 |
|
|
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 |
|
|
172166e211
|
Trigger recompilation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-09-07 12:00:07 +02:00 |
|
|
38b95a144b
|
Fixing ConcurrentModificationException
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-09-06 21:34:46 +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 |
|
|
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 |
|
|
a563c672e3
|
Merge branch 'personalKitCreatorRework'
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
|
2020-08-22 08:36:12 +02:00 |
|
|
ddc5874fe9
|
It works
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-08-18 17:48:07 +02:00 |
|
|
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 |
|
|
ed025915a6
|
Fix spawners
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-30 20:49:56 +02:00 |
|
|
1e327c3588
|
Implement mutual exclusivity to prevent stacking
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-26 12:13:36 +02:00 |
|
|
d0f97430ae
|
Fix Redstone and Piston item
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-26 08:44:46 +02:00 |
|
|
f441f76f62
|
Fix 1.16 item selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-25 11:13:20 +02:00 |
|
|
b13362176c
|
Fix multiple times techko
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-25 09:58:09 +02:00 |
|
|
10c9cf3ae5
|
More RecordSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-25 09:55:05 +02:00 |
|
|
b73bc9ad5e
|
Merge branch 'master' into recordSystem
|
2020-07-22 16:48:35 +02:00 |
|
|
2cb8c5e8b3
|
Fix ELO Calculation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 19:37:48 +02:00 |
|
|
b2a9a4ed64
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 19:16:54 +02:00 |
|
|
caa8b4aa6a
|
Fix join listener
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 15:55:16 +02:00 |
|
|
7858a87b60
|
Fix join listener
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-19 15:53:10 +02:00 |
|
|
a95800e815
|
Hotfix countdown
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-11 10:31:18 +02:00 |
|
|
5879ca5e18
|
Hotfix piston listener
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-11 08:50:39 +02:00 |
|
|
620677d593
|
Fix entern countdown timer
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-11 08:48:17 +02:00 |
|
|
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 |
|
|
0d33e8c508
|
Merge branch 'multi-stage-entern'
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/WaterRemover.java
|
2020-07-11 07:22:36 +02:00 |
|
|
7af46a1f13
|
More WIP RecordSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-11 07:17:10 +02:00 |
|
|
7e66c9895c
|
Only one spectate state init
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 19:36:56 +02:00 |
|
|
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 |
|
|
8ebf509b4e
|
Implementing ranked computation and setting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 19:07:11 +02:00 |
|
|
c1261a4fa2
|
First ranked (ranked saving still missing)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-07 17:56:35 +02:00 |
|
|
727129fe8e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-06 17:39:45 +02:00 |
|
|
2aabded41e
|
Faster Waterremover
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-05 16:29:21 +02:00 |
|
|
1261459b79
|
Fix fightstatistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 11:04:38 +02:00 |
|
|
c13b024f93
|
First sections of a record system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 10:49:49 +02:00 |
|
|
228cb9e768
|
Fix non TNT-Kits only no tnt
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-04 09:33:31 +02:00 |
|
|
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 |
|
|
d04d8f65b3
|
Fix GM3 in your head issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-07-03 20:41:08 +02:00 |
|
|
87f13942b1
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:16:54 +02:00 |
|
|
669a822bd6
|
Hotfix WaterRemover loop
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 17:14:45 +02:00 |
|
|
e4fe75693a
|
Finish enter handler
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-22 09:40:29 +02:00 |
|
|
3b46d45bc0
|
Merge branch 'master' into multi-stage-entern
|
2020-06-22 08:58:58 +02:00 |
|
|
51fe8cfbe5
|
Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-04 16:56:14 +02:00 |
|
|
cf8f36630e
|
Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-04 13:27:28 +02:00 |
|
|
eb6f45a485
|
Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-04 13:18:46 +02:00 |
|
|
d462d7d008
|
Hotfix flying in arena issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-04 13:16:54 +02:00 |
|
|
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 |
|
|
ff965cca75
|
Sync WaterTechKO-Detector?
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 11:21:50 +02:00 |
|
|
2ee2d74432
|
Hotfix watertechko + simplify and speedup
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 10:38:14 +02:00 |
|
|
aed86fc97b
|
Some refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-06-03 10:19:57 +02:00 |
|
|
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 |
|
|
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 |
|
|
b5dcedb645
|
Hotfix inventory size failure
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-26 14:17:52 +02:00 |
|
|
858e1b52ca
|
Hotfix backport.
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-24 18:15:10 +02:00 |
|
|
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 |
|
|
4d192ab35d
|
Implementing Rank-System
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-22 10:09:34 +02:00 |
|
|
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 |
|
|
c1bb646579
|
Merge branch 'master' into ranks
|
2020-05-22 07:03:59 +02:00 |
|
|
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 |
|
|
c7a48f36f2
|
Simplified 1.12-Techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-19 09:42:49 +02:00 |
|
|
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 |
|
|
1608f895a8
|
Improving size of spectator space
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-16 16:59:35 +02:00 |
|
|
9f3e658636
|
First rank prototype
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-16 16:39:16 +02:00 |
|
|
13219dc352
|
Adding option for F3+N
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-11 13:25:45 +02:00 |
|
|
ac6b441815
|
Merge branch 'implementing-check-capability'
|
2020-05-10 19:18:30 +02:00 |
|
|
2c37646c79
|
Merge branch 'renameKitSelection'
|
2020-05-10 19:18:16 +02:00 |
|
|
100868b04d
|
Hotfix percent stopping
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-03 15:42:53 +02:00 |
|
|
219d7acbe2
|
Preventing copying
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-05-01 11:05:31 +02:00 |
|
|
04b5fa34f8
|
Adapting permissions
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-30 16:10:20 +02:00 |
|
|
bf3baed537
|
Implementing check capability into TestArenas
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-30 16:09:24 +02:00 |
|
|
1367305e26
|
Force backport
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-28 09:54:10 +02:00 |
|
|
0f9480f69e
|
Replace blocks without blockupdates
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-21 10:08:02 +02:00 |
|
|
8f7d3c74b7
|
Event hotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-19 20:28:07 +02:00 |
|
|
1c72ac9251
|
Fix freezer to more seconds
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-17 14:49:50 +02:00 |
|
|
50a864de1e
|
Rename Kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-15 17:10:41 +02:00 |
|
|
26d8fe4451
|
Merge branch 'master' into 1.15TechhiderFullChunk
|
2020-04-13 11:55:08 +02:00 |
|
|
043810bb14
|
Hotfix kit creation breakout bugs
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-11 12:26:36 +02:00 |
|
|
ff6182fad4
|
Techhider 2
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-11 12:06:01 +02:00 |
|
|
c7bc8163ed
|
Merge branch 'kitreset' of SteamWar/FightSystem into master
|
2020-04-01 12:56:12 +02:00 |
|
|
01f9ffb6de
|
Improve world freezing for MWG 1.15
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-01 12:30:36 +02:00 |
|
|
c3e1e93578
|
Resetting Kit creator with creative inventory clear, FightTeam nametag fix for 1.15
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-04-01 11:59:37 +02:00 |
|
|
6ea8001cf5
|
Hotfix #119
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-03-28 08:53:16 +01:00 |
|
|
0a82dc362f
|
Hotfix Sign update Exception
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-03-01 13:35:10 +01:00 |
|
|
afb3b07b87
|
Hotfix async exception
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-27 19:10:34 +01:00 |
|
|
443ffb725d
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-21 06:36:45 +01:00 |
|
|
9885225466
|
Merge branch 'autoStart' of SteamWar/FightSystem into master
|
2020-02-11 17:43:15 +01:00 |
|
|
81fd8329fc
|
Merge branch '1.15' of SteamWar/FightSystem into master
|
2020-02-11 17:41:50 +01:00 |
|
|
b11fba3280
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 21:34:24 +01:00 |
|
|
dba3872a25
|
Autostarting fight with end of setup countdown (like in events)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 14:31:37 +01:00 |
|
|
c9c6529bdf
|
Give Ready-Button in Eventmode for faster startup
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 13:08:11 +01:00 |
|
|
684ed70219
|
Fixing Waterremover and deadlock
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-10 10:32:21 +01:00 |
|
|
01ec60c4e4
|
Hotfix event countdown naming
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-08 07:03:40 +01:00 |
|
|
4aee1f4c72
|
Preventing arrow pickups
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-02-01 14:28:46 +01:00 |
|
|
11251727bf
|
Dirty hotfix of Points NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-27 17:36:00 +01:00 |
|
|
67ad92bc90
|
Merge branch 'hide_sign_content' of SteamWar/FightSystem into master
|
2020-01-27 06:47:13 +01:00 |
|
|
61ff397458
|
Merge branch 'master' into personalKit
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/FightSystem.java
# FightSystem_Main/src/de/steamwar/fightsystem/commands/GUI.java
# FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
|
2020-01-27 06:31:41 +01:00 |
|
|
668f2c948f
|
Useless commit to test building
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-26 08:46:47 +01:00 |
|
|
0ebc7e5616
|
Fixing bugs occured with testing
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 19:57:21 +01:00 |
|
|
0c21251720
|
Loading personalKits to player
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 17:40:48 +01:00 |
|
|
e053ecf286
|
Adding fight statistics
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 17:33:29 +01:00 |
|
|
c5c6e8c32b
|
Implement personal kits (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-23 08:31:32 +01:00 |
|
|
2ac00294f9
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-21 17:49:04 +01:00 |
|
|
7fe4f09a08
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-20 18:48:40 +01:00 |
|
|
542547fd5b
|
Hotfix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-20 18:46:52 +01:00 |
|
|
a4f8251680
|
Merge branch 'master' into hide_sign_content
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/TechHider.java
|
2020-01-20 17:51:58 +01:00 |
|
|
5a9e281c95
|
Merge branch 'IgnorePublicOnly' of SteamWar/FightSystem into master
|
2020-01-20 17:47:42 +01:00 |
|
|
ad87077b15
|
Merge branch 'remove_pair' of SteamWar/FightSystem into master
|
2020-01-20 06:48:46 +01:00 |
|
|
3c4d5123da
|
Ignore Public Only rule (for historic gamemodes)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:32:29 +01:00 |
|
|
00967a2d3e
|
WIP Adding personal kits
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 17:25:11 +01:00 |
|
|
03e5cf62a2
|
Removing pair from fight system
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:38:54 +01:00 |
|
|
8353139d2c
|
Fixing exceptions occuring in test and event arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:23:02 +01:00 |
|
|
e6194a7a67
|
Adding only public schems to techhider
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:13:10 +01:00 |
|
|
7c57b6251c
|
Hide sign contents with packet filter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-19 07:12:22 +01:00 |
|
|
1dd3b79ee9
|
Allowing only public schematics if one leader has no private
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-18 08:31:13 +01:00 |
|
Yaruma3341
|
23a8f9ba84
|
code cleanup; semi version independent
|
2020-01-15 18:44:34 +01:00 |
|
Yaruma3341
|
c463823c05
|
implemented version independence
|
2020-01-14 22:16:12 +01:00 |
|
Yaruma3341
|
eabd9ab50b
|
added spec hider
|
2020-01-13 21:37:36 +01:00 |
|
|
320083fb08
|
Hotfix 1.8
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-13 17:49:59 +01:00 |
|
|
ac2f012ab9
|
Hotfix spawning gamemode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:19:49 +01:00 |
|
|
36925fad13
|
Hotfix choose schematic in testmode
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:15:01 +01:00 |
|
|
33b9f03926
|
Hotfix is setup phase check
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 17:05:41 +01:00 |
|
|
4362599f4d
|
Bowfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 13:29:08 +01:00 |
|
|
f72869c43d
|
Reworking default config
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 13:01:07 +01:00 |
|
|
b9bf52cc5f
|
Merge branch 'master' into setupSplitting
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/listener/NormalJoinListener.java
|
2020-01-12 12:52:20 +01:00 |
|
|
21c0d95927
|
Hotfix team join order
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-12 12:20:47 +01:00 |
|
|
3fd6bac585
|
Setting mainCountdown when entern
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 17:23:01 +01:00 |
|
|
7d4c397809
|
Fixing possible double cancelling issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:58:02 +01:00 |
|
|
5e85488d80
|
Adding PreSchemPaste countdown
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:56:31 +01:00 |
|
|
049c51f2a9
|
Finishing setup split (untested)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:45:01 +01:00 |
|
|
126a9b3ab4
|
Hotfix kit preview color
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:45:00 +01:00 |
|
|
af5b7d5240
|
Adding a kit preview during kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 15:45:00 +01:00 |
|
|
bafe06723a
|
Hotfix kit preview color
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 12:54:37 +01:00 |
|
|
72096710b3
|
WIP Splitting Setup and refactoring
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-11 12:53:31 +01:00 |
|
|
5734ada17b
|
Adding a kit preview during kit selection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 22:38:14 +01:00 |
|
|
97c9022d75
|
Fixing freeze world
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-10 20:30:31 +01:00 |
|
|
d8f9c7a00c
|
Freeze World during pasting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-07 19:27:35 +01:00 |
|
|
e352862c5e
|
Fixing missing time information
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-01-05 14:31:59 +01:00 |
|
|
d45f0892a7
|
TechHider 1.14+ actualisation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 17:04:00 +01:00 |
|
|
0797c44984
|
Fixing flushQueue/flushSession discrepance
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-31 16:47:34 +01:00 |
|
|
d555589615
|
Adding pumpkin tech ko
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:22:18 +01:00 |
|
|
f9485da0e3
|
Adding new HeartRatioTimeoutWincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-28 11:20:01 +01:00 |
|
|
00f22fe513
|
Adding 1.15 support
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 12:02:27 +01:00 |
|
|
692cd609bc
|
Adding 1.9 and 1.10 support, also refactoring Multiversion Support to current norm
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 11:05:12 +01:00 |
|
|
6582b9a5c4
|
Adding SWSound for better Sound handling
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-27 10:09:03 +01:00 |
|
|
156df367f2
|
Fixing wincondition
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-23 22:46:36 +01:00 |
|
|
afab77418f
|
Fixing some issues regarding PointSystem
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 21:58:18 +01:00 |
|
|
ad2e8d9e92
|
Merge branch 'newWinconditions' of SteamWar/FightSystem into master
|
2019-12-22 18:18:49 +01:00 |
|
|
9a4a36aeb9
|
Refactoring error (useless commit for starting dev server)
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:56:18 +01:00 |
|
|
9b1622c1e4
|
Adding missing if condition to effects
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:52:06 +01:00 |
|
|
be6693e85a
|
Refactoring of KitSystem and adding of potion effects
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 16:38:51 +01:00 |
|
|
dbae65bf82
|
Finishing SG.eu Points Wincondition implementation
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2019-12-22 15:20:50 +01:00 |
|
|
09acb366d3
|
WIP Wincondition points & Wincondition relative
|
2019-12-21 20:46:31 +01:00 |
|
|
c534a6b27b
|
Fixing 1.14 sound
|
2019-12-11 18:37:41 +01:00 |
|
|
3bfd13a36e
|
Renaming finalName for continouus deployment
|
2019-12-10 18:11:34 +01:00 |
|
|
dfa0e846e9
|
Merge branch '1_14-support'
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/fight/Fight.java
|
2019-12-09 20:52:18 +01:00 |
|
|
a1ae843cb9
|
Merge branch '1_14-support' of steamwar.de:SteamWar/FightSystem into 1_14-support
|
2019-12-09 20:47:35 +01:00 |
|
BuildTools
|
ef78fd7280
|
code cleanup
|
2019-12-09 20:40:07 +01:00 |
|
BuildTools
|
0fc5730cf5
|
code cleanup; performance update
|
2019-12-09 20:37:18 +01:00 |
|
|
2ed8959f5d
|
Merge branch '1_14-support'
|
2019-12-09 12:01:42 +01:00 |
|
|
09f7711fe2
|
Schematic Rework
|
2019-12-09 12:01:33 +01:00 |
|
BuildTools
|
efc7af3e55
|
hotfix
|
2019-12-06 22:52:03 +01:00 |
|
BuildTools
|
882336d910
|
added block-replacer as option
|
2019-12-06 22:51:26 +01:00 |
|
|
691f3d8cfa
|
Full 1.14 untested support (with techhider)
|
2019-11-25 17:53:23 +01:00 |
|
|
b8445cd58a
|
Merge branch 'sperren' of SteamWar/FightSystem into master
|
2019-11-25 17:51:50 +01:00 |
|
|
feb7939ee7
|
code cleanup
|
2019-11-23 22:08:04 +01:00 |
|
|
284542e23d
|
hotfix
|
2019-11-23 20:55:28 +01:00 |
|
|
c6459884a0
|
code cleanup; bugfix
|
2019-11-23 20:50:21 +01:00 |
|
|
95e901115a
|
Full untested 1.14 without 1.14 Techhider
|
2019-11-23 18:15:45 +01:00 |
|
|
39e4ab421e
|
Maven refactoring
|
2019-11-23 16:42:49 +01:00 |
|
|
ab9e32a7ca
|
Starting 1.14 support
|
2019-11-23 16:42:49 +01:00 |
|
|
c6efe8a5f4
|
code cleanup
|
2019-11-21 19:40:59 +01:00 |
|
|
1b8682807f
|
Using Chat-ChatMessageType for chat messages
|
2019-11-21 17:58:29 +01:00 |
|
|
20d228567e
|
Improve Countdown contrast
|
2019-11-21 17:56:11 +01:00 |
|
|
cc18882a52
|
hotfix
|
2019-11-21 16:23:02 +01:00 |
|
|
f0797c041d
|
added new comment to lock schematic
|
2019-11-21 16:20:57 +01:00 |
|
|
2a6f28b935
|
implemented schematic locking
|
2019-11-21 16:09:58 +01:00 |
|
|
37f2de6f64
|
Countdown to Actionbar
|
2019-11-21 10:50:45 +01:00 |
|
|
7f8f1490ab
|
HotbarGUI hotfix
|
2019-11-16 15:01:27 +01:00 |
|
|
595e7a0ea4
|
Refactoring for Multiversion-API
|
2019-11-16 08:37:33 +01:00 |
|
|
065dc58f98
|
FAWE free 1.8, Kit fixes
|
2019-11-15 08:22:16 +01:00 |
|
|
d1d0d4ee36
|
Disable Techhider on Version != 1.12
|
2019-11-11 19:04:23 +01:00 |
|
|
038d08a7aa
|
Fixing 1.8 inventory bug
|
2019-11-11 00:15:22 +01:00 |
|
|
cc42c86549
|
Adding 1.8 Version Support
|
2019-11-10 22:34:22 +01:00 |
|