Evil Factory
|
352625af28
|
Merge remote-tracking branch 'upstream/master'
|
2025-12-08 12:35:44 -03:00 |
|
Markus Isberg
|
598966f200
|
Release 1.11.4.1 (Winter Update)
|
2025-12-08 14:56:47 +00:00 |
|
Evil Factory
|
0d223636f6
|
Merge branch 'master' of https://github.com/regalis11/Barotrauma
|
2025-10-22 10:55:51 -03:00 |
|
Regalis11
|
7e25111487
|
Release 1.10.7.2 - Autumn Update 2025 Hotfix 4
|
2025-10-22 14:54:03 +03:00 |
|
Evil Factory
|
9799a2a97b
|
Merge remote-tracking branch 'upstream/master'
|
2025-10-10 08:41:26 -03:00 |
|
Markus Isberg
|
b732009056
|
Hotfix 1.10.7.1
|
2025-10-10 10:43:19 +00:00 |
|
Evil Factory
|
e902ba673d
|
Merge remote-tracking branch 'upstream/master'
|
2025-10-02 08:12:37 -03:00 |
|
Regalis11
|
6c1b18a56d
|
Release 1.10.7.0 - Autumn Update 2025 Hotfix 2
|
2025-10-02 12:31:41 +03:00 |
|
Evil Factory
|
da13162c60
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
|
2025-09-25 09:00:20 -03:00 |
|
Regalis11
|
b2d91cde7c
|
Release 1.10.6.0 - Autumn Update 2025 Hotfix 1
|
2025-09-25 11:11:35 +03:00 |
|
Evil Factory
|
cfab935b75
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-09-17 08:30:35 -03:00 |
|
Regalis11
|
caa0326cf8
|
Release 1.10.5.0 - Autumn Update 2025
|
2025-09-17 13:44:21 +03:00 |
|
EvilFactory
|
b8fd8980a7
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-07-01 17:55:43 -03:00 |
|
Regalis11
|
6661bb607b
|
Release 1.9.8.0 - Summer Update Hotfix 1
|
2025-07-01 11:40:07 +03:00 |
|
EvilFactory
|
2368640841
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-06-17 15:45:16 -03:00 |
|
Regalis11
|
ea5a2bc693
|
Release 1.9.7.0 - Summer Update 2025
|
2025-06-17 16:38:11 +03:00 |
|
EvilFactory
|
64faf5c967
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
|
2025-04-29 07:27:36 -03:00 |
|
Regalis11
|
ec9e29af07
|
Release 1.8.8.1 - Calm Before the Storm Hotfix 1
|
2025-04-29 12:46:51 +03:00 |
|
EvilFactory
|
5e321a5abd
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-04-16 18:08:37 -03:00 |
|
Regalis11
|
1deef20f21
|
Release 1.8.7.0 - Calm Before the Storm Hotfix 1
|
2025-04-16 12:46:39 +03:00 |
|
EvilFactory
|
546450712d
|
Fixed compiler errors
|
2025-04-10 10:55:39 -03:00 |
|
EvilFactory
|
103871a4e9
|
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
|
2025-04-10 10:37:09 -03:00 |
|
Markus Isberg
|
5762420f84
|
Merge branch 'dev'
# Conflicts:
# Barotrauma/BarotraumaClient/ClientSource/Characters/Animation/Ragdoll.cs
# Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs
# Barotrauma/BarotraumaClient/ClientSource/Characters/CharacterHUD.cs
# Barotrauma/BarotraumaClient/ClientSource/Characters/Jobs/JobPrefab.cs
# Barotrauma/BarotraumaClient/ClientSource/Characters/Limb.cs
# Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/TabMenu.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/TalentMenu.cs
# Barotrauma/BarotraumaClient/ClientSource/GameSession/RoundSummary.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemComponent.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/ItemContainer.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Components/Signal/Wire.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Submarine.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/ClientPeer.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/RespawnManager.cs
# Barotrauma/BarotraumaClient/ClientSource/Particles/Particle.cs
# Barotrauma/BarotraumaClient/ClientSource/Particles/ParticleEmitter.cs
# Barotrauma/BarotraumaClient/ClientSource/Physics/PhysicsBody.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/GameScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/LevelEditorScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/NetLobbyScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Sounds/SoundManager.cs
# Barotrauma/BarotraumaClient/ClientSource/Steam/WorkshopMenu/Mutable/InstalledTab.cs
# Barotrauma/BarotraumaClient/LinuxClient.csproj
# Barotrauma/BarotraumaClient/MacClient.csproj
# Barotrauma/BarotraumaClient/WindowsClient.csproj
# Barotrauma/BarotraumaServer/LinuxServer.csproj
# Barotrauma/BarotraumaServer/MacServer.csproj
# Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs
# Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
# Barotrauma/BarotraumaServer/ServerSource/Events/EventActions/ConversationAction.cs
# Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
# Barotrauma/BarotraumaServer/ServerSource/Networking/RespawnManager.cs
# Barotrauma/BarotraumaServer/ServerSource/Networking/ServerSettings.cs
# Barotrauma/BarotraumaServer/WindowsServer.csproj
# Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]Character override and variant tests/README.txt
# Barotrauma/BarotraumaShared/LocalMods/[DebugOnlyTest]Character override and variant tests/filelist.xml
# Barotrauma/BarotraumaShared/SharedSource/AchievementManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/EnemyAIController.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveCombat.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveDeconstructItem.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveOperateItem.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveReturn.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/AI/PetBehavior.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/CharacterInfo.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionHusk.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Jobs/JobPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs
# Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackage/ContentPackage.cs
# Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs
# Barotrauma/BarotraumaShared/SharedSource/DisembarkPerks/DisembarkPerkPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Enums.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/ConversationAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCChangeTeamAction.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/Missions/AbandonedOutpostMission.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs
# Barotrauma/BarotraumaShared/SharedSource/Events/MonsterEvent.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/AutoItemPlacer.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/GeneticMaterial.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/Holdable.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/LocationType.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerator.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineInfo.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/WayPoint.cs
# Barotrauma/BarotraumaShared/SharedSource/Networking/EntitySpawner.cs
# Barotrauma/BarotraumaShared/SharedSource/Networking/NetworkMember.cs
# Barotrauma/BarotraumaShared/SharedSource/Networking/RespawnManager.cs
# Barotrauma/BarotraumaShared/SharedSource/PerformanceCounter.cs
# Barotrauma/BarotraumaShared/SharedSource/Serialization/XMLExtensions.cs
# Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
# Barotrauma/BarotraumaShared/SharedSource/Tags.cs
# Barotrauma/BarotraumaShared/SharedSource/Text/TextManager.cs
# Barotrauma/BarotraumaShared/changelog.txt
|
2025-04-10 14:35:30 +03:00 |
|
Markus Isberg
|
14f61af41c
|
Release 1.8.6.2 - Calm Before the Storm
|
2025-04-10 11:29:43 +00: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
|
d71ced9d05
|
Merge https://github.com/Regalis11/Barotrauma into develop
|
2024-08-28 12:57:31 -03:00 |
|
Regalis11
|
e8920829c9
|
v1.5.9.2 (Summer Update Hotfix 3)
|
2024-08-28 12:14:27 +03:00 |
|
EvilFactory
|
55e97a8baa
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-06-27 10:52:55 -03:00 |
|
Regalis11
|
4f556236b8
|
v1.5.9.1 (Summer Update Hotfix 2)
|
2024-06-27 16:46:33 +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
|
b98dec4c3b
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-04-26 12:31:21 -03:00 |
|
itchyOwl
|
848113b8cb
|
v1.4.5.0 (Blood in the Water Hotfix)
|
2024-04-26 17:03:10 +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 |
|
Regalis11
|
89b91d1c3e
|
Merge branch 'master' into dev
# Conflicts:
# Barotrauma/BarotraumaClient/ClientSource/Characters/Character.cs
# Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
# Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs
# Barotrauma/BarotraumaClient/ClientSource/Items/Item.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/Map/Radiation.cs
# Barotrauma/BarotraumaClient/ClientSource/Map/MapEntity.cs
# Barotrauma/BarotraumaClient/ClientSource/Networking/ServerList/ServerInfo.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/MainMenuScreen/MainMenuScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs
# Barotrauma/BarotraumaClient/ClientSource/Serialization/SerializableEntityEditor.cs
# Barotrauma/BarotraumaClient/ClientSource/Settings/SettingsMenu.cs
# Barotrauma/BarotraumaClient/ClientSource/SpamServerFilter.cs
# Barotrauma/BarotraumaClient/ClientSource/Sprite/Sprite.cs
# Barotrauma/BarotraumaClient/ClientSource/Steam/Lobby.cs
# Barotrauma/BarotraumaClient/LinuxClient.csproj
# Barotrauma/BarotraumaClient/MacClient.csproj
# Barotrauma/BarotraumaClient/WindowsClient.csproj
# Barotrauma/BarotraumaServer/LinuxServer.csproj
# Barotrauma/BarotraumaServer/MacServer.csproj
# Barotrauma/BarotraumaServer/ServerSource/GameMain.cs
# Barotrauma/BarotraumaServer/ServerSource/Steam/SteamManager.cs
# Barotrauma/BarotraumaServer/ServerSource/Traitors/TraitorManager.cs
# Barotrauma/BarotraumaServer/WindowsServer.csproj
# Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/HumanoidAnimController.cs
# Barotrauma/BarotraumaShared/SharedSource/Characters/Animation/Ragdoll.cs
# Barotrauma/BarotraumaShared/SharedSource/DebugConsole.cs
# Barotrauma/BarotraumaShared/SharedSource/Extensions/IEnumerableExtensions.cs
# Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
# Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
# Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
# Barotrauma/BarotraumaShared/SharedSource/Serialization/Editable/ConditionallyEditable.cs
# Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs
# Barotrauma/BarotraumaShared/changelog.txt
# Libraries/BarotraumaLibs/BarotraumaCore/Utils/MathUtils.cs
|
2024-04-24 17:38:13 +03:00 |
|
EvilFactory
|
ac69537784
|
Merge remote-tracking branch 'upstream/master' into develop
|
2024-04-16 12:20:09 -03:00 |
|
Regalis11
|
536346da11
|
v1.3.0.4
|
2024-04-16 18:00:23 +03:00 |
|