 EvilFactory
|
103871a4e9
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-04-10 10:37:09 -03:00 |
|
 Markus Isberg
|
a4a3427e4e
|
Unstable 1.8.4.0
|
2025-03-12 12:56:27 +00:00 |
|
|
EvilFactory
|
6da26ffa93
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-12-11 10:44:53 -03:00 |
|
 Regalis11
|
f6349b2175
|
v1.7.7.0 (Winter Update 2024)
|
2024-12-11 13:26:13 +02:00 |
|
|
EvilFactory
|
9e9ac6cd32
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-10-31 06:31:11 -03:00 |
|
|
Regalis11
|
26ffd2104e
|
v1.6.19.1 (Unto the Breach Hotfix 1)
|
2024-10-31 11:27:32 +02:00 |
|
|
EvilFactory
|
d906066425
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-10-28 10:10:02 -03:00 |
|
|
Regalis11
|
7eac44ea7d
|
v1.6.18.1 (Unto the Breach Hotfix 1)
|
2024-10-28 15:03:46 +02:00 |
|
|
EvilFactory
|
30a8f0c561
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-10-22 12:42:35 -03:00 |
|
|
Regalis11
|
6e6c17e100
|
v1.6.17.0 (Unto the Breach update)
|
2024-10-22 17:29:04 +03:00 |
|
|
EvilFactory
|
f4219b0c75
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-06-19 12:45:44 -03:00 |
|
|
Regalis11
|
169eced79a
|
v1.5.7.0 (Summer Update Hotfix 1)
|
2024-06-19 18:42:16 +03:00 |
|
|
EvilFactory
|
e163f7ed73
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-06-18 12:19:13 -03:00 |
|
|
Regalis11
|
230d1b6e78
|
v1.5.7.0 (Summer Update)
|
2024-06-18 16:50:02 +03:00 |
|
|
EvilFactory
|
c518b696f6
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-05-02 12:25:49 -03:00 |
|
 Markus Isberg
|
0a0a9784c5
|
Blood in the Water Hotfix 2 - 1.4.6.0
|
2024-05-02 14:08:04 +03:00 |
|
|
EvilFactory
|
0a9ff43986
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-04-24 12:20:11 -03:00 |
|
|
Regalis11
|
ff1b8951a7
|
v1.4.4.1 (Blood in the Water Update)
|
2024-04-24 18:09:05 +03:00 |
|
|
EvilFactory
|
7a74cd052f
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2024-03-28 14:26:18 -03:00 |
|
|
Regalis11
|
3791670c42
|
v1.3.0.1 (Epic Store release)
|
2024-03-28 18:34:33 +02:00 |
|
|
EvilFactory
|
2ebaa72a12
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-12-20 11:34:03 -03:00 |
|
|
Regalis11
|
ada8d6f260
|
v1.2.7.0 (Winter Update hotfix)
|
2023-12-20 15:00:42 +02:00 |
|
|
EvilFactory
|
448e4cdfbb
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-12-14 11:56:39 -03:00 |
|
|
Regalis11
|
b91e85559d
|
v1.2.6.0 (Winter Update)
|
2023-12-14 16:11:27 +02:00 |
|
|
EvilFactory
|
759f66cf9f
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-10-30 12:40:09 -03:00 |
|
|
Regalis11
|
a8f9c97dda
|
v1.1.19.3 (Treacherous Tides Hotfix 2)
|
2023-10-30 17:38:29 +02:00 |
|
|
EvilFactory
|
7f311a6526
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
|
2023-10-19 13:36:40 -03:00 |
|
|
Regalis11
|
df7e8f1625
|
v1.1.18.0 (Treacherous Tides Update)
|
2023-10-19 19:28:43 +03:00 |
|
|
EvilFactory
|
a65d99021c
|
Fixed merge and some errors
|
2023-10-19 12:53:49 -03:00 |
|
|
EvilFactory
|
9838cc59ee
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-10-19 12:18:30 -03:00 |
|
|
Regalis11
|
34ffc520cc
|
v1.1.18.0 (Treacherous Tides Update)
|
2023-10-19 17:18:51 +03:00 |
|
|
Markus Isberg
|
12e43d95ef
|
Unstable 1.1.15.0
|
2023-10-05 14:55:53 +03:00 |
|
|
Markus Isberg
|
cf8f0de659
|
Unstable 1.1.14.0
|
2023-10-02 16:43:54 +03:00 |
|
|
EvilFactory
|
6b149e0498
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
|
2023-06-21 10:36:16 -03:00 |
|
|
Regalis11
|
d6a886bf6b
|
v1.0.21.0 (summer patch hotfix)
|
2023-06-21 16:14:31 +03:00 |
|
|
EvilFactory
|
a318e2a0c4
|
Fixed compile error
|
2023-06-15 12:32:26 -03:00 |
|
|
EvilFactory
|
15daa64f66
|
Merge https://github.com/Regalis11/Barotrauma into develop
|
2023-06-15 12:13:50 -03:00 |
|
|
Regalis11
|
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 |
|
 itchyOwl
|
83de72e3d2
|
v1.0.20.1 (summer patch)
|
2023-06-15 16:46:54 +03:00 |
|
|
EvilFactory
|
2c45c3d020
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-05-10 11:55:46 -03:00 |
|
|
Regalis11
|
ee1db852b1
|
v1.0.13.1 (first post-1.0 patch)
|
2023-05-10 15:07:17 +03:00 |
|
|
EvilFactory
|
e2a70f3b4a
|
Merge https://github.com/Regalis11/Barotrauma into develop
|
2023-04-12 11:44:22 -03:00 |
|
|
Regalis11
|
f8af8db91a
|
v1.0.9.0 (2nd hotfix)
|
2023-04-12 15:42:35 +03:00 |
|
|
Markus Isberg
|
9470edead3
|
Build 1.1.4.0
|
2023-03-31 18:40:44 +03:00 |
|
|
EvilFactory
|
4a229c6427
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-03-13 13:32:14 -03:00 |
|
|
Regalis11
|
bf73ddb6c3
|
v1.0.7.0 (Full Release)
|
2023-03-13 10:30:37 +02:00 |
|
|
Regalis11
|
2c5a7923b0
|
Faction Test v1.0.1.0
|
2023-02-16 15:01:28 +02:00 |
|
|
EvilFactory
|
d60efb17cd
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-01-31 13:17:15 -03:00 |
|
|
Regalis11
|
cf9ecd35b3
|
Build 0.21.6.0 (1.0 pre-patch)
|
2023-01-31 18:08:26 +02:00 |
|
|
Markus Isberg
|
25fa5a9552
|
Build 0.21.6.0
|
2023-01-31 18:01:29 +02:00 |
|