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

650 Commits

Dieser Branch
Dieser Branch
Alle Branches
Autor SHA1 Nachricht Datum
Chaoscaot
030bfbc6a1 Improving 2020-11-30 20:05:07 +01:00
Chaoscaot
fff0380228 Merge remote-tracking branch 'origin/master' into arrow-in-techhider 2020-11-30 19:26:00 +01:00
Lixfel
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
Lixfel
08b483deb4 Detect and block prefilled inventories in PersonalKitCreator 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-30 17:10:38 +01:00
Chaoscaot
5eedf7bf50 Improving Array 2020-11-28 13:11:43 +01:00
Chaoscaot
9984fc0179 Remove Debug Message 2020-11-28 12:07:41 +01:00
Chaoscaot
5366011bd7 Rework Arrow Tracking 2020-11-28 12:05:27 +01:00
Chaoscaot
8c93f446df Adding Better Tracking 2020-11-27 21:31:39 +01:00
Chaoscaot
afa2217ce3 Adding Better Tracking 2020-11-27 21:07:51 +01:00
Chaoscaot
81ac127bbf Adding Better Tracking 2020-11-27 19:55:26 +01:00
Chaoscaot
664350d286 Add Arrows Stopping in Techhider Blocks 2020-11-27 16:22:15 +01:00
Lixfel
da157fef72 Test fix waterlogged issue 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-27 15:08:01 +01:00
Lixfel
9525873e8c Merge remote-tracking branch 'origin/master' 2020-11-18 14:52:53 +01:00
Lixfel
aac110bad8 Hotfix schempasting 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-18 14:52:43 +01:00
Lixfel
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
Lixfel
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
Lixfel
59a000d3f2 Fix closed channel packets 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-15 11:24:57 +01:00
Lixfel
aa3d9f4a8a Fix NPE 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-12 14:25:38 +01:00
Lixfel
680994aed9 Fix small fightstate bug 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-10 09:59:19 +01:00
Lixfel
c423d8ea22 Hothotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-09 19:25:21 +01:00
Lixfel
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
Lixfel
1848622a50 Implementing tps scoreboard parameter 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-07 11:40:01 +01:00
Lixfel
2317505494 Double disconnect fix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 18:32:33 +01:00
Lixfel
fc1400a73a Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 18:07:09 +01:00
Lixfel
3147783ef8 Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:53:57 +01:00
Lixfel
247396bffd Hotfix player join not recognized 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:37:28 +01:00
Lixfel
c0887a87d0 Start recording all event fights 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 17:23:15 +01:00
Lixfel
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
Lixfel
5b12e10b98 Fix player despawn 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 12:13:57 +01:00
Lixfel
d9dede725b Fix fightscoreboard recording 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-02 10:41:45 +01:00
Lixfel
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
Lixfel
014cee20a8 Temporary only record if recording 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-11-01 16:17:00 +01:00
Lixfel
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
Lixfel
6189b7278a Hotfix gm 31 in testarena & tablist 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 22:04:04 +01:00
Lixfel
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
Lixfel
55b27082cb Kick all nonparticipants if Event with SpectateSystem 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 14:06:38 +01:00
Lixfel
acb83e7fbb Hotfix 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 07:52:08 +01:00
Lixfel
81224b9495 Merge pull request 'tablistName' (#197) from tablistName into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-10-30 07:31:36 +01:00
Lixfel
924ed3b30a Disable TablistPacket on test arenas 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-30 07:31:21 +01:00
Lixfel
3281469772 Adjust explosion size 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 21:40:28 +01:00
Lixfel
886e624bac Impl. tablist name capability 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 20:51:45 +01:00
Lixfel
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
Lixfel
f04a9edb41 Fix sound strength 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 12:24:43 +01:00
Lixfel
259ca31f2b Tablist name impl. as comments. 
Signed-off-by: Lixfel <agga-games@gmx.de>
 2020-10-29 12:19:23 +01:00
Lixfel
7af16ed9a7 Merge pull request 'Might fix #192' (#196) from captainLeave into master 
Reviewed-by: Chaoscaot <chaoscaot444@gmail.com>
 2020-10-29 08:45:59 +01:00