 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
|
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
|
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 |
|
 Markus Isberg
|
fb5ea537bf
|
Unstable 1.2.4.0
|
2023-11-30 13:53:00 +02:00 |
|
|
Markus Isberg
|
8a2e2ea0ae
|
Unstable 1.2.1.0
|
2023-11-10 17:45:19 +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
|
9838cc59ee
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2023-10-19 12:18:30 -03:00 |
|
|
Markus Isberg
|
cf8f0de659
|
Unstable 1.1.14.0
|
2023-10-02 16:43:54 +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 |
|
 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
|
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 |
|
|
Markus Isberg
|
697ec52120
|
Build 0.21.1.0
|
2023-01-13 18:10:35 +02:00 |
|
|
Markus Isberg
|
caa5a2f762
|
Faction Test 100.13.0.0
|
2023-01-11 15:36:23 +02:00 |
|
|
EvilFactory
|
90c3cef977
|
Merge remote-tracking branch 'upstream/dev' into develop
|
2022-12-09 17:33:44 -03:00 |
|
|
Markus Isberg
|
6f788fb8b4
|
Build 0.20.12.0
|
2022-12-09 20:08:36 +02:00 |
|
|
Markus Isberg
|
1650735468
|
Faction Test 100.11.0.0
|
2022-12-09 20:08:17 +02:00 |
|
|
Markus Isberg
|
df805574c4
|
Build 0.20.8.0
|
2022-11-25 19:56:30 +02:00 |
|
|
Markus Isberg
|
0057f5bfce
|
Faction Test 100.6.0.0
|
2022-11-25 19:55:45 +02:00 |
|
|
Markus Isberg
|
c772b61fc1
|
Faction Test 100.4.0.0
|
2022-11-14 18:28:28 +02:00 |
|
|
Markus Isberg
|
edaf4b09fe
|
Build 0.20.0.0
|
2022-10-27 17:54:57 +03:00 |
|
|
EvilFactory
|
77c63541eb
|
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma into unstable
|
2022-09-29 12:13:55 -03:00 |
|
 Juan Pablo Arce
|
3f2c843247
|
Unstable v0.19.3.0
|
2022-09-02 15:10:56 -03:00 |
|
 Evil Factory
|
7a09711296
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git
|
2022-06-15 13:26:49 -03:00 |
|
|
Markus Isberg
|
d4f6f4cf88
|
Build 0.18.1.0
|
2022-05-13 22:55:07 +09:00 |
|
|
Markus Isberg
|
7547a9b78a
|
Build 0.18.0.0
|
2022-05-13 00:55:52 +09:00 |
|
|
Evil Factory
|
ccf5600ad1
|
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests
|
2022-04-08 12:52:28 -03:00 |
|
|
Markus Isberg
|
c1b8e5a341
|
Unstable 0.17.4.0
|
2022-03-30 00:08:09 +09:00 |
|
|
Evil Factory
|
61b8c132eb
|
fix signalReceived hook not working correctly
|
2022-03-24 13:33:01 -03:00 |
|
|
Markus Isberg
|
6d410cc1b7
|
Unstable 0.17.1.0
|
2022-03-17 01:25:04 +09:00 |
|
|
Markus Isberg
|
3974067915
|
Unstable 0.17.0.0
|
2022-02-26 02:43:01 +09:00 |
|
|
Evil Factory
|
6340304ae4
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git
|
2022-02-24 14:30:39 -03:00 |
|
|
Markus Isberg
|
b259af5911
|
Unstable 0.16.1.0
|
2022-01-27 00:30:32 +09:00 |
|
|
Markus Isberg
|
7d6421a548
|
Unstable 0.16.0.0
|
2022-01-14 01:28:24 +09:00 |
|
|
Evil Factory
|
24f63c78cb
|
fix errors
|
2021-12-15 15:35:10 -03:00 |
|
|
Evil Factory
|
bb1631a21c
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master
|
2021-12-15 14:45:31 -03:00 |
|
|
Juan Pablo Arce
|
617d9ede88
|
Unstable v0.15.17.0 (Hex is out of town edition)
|
2021-12-03 13:31:10 -03:00 |
|
|
Markus Isberg
|
80f39cd2a3
|
Unstable 0.15.15.0 (and the one before it I forgor)
|
2021-11-18 21:34:30 +09:00 |
|
|
Evil Factory
|
bae2390eb1
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git into Regalis11-master
|
2021-10-27 14:41:47 -03:00 |
|