|
|
cb4cb1d6fe
|
Merge branch 'master' into items
SteamWarCI Build successful
# Conflicts:
# FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
|
2023-04-11 11:27:21 +02:00 |
|
|
|
6a2a7ff9f7
|
Merge pull request 'Unlimited preparation phase option' (#387) from unlimitedPrepare into master
SteamWarCI Build successful
Reviewed-on: #387
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-04-11 11:04:34 +02:00 |
|
|
|
70d4f96999
|
Unlimited preparation phase option
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-04-11 11:00:24 +02:00 |
|
|
|
98cd6f5b25
|
Remove delay
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 21:46:33 +01:00 |
|
|
|
896665a405
|
Fix NametagVisibility
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 21:14:19 +01:00 |
|
|
|
bdb708a7a8
|
Fix ReplayServer race condition
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 21:05:58 +01:00 |
|
|
|
301a51bcd9
|
Delay Team adding
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 20:43:47 +01:00 |
|
|
|
b9e87de241
|
Hotfix click recording
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 19:56:44 +01:00 |
|
|
|
5f7faabbff
|
Hotfix click recording
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-11 19:49:02 +01:00 |
|
|
|
cb9b757369
|
Fix Spectate Nametags
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-04 13:18:49 +01:00 |
|
|
|
e2e677c789
|
Fix Arenas below 0 in Replays
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-04 13:10:30 +01:00 |
|
|
|
b8199eb04d
|
Fix ConcurrentModificationException
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-04 12:10:33 +01:00 |
|
|
|
d7348befbc
|
Fix Nametags in Replay spectate mode
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-04 11:36:03 +01:00 |
|
|
|
ce94130343
|
Merge pull request 'Add spectate team to hide nametags' (#384) from spectate into master
SteamWarCI Build successful
Reviewed-on: #384
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-03-04 11:31:00 +01:00 |
|
|
|
10f8e597f8
|
Add spectate team to hide nametags
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-04 07:32:03 +01:00 |
|
|
|
75800e0033
|
Merge pull request 'Multiversion simplification & 1.19.3 compatibility' (#375) from 1.19.3 into master
SteamWarCI Build successful
Reviewed-on: #375
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-03-03 16:19:28 +01:00 |
|
|
|
410c9fd3d0
|
Fix getHandle
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-01 22:17:12 +01:00 |
|
|
|
34ff467261
|
Merge branch 'master' into 1.19.3
|
2023-03-01 20:32:36 +01:00 |
|
|
|
22c22bab87
|
Merge pull request 'Fix arena border, piston border, and y-Damage' (#383) from fixBordersAndDamage into master
SteamWarCI Build successful
Reviewed-on: #383
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
|
2023-03-01 20:06:13 +01:00 |
|
|
|
704f79a166
|
Fix arena border, piston border, and y-Damage
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-01 20:00:32 +01:00 |
|
|
|
ded764002f
|
Fix modifying other inventories in PersonalKitCreator
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-03-01 17:03:43 +01:00 |
|
|
|
1890471609
|
Fix Items bugs
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-28 12:55:00 +01:00 |
|
|
|
1ba94af239
|
Merge branch 'master' into items
|
2023-02-24 14:18:30 +01:00 |
|
|
|
4252339d0b
|
Hotfix FightSystem
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-24 10:48:18 +01:00 |
|
|
|
19e8a7994a
|
Merge pull request 'Change extend area downwards' (#382) from piston-extend-area into master
SteamWarCI Build successful
Reviewed-on: #382
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-02-17 14:56:48 +01:00 |
|
|
|
00d7a9567a
|
Increase period
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 11:02:23 +01:00 |
|
|
|
617246a211
|
Remove TODO
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 10:57:47 +01:00 |
|
|
|
6ea17557ea
|
Change extend area downwards
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 10:56:46 +01:00 |
|
|
|
0d3a4f3894
|
Merge pull request 'Prevent schem selection DOS' (#381) from prevent-spam into master
SteamWarCI Build successful
Reviewed-on: #381
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-02-17 10:29:56 +01:00 |
|
|
|
8ffa6296b1
|
Prevent schem selection DOS
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-17 10:24:58 +01:00 |
|
|
|
5b02e98c35
|
Debug HotbarKit
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-08 22:51:09 +01:00 |
|
|
|
f29bf025e6
|
Multiversion simplification & 1.19.3 compatibility
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-02-03 11:59:39 +01:00 |
|
|
|
fe915ba85d
|
Merge branch 'master' into items
SteamWarCI Build successful
# Conflicts:
# FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
|
2023-01-23 16:28:32 +01:00 |
|
|
|
239c0bf5f6
|
Fix 1.8 to 1.12 dispenser
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-01-22 22:19:53 +01:00 |
|
|
|
20e6501f68
|
Merge pull request 'Anti water in Dispenser' (#374) from BucketsInDispenser into master
SteamWarCI Build successful
Reviewed-on: #374
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-01-22 21:27:56 +01:00 |
|
MoBrot
|
b0c91b59fc
|
Anti water in Dispenser cleanup
SteamWarCI Build successful
|
2023-01-22 21:17:40 +01:00 |
|
MoBrot
|
914bf4f353
|
Anti water in Dispenser
SteamWarCI Build successful
|
2023-01-22 21:12:47 +01:00 |
|
|
|
eaf4305bd9
|
Merge pull request 'added arena afk stopper' (#372) from afk_stopper into master
SteamWarCI Build successful
Reviewed-on: #372
Reviewed-by: Lixfel <lixfel@steamwar.de>
|
2023-01-22 21:08:53 +01:00 |
|
|
|
14753ebe99
|
Merge branch 'master' into items
SteamWarCI Build successful
|
2023-01-20 12:02:07 +01:00 |
|
BuildTools
|
09adc97a20
|
added arena afk stopper
|
2023-01-18 21:37:04 +01:00 |
|
|
|
7dec79e022
|
Merge pull request 'Make use of CoreEntity' (#371) from coreEntity into master
SteamWarCI Build successful
Reviewed-on: #371
Reviewed-by: YoyoNow <jwsteam@nidido.de>
|
2023-01-15 19:13:03 +01:00 |
|
|
|
00d743d63e
|
Fix unintentional debug code
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-01-15 19:06:39 +01:00 |
|
|
|
f1b6fc8db9
|
Adjust CI config for new CI
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-01-15 12:05:10 +01:00 |
|
|
|
890e9eaed0
|
Make use of CoreEntity
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2023-01-15 12:04:12 +01:00 |
|
|
|
5ec0fc20e6
|
Fix schemId 0 with autoselected schem
SteamWarCI Build successful
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-12-14 16:00:49 +01:00 |
|
|
|
6d574bd89d
|
Merge pull request 'Adapt to CommonDB' (#366) from commonDB into master
SteamWarCI Build successful
Reviewed-on: #366
Reviewed-by: Chaoscaot <chaoscaot@zohomail.eu>
|
2022-10-29 12:44:19 +02:00 |
|
|
|
022264b1f5
|
Merge branch 'master' into commonDB
SteamWarCI Build successful
# Conflicts:
# FightSystem_Core/src/de/steamwar/fightsystem/record/PacketProcessor.java
|
2022-10-29 12:26:54 +02:00 |
|
|
|
f9984eb157
|
Merge remote-tracking branch 'origin/items' into items
SteamWarCI Build successful
# Conflicts:
# FightSystem_Core/src/de/steamwar/fightsystem/listener/Permanent.java
# FightSystem_Core/src/de/steamwar/fightsystem/utils/FlatteningWrapper.java
|
2022-10-24 10:43:37 +02:00 |
|
|
|
b909371fed
|
Reactivating items
Signed-off-by: Lixfel <agga-games@gmx.de>
|
2022-10-24 10:42:35 +02:00 |
|
|
|
cc079c1476
|
Merge pull request 'Hotfix FightTeam' (#368) from AmongUS into master
SteamWarCI Build successful
Reviewed-on: #368
|
2022-10-08 18:49:34 +02:00 |
|
