|
|
ff09758e4f
|
Merge pull request 'Fix Water duping with ice, removing packed ice as not used' (#224) from fix-water-duping into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2020-12-30 15:53:38 +01:00 |
|
jojo
|
0ed423b596
|
Fix Water duping with ice
|
2020-12-30 15:51:31 +01:00 |
|
|
|
8374ecfc11
|
Merge pull request 'Fix Water duping with ice' (#223) from fix-water-duping into master
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2020-12-30 15:51:01 +01:00 |
|
jojo
|
532268eaf7
|
Fix Water duping with ice
|
2020-12-30 15:49:33 +01:00 |
|
|
|
efd9d91ff2
|
Merge pull request 'Optimize TechKO detection' (#221) from cleanupTechKO into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-12-25 18:25:59 +01:00 |
|
|
|
b8b8b1b0f5
|
Optimize TechKO detection
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-24 14:53:29 +01:00 |
|
|
|
fd3d6d9911
|
Prevent false positives
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-19 12:00:46 +01:00 |
|
|
|
bbc18de42e
|
Fix 1.8 arena
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-19 11:36:06 +01:00 |
|
|
|
0b69a39747
|
Merge pull request 'test-fix-items' (#218) from test-fix-items into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-12-18 23:12:14 +01:00 |
|
|
|
073e8a0d89
|
Hotfix for forbidden item contents
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-18 23:08:57 +01:00 |
|
|
|
48ee7819c6
|
Hotfix for forbidden item contents
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-18 22:36:27 +01:00 |
|
|
|
a2fa01db7a
|
Hotfix teamleave
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-13 15:02:48 +01:00 |
|
|
|
9e4e4ee4f8
|
Hotfix teamleave
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-11 17:53:37 +01:00 |
|
|
|
0b4a95f399
|
Merge pull request 'FULLCHUNK TECHHIDER + Performanceimprovement + Bugfix' (#211) from techhider-improvement into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-12-10 18:50:13 +01:00 |
|
|
|
117c292346
|
Remove debug messages
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-10 17:59:17 +01:00 |
|
|
|
4e65017b50
|
Performance, Full block techhider, bugfixes
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-12-09 18:43:50 +01:00 |
|
|
|
baf106a6c9
|
Merge pull request 'Detect and block prefilled inventories in PersonalKitCreator' (#209) from detectFilledInventories into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-11-30 17:19:49 +01:00 |
|
|
|
08b483deb4
|
Detect and block prefilled inventories in PersonalKitCreator
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-30 17:10:38 +01:00 |
|
|
|
da157fef72
|
Test fix waterlogged issue
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-27 15:08:01 +01:00 |
|
|
|
9525873e8c
|
Merge remote-tracking branch 'origin/master'
|
2020-11-18 14:52:53 +01:00 |
|
|
|
aac110bad8
|
Hotfix schempasting
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-18 14:52:43 +01:00 |
|
|
|
ec5fbcade6
|
Merge pull request 'Fixing...' (#206) from scoreboard-reimplement into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-11-17 09:35:20 +01:00 |
|
Chaoscaot
|
0dec2b8946
|
Fixing...
|
2020-11-17 09:31:28 +01:00 |
|
|
|
aa98d455df
|
Merge pull request 'Changed Fight Scoreboard to SWScoreboard' (#194) from scoreboard-reimplement into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-11-17 09:29:40 +01:00 |
|
Chaoscaot
|
e460b04a67
|
Fixing...
|
2020-11-17 08:58:50 +01:00 |
|
Chaoscaot
|
26e71da87a
|
Add Record System
|
2020-11-16 21:36:28 +01:00 |
|
Chaoscaot
|
7dbd3ab5cb
|
Fixing Scoreboard
|
2020-11-16 21:31:03 +01:00 |
|
Chaoscaot
|
57d5d0fadc
|
Merge branch 'master' into scoreboard-reimplement
# Conflicts:
# FightSystem_Main/src/de/steamwar/fightsystem/utils/FightScoreboard.java
|
2020-11-16 20:54:25 +01:00 |
|
|
|
59a000d3f2
|
Fix closed channel packets
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-15 11:24:57 +01:00 |
|
|
|
aa3d9f4a8a
|
Fix NPE
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-12 14:25:38 +01:00 |
|
|
|
680994aed9
|
Fix small fightstate bug
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-10 09:59:19 +01:00 |
|
|
|
c423d8ea22
|
Hothotfix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-09 19:25:21 +01:00 |
|
|
|
4a06f4fe2d
|
Merge pull request 'Implementing tps scoreboard parameter' (#200) from tpsScoreboard into master
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
|
2020-11-09 06:30:05 +01:00 |
|
|
|
1848622a50
|
Implementing tps scoreboard parameter
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-07 11:40:01 +01:00 |
|
|
|
2317505494
|
Double disconnect fix
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 18:32:33 +01:00 |
|
|
|
fc1400a73a
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 18:07:09 +01:00 |
|
|
|
3147783ef8
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:53:57 +01:00 |
|
|
|
247396bffd
|
Hotfix player join not recognized
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2020-11-02 17:37:28 +01:00 |
|
|
|
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 |
|
|
|
790042dcba
|
Merge pull request 'RecordSystem (Beta)' (#199) from recordSystem into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-11-01 20:11: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 |
|
|
|
fa03bc0609
|
Merge pull request 'Kick all nonparticipants if Event with SpectateSystem' (#198) from kickNonParticipants into master
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2020-10-30 21:42:40 +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 |
|
