Archiviert
1
0
Commit graph

1586 Commits

Autor SHA1 Nachricht Datum
95ed6925da Merge pull request 'Server start refactoring, Tutorial system' (#317) from tutorial into master
Reviewed-on: SteamWar/BungeeCore#317
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-22 09:28:15 +01:00
85017b1440 Merge branch 'master' into tutorial 2022-03-22 09:23:13 +01:00
364422af2f Tutorial release mechanism
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-22 09:21:15 +01:00
fe322ce93c Merge pull request 'Fix stuff' (#318) from RankedFix into master
Reviewed-on: SteamWar/BungeeCore#318
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-20 21:56:44 +01:00
a21acb6891 Merge branch 'master' into RankedFix 2022-03-20 21:55:19 +01:00
yoyosource
0881878aa5 Fix stuff 2022-03-20 21:54:33 +01:00
e2fd1754ce Fix some bugs + minor improvements
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-20 19:08:55 +01:00
58dd7486f7 Merge branch 'master' into tutorial 2022-03-20 16:19:53 +01:00
908e54fedd Server start refactoring, tutorial system
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-19 16:10:09 +01:00
5d7764fc15 Merge pull request 'Fix Ranked calculation' (#316) from RankedFix into master
Reviewed-on: SteamWar/BungeeCore#316
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-17 12:57:12 +01:00
yoyosource
19de4fd1d8 Fix Ranked calculation 2022-03-16 20:02:16 +01:00
87dbca480e Tutorial first steps
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 18:38:45 +01:00
6489ae51cf Merge pull request 'Fix Message again for the final time!' (#313) from ResourceBundles2.0 into master
Reviewed-on: SteamWar/BungeeCore#313
2022-03-16 16:38:45 +01:00
c08bfe75b9 Fix ConcurrentModificationException
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:30:38 +01:00
f04ccc6ea7 Fix emblems
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:25:43 +01:00
c0301a8014 Code simplification
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 16:24:19 +01:00
aeb78d06c1 Merge pull request 'Code cleanup, cache invalidation fixes' (#315) from userEloCleanup into master
Reviewed-on: SteamWar/BungeeCore#315
Reviewed-by: YoyoNow <jwsteam@nidido.de>
2022-03-16 15:05:04 +01:00
46499633d0 Code cleanup, cache invalidation fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-16 14:56:37 +01:00
yoyosource
9a1f067dcd Merge remote-tracking branch 'origin/ResourceBundles2.0' into ResourceBundles2.0 2022-03-15 19:05:20 +01:00
yoyosource
1f50bf15aa Fix Message 2022-03-15 19:05:08 +01:00
fe2097b68f Merge branch 'master' into ResourceBundles2.0 2022-03-15 18:51:42 +01:00
yoyosource
e038f807e9 Hotfix FightEndsHandler 2022-03-15 18:31:47 +01:00
yoyosource
1fd34f8ccd Update Message stuff 2022-03-15 18:12:55 +01:00
yoyosource
a78da0e2cf Update Message stuff 2022-03-15 18:00:28 +01:00
yoyosource
8ee960e002 Fix message 2022-03-15 17:54:10 +01:00
yoyosource
4df39ebe75 Fix Message again for the final time! 2022-03-15 17:53:50 +01:00
yoyosource
9accdb599e Fix Message again for the final time! 2022-03-15 17:18:16 +01:00
yoyosource
01b500e2e7 Fix Message again for the final time! 2022-03-15 17:16:08 +01:00
d32488a4b7 Merge pull request 'Update RankCommand' (#311) from Ranked into master
Reviewed-on: SteamWar/BungeeCore#311
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-15 15:14:11 +01:00
yoyosource
189c2e7f71 Merge remote-tracking branch 'origin/Ranked' into Ranked 2022-03-15 15:12:43 +01:00
yoyosource
7ccfef823c Update BungeeCore.properties 2022-03-15 15:12:32 +01:00
1fd55fde39 Merge branch 'master' into Ranked 2022-03-15 15:11:02 +01:00
9e0298bb68 Merge pull request 'Maybe fix resource bundle' (#312) from MaybeFixResouceBundle into master
Reviewed-on: SteamWar/BungeeCore#312
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-15 15:04:56 +01:00
yoyosource
6ddfe27ed1 Remove useless sout 2022-03-15 14:23:28 +01:00
yoyosource
9047c8ef6a Fix Message 2022-03-15 14:22:12 +01:00
080a9a9e34 Merge branch 'master' into MaybeFixResouceBundle 2022-03-15 13:27:45 +01:00
yoyosource
5df5d53c3e Merge branch 'master' into Ranked 2022-03-15 13:27:01 +01:00
yoyosource
641c165782 Fix emblem not being the highest 2022-03-15 13:25:37 +01:00
yoyosource
6f5a3c352f Fix emblem not being the highest 2022-03-15 13:23:37 +01:00
yoyosource
bd9e3e5d94 Maybe fix resource bundle 2022-03-15 11:40:20 +01:00
yoyosource
527576aa14 Fix UserElo 2022-03-15 11:26:21 +01:00
yoyosource
0d888dff1c Update RankCommand 2022-03-15 10:35:11 +01:00
yoyosource
5bcd094080 Update RankCommand 2022-03-15 10:19:18 +01:00
yoyosource
6a6e7046d6 Update RankCommand 2022-03-15 10:16:26 +01:00
23f8e687ad Fix Placement
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-15 10:03:00 +01:00
f8b0d13676 Fix String
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-15 10:00:47 +01:00
564732da28 Merge pull request 'Add RankCommand' (#310) from Ranked into master
Reviewed-on: SteamWar/BungeeCore#310
Reviewed-by: Lixfel <lixfel@steamwar.de>
2022-03-15 09:53:52 +01:00
ca4a0c2022 Fix class
Signed-off-by: Lixfel <agga-games@gmx.de>
2022-03-15 09:53:24 +01:00
265dfd4904 Merge branch 'master' into Ranked 2022-03-15 09:47:40 +01:00
yoyosource
0b08732817 Update UserElo 2022-03-15 09:47:27 +01:00