SteamWar/SteamWar
11
2
Fork 0
Code Issues 76 Pull Requests 10 Packages Projects 3 Releases Wiki Activity
1,249 Commits 24 Branches 0 Tags
63a5fcff9711321c8e414ec79e24fe8c3604ca62
Commit Graph

1249 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YoyoNow
cb54591ad9 Merge pull request 'Add team changecolor command alias' (#42) from VelocityCore/TeamChangecolor into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/42
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-09-16 18:01:31 +02:00
YoyoNow
9dcd0cce43 Merge branch 'main' into VelocityCore/TeamChangecolor 2024-09-16 18:00:40 +02:00
Chaoscaot
35d812b280 Fix Discord Ticket Log 2024-09-03 00:34:07 +02:00
Chaoscaot
a1e1396bdb Fix Discord Ticket Log 2024-08-31 20:17:02 +02:00
TheBreadBeard
a64f6292e9 Add team changecolor command alias 2024-08-30 11:00:56 +02:00
YoyoNow
2142ed2f97 Hotfix DiscordBot 2024-08-30 08:41:37 +02:00
YoyoNow
6560562b05 Hotfix DiscordBot? 2024-08-30 08:39:57 +02:00
YoyoNow
6222f76417 Hotfix DiscordBot 2024-08-30 08:33:05 +02:00
YoyoNow
1f908134a1 Hotfix DiscordBot 2024-08-30 08:31:29 +02:00
TheBreadBeard
04d9f38f7d Add team changecolor command alias 2024-08-29 22:53:22 +02:00
TheBreadBeard
94502a1567 Add npc chat messages 2024-08-29 22:40:05 +02:00
Chaoscaot
4edc59ba66 Add translations 2024-08-29 22:33:54 +02:00
Lixfel
46ee20ad1b Merge pull request 'Add DiscordTicketType.SCHEMATIC' (#40) from VelocityCore/SchematicReportDiscord into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/40
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-29 22:19:25 +02:00
TheBreadBeard
52302dd284 Add DiscordTicketType.SCHEMATIC 2024-08-29 22:09:43 +02:00
Lixfel
e1769a42f4 DummyAI only Test arenas 2024-08-29 13:58:27 +02:00
YoyoNow
1b10063e30 Merge pull request 'Add SimulatorCommand.rename' (#38) from BauSystem/SimulatorRename into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/38
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-29 12:55:43 +02:00
YoyoNow
bd389a7a7e Merge remote-tracking branch 'origin/BauSystem/SimulatorRename' into BauSystem/SimulatorRename 2024-08-29 11:32:40 +02:00
YoyoNow
ac25dea08a Fix PR stuff 2024-08-29 11:32:34 +02:00
YoyoNow
e0d964bdd7 Merge pull request 'Fix Loader wait time to be 2 gameticks when 1 is selected' (#39) from BauSystem/LoaderWaitTime into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/39
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-29 10:12:22 +02:00
Chaoscaot
c11eaaee45 Fixes... 2024-08-27 21:34:18 +02:00
YoyoNow
baf837946e Merge pull request 'Fix output on to small/large speed value' (#37) from BauSystem/SpeedCommand into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/37
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-27 20:16:44 +02:00
YoyoNow
5f92d4c68c Fix Loader wait time to be 2 gameticks when 1 is selected 2024-08-27 20:16:30 +02:00
YoyoNow
6496f33a9e Fix argument name of rename command 2024-08-26 07:44:54 +02:00
YoyoNow
9e2f2748b6 BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/SpeedCommand.java aktualisiert 2024-08-26 07:42:47 +02:00
YoyoNow
a25e55ffdf Fix Loader wait time to be 2 gameticks when 1 is selected 2024-08-25 15:49:21 +02:00
YoyoNow
c8381413a3 Add SimulatorCommand.rename 2024-08-25 15:46:03 +02:00
YoyoNow
c61c2d8087 Fix output on to small/large speed value 2024-08-25 15:34:07 +02:00
YoyoNow
18cb7157d7 Merge remote-tracking branch 'origin/main' 2024-08-25 08:04:28 +02:00
YoyoNow
ea929e0615 Hotfix Laufbau BoundingBoxLoader 2024-08-25 08:04:22 +02:00
Lixfel
42dd4160ea Merge pull request 'Update to Discord JDA 5.0' (#22) from dc-5 into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/22
 2024-08-23 11:41:40 +02:00
Chaoscaot
cab12fca92 Merge branch 'main' into Backend/init 2024-08-23 11:40:04 +02:00
YoyoNow
a75a1e8e10 Hotfix WorldEditSelectionSaver 2024-08-22 17:01:53 +02:00
Chaos
d5398cbde2 Remove redundant checks 2024-08-22 11:17:17 +02:00
Chaos
12b16d6801 Merge branch 'main' into dc-5 2024-08-22 11:10:41 +02:00
Lixfel
c5f40f0911 Merge pull request 'Add CRIUSleepEvent and CRIUWakeupEvent' (#34) from CRIUSupport/Events into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/34
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-22 10:55:33 +02:00
Lixfel
9b66df1e08 Merge pull request 'Fix WorldEditSelectionSaver finally' (#35) from BauSystem/SelectionSaverTheLast into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/35
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-22 10:40:37 +02:00
YoyoNow
20acd7abbe Fix WorldEditSelectionSaver finally 2024-08-21 21:15:00 +02:00
YoyoNow
49fa6c364f Hotfix WorldEditUtils.getVertices 2024-08-21 21:07:25 +02:00
YoyoNow
56cbb41930 Merge pull request 'Add WorldEditSelectionSaver' (#32) from BauSystem/WorldEditSelectionSaver into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/32
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-21 20:55:58 +02:00
YoyoNow
fde70029c5 Fix WorldEditUtils.setVertices 2024-08-21 20:55:03 +02:00
YoyoNow
42fd35077b Fix PR stuff 2024-08-21 20:31:21 +02:00
YoyoNow
76aa61934c Add CRIUSleepEvent and CRIUWakeupEvent 
Fix AFKStopperListener
 2024-08-21 20:27:36 +02:00
YoyoNow
f375aa68b5 Fix things 2024-08-21 18:26:33 +02:00
YoyoNow
b2ff042e4a Merge pull request 'Fix SpecialItem.getRandomItem' (#33) from MissileWars/FixItemGive into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/33
Reviewed-by: Lixfel <lixfel@steamwar.de>
 2024-08-21 18:21:28 +02:00
YoyoNow
6a2a3314c6 Fix SpecialItem.getRandomItem 2024-08-21 11:04:28 +02:00
YoyoNow
007f0796ae Add WorldEditSelectionSaver 2024-08-21 10:59:09 +02:00
Lixfel
9203e84d46 Merge pull request 'Fix Badlion restrictions' (#27) from VelocityCore/BadlionRestrictions into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/27
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-20 08:14:31 +02:00
Chaoscaot
cca8bdaab7 Merge branch 'main' into Backend/init 2024-08-18 23:11:20 +02:00
YoyoNow
5e1338a9f3 Merge pull request 'fix(BauSystem): Fix trace serialisation (#7)' (#12) from wip/#7-fix-eof-in-trace-reader into main 
Reviewed-on: https://steamwar.de/devlabs/SteamWar/SteamWar/pulls/12
Reviewed-by: YoyoNow <jwsteam@nidido.de>
 2024-08-18 21:00:57 +02:00
D4rkr34lm
50175b2518 Fixed access 2024-08-18 20:53:36 +02:00