55e97a8baa
Merge remote-tracking branch 'upstream/master' into develop
2024-06-27 10:52:55 -03:00
4f556236b8
v1.5.9.1 (Summer Update Hotfix 2)
2024-06-27 16:46:33 +03:00
e163f7ed73
Merge remote-tracking branch 'upstream/master' into develop
2024-06-18 12:19:13 -03:00
230d1b6e78
v1.5.7.0 (Summer Update)
2024-06-18 16:50:02 +03:00
c518b696f6
Merge remote-tracking branch 'upstream/master' into develop
2024-05-02 12:25:49 -03:00
0a0a9784c5
Blood in the Water Hotfix 2 - 1.4.6.0
2024-05-02 14:08:04 +03:00
b98dec4c3b
Merge remote-tracking branch 'upstream/master' into develop
2024-04-26 12:31:21 -03:00
848113b8cb
v1.4.5.0 (Blood in the Water Hotfix)
2024-04-26 17:03:10 +03:00
0a9ff43986
Merge remote-tracking branch 'upstream/master' into develop
2024-04-24 12:20:11 -03:00
ff1b8951a7
v1.4.4.1 (Blood in the Water Update)
2024-04-24 18:09:05 +03:00
7a74cd052f
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2024-03-28 14:26:18 -03:00
3791670c42
v1.3.0.1 (Epic Store release)
2024-03-28 18:34:33 +02:00
b3ac01cb22
Remove all uses of the Cs Package now that we don't need it anymore
...
LuaCs Settings no longer uses LuaCsConfig
Cs Package is no longer is used for enabling CSharp Scripting (except for dedicated server, to not make those people confused)
Added popups for when you have CSharp mods enabled but don't have CSharp enabled when going to singleplayer/multiplayer
2024-03-19 19:03:32 -03:00
2ebaa72a12
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-12-20 11:34:03 -03:00
ada8d6f260
v1.2.7.0 (Winter Update hotfix)
2023-12-20 15:00:42 +02:00
448e4cdfbb
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-12-14 11:56:39 -03:00
b91e85559d
v1.2.6.0 (Winter Update)
2023-12-14 16:11:27 +02:00
b841dee7ad
Fixed Initialize being called instead of CheckInitialized if you downloaded mods from the mod screen
2023-11-06 20:28:24 -03:00
d0dd49b70b
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
2023-10-20 12:20:18 -03:00
6cc82976a1
Hotfix 1.1.18.1
2023-10-20 18:05:28 +03:00
7f311a6526
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
2023-10-19 13:36:40 -03:00
df7e8f1625
v1.1.18.0 (Treacherous Tides Update)
2023-10-19 19:28:43 +03:00
9838cc59ee
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-10-19 12:18:30 -03:00
34ffc520cc
v1.1.18.0 (Treacherous Tides Update)
2023-10-19 17:18:51 +03:00
cf8f0de659
Unstable 1.1.14.0
2023-10-02 16:43:54 +03:00
15daa64f66
Merge https://github.com/Regalis11/Barotrauma into develop
2023-06-15 12:13:50 -03:00
94f5a93a0c
Merge remote-tracking branch 'origin/master' into dev
...
# Conflicts:
# Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
# Barotrauma/BarotraumaClient/ClientSource/Events/EventManager.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/CrewManagement.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/MedicalClinicUI.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/SubmarineSelection.cs
# Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/CampaignMode.cs
# Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs
# Barotrauma/BarotraumaClient/ClientSource/GameSession/RoundSummary.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/Door.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/Projectile.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Lights/ConvexHull.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightManager.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightSource.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/Voting.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs
# Barotrauma/BarotraumaClient/LinuxClient.csproj
# Barotrauma/BarotraumaClient/MacClient.csproj
# Barotrauma/BarotraumaClient/WindowsClient.csproj
# Barotrauma/BarotraumaServer/LinuxServer.csproj
# Barotrauma/BarotraumaServer/MacServer.csproj
# Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
# Barotrauma/BarotraumaServer/ServerSource/GameSession/MedicalClinic.cs
# Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs
# Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
# Barotrauma/BarotraumaServer/ServerSource/Utils/DoSProtection.cs
# Barotrauma/BarotraumaServer/WindowsServer.csproj
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveContainItem.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveIdle.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/ShipCommand/ShipIssueWorkerOperateWeapons.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs
# Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackageManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Enums.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MissionAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCChangeTeamAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCFollowAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCWaitAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerator.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineBody.cs
# Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs
# Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs
# Barotrauma/BarotraumaShared/SharedSource/StatusEffects/PropertyConditional.cs
# Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
# Barotrauma/BarotraumaShared/changelog.txt
2023-06-15 16:55:39 +03:00
83de72e3d2
v1.0.20.1 (summer patch)
2023-06-15 16:46:54 +03:00
09c36a9213
Merge https://github.com/Regalis11/Barotrauma into develop
2023-05-11 11:22:12 -03:00
e5ef2adc55
v1.0.13.2
2023-05-11 16:39:23 +03:00
2c45c3d020
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-05-10 11:55:46 -03:00
ee1db852b1
v1.0.13.1 (first post-1.0 patch)
2023-05-10 15:07:17 +03:00
9470edead3
Build 1.1.4.0
2023-03-31 18:40:44 +03:00
4a229c6427
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-03-13 13:32:14 -03:00
bf73ddb6c3
v1.0.7.0 (Full Release)
2023-03-13 10:30:37 +02:00
2c5a7923b0
Faction Test v1.0.1.0
2023-02-16 15:01:28 +02:00
d60efb17cd
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-01-31 13:17:15 -03:00
cf9ecd35b3
Build 0.21.6.0 (1.0 pre-patch)
2023-01-31 18:08:26 +02:00
25fa5a9552
Build 0.21.6.0
2023-01-31 18:01:29 +02:00
697ec52120
Build 0.21.1.0
2023-01-13 18:10:35 +02:00
caa5a2f762
Faction Test 100.13.0.0
2023-01-11 15:36:23 +02:00
82934cf9ed
Added popups telling you to run CSharp when joining a server with CSharp mods enabled but without the Cs package
2022-12-29 15:58:51 -03:00
c665d3e9c7
Added settings that allow you to force turn on CSharp, treat forced mods as normal and allow for the workshop lua setup to be the preferred one
2022-12-29 15:58:51 -03:00
5807900556
Merge https://github.com/Regalis11/Barotrauma into develop
2022-12-20 12:29:13 -03:00
b8fa677148
Build 0.20.16.1
2022-12-20 17:05:53 +02:00
90c3cef977
Merge remote-tracking branch 'upstream/dev' into develop
2022-12-09 17:33:44 -03:00
e0c3754621
Faction Test 100.10.0.0
2022-12-07 17:46:02 +02:00
a10cc13566
Build 0.20.11.0
2022-12-07 17:40:58 +02:00
55e1d3560a
Faction Test 100.9.0.0
2022-12-05 19:55:31 +02:00
9d2f160314
Build 0.20.10.0
2022-12-05 19:48:59 +02:00
EvilFactory
Regalis11
Markus Isberg
itchyOwl
Markus Isberg