Commit Graph

5931 Commits

Author SHA1 Message Date
Evil Factory a88ad75645 Merge branch 'develop' 2025-09-17 08:36:43 -03:00
Evil Factory cfab935b75 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-09-17 08:30:35 -03:00
Joonas Rikkonen bad999d5fc Update bug-reports.yml 2025-09-17 13:45:40 +03:00
Regalis11 caa0326cf8 Release 1.10.5.0 - Autumn Update 2025 2025-09-17 13:44:21 +03:00
Joonas Rikkonen d13836ce87 Update bug-reports.yml 2025-08-28 11:47:29 +03:00
Joonas Rikkonen 513872c1b0 Update bug-reports.yml 2025-08-20 13:30:45 +03:00
EvilFactory ad837423a8 Merge branch 'develop' 2025-07-01 17:56:36 -03:00
EvilFactory b8fd8980a7 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-07-01 17:55:43 -03:00
Joonas Rikkonen 567cae1b19 Update bug-reports.yml 2025-07-01 11:41:46 +03:00
Regalis11 6661bb607b Release 1.9.8.0 - Summer Update Hotfix 1 2025-07-01 11:40:07 +03:00
EvilFactory f8b02b372c Run tests on dotnet version 8 too 2025-06-17 15:54:38 -03:00
EvilFactory a5d4d0c88e CI dotnet version 8.0 2025-06-17 15:52:34 -03:00
EvilFactory 2368640841 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-06-17 15:45:16 -03:00
Joonas Rikkonen fd34473640 Update bug-reports.yml 2025-06-17 16:39:59 +03:00
Regalis11 ea5a2bc693 Release 1.9.7.0 - Summer Update 2025 2025-06-17 16:38:11 +03:00
Ydrec 8af2267c53 Add ScriptClr convesion for GUITextBlock.ClickableArea.OnClickDelegate (#254) 2025-05-31 16:43:26 -03:00
Joonas Rikkonen 22227f13e5 Update bug-reports.yml 2025-05-13 14:52:23 +03:00
EvilFactory 90a1453755 Upgraded MonoMod.RuntimeDetour to 25.2.3 2025-05-04 10:12:15 -03:00
EvilFactory 64faf5c967 Merge branch 'master' of https://github.com/Regalis11/Barotrauma 2025-04-29 07:27:36 -03:00
Joonas Rikkonen 34b1049f94 Update bug-reports.yml 2025-04-29 12:47:17 +03:00
Regalis11 ec9e29af07 Release 1.8.8.1 - Calm Before the Storm Hotfix 1 2025-04-29 12:46:51 +03:00
EvilFactory 4916de359c Upgrade HarmonyX to 2.14.0 2025-04-18 19:33:03 -03:00
EvilFactory 5e321a5abd Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2025-04-16 18:08:37 -03:00
Joonas Rikkonen 6203171b6d Update bug-reports.yml 2025-04-16 13:04:07 +03:00
Regalis11 1deef20f21 Release 1.8.7.0 - Calm Before the Storm Hotfix 1 2025-04-16 12:46:39 +03:00
EvilFactory 3ac4ae992c Added new monomod dlls to refs 2025-04-10 16:00:25 -03:00
EvilFactory 126253d81d Trigger push 2025-04-10 11:34:53 -03:00
EvilFactory 5158f53786 guh 2025-04-10 11:23:27 -03:00
EvilFactory 9679880059 gotta be kidding me 2025-04-10 11:15:54 -03:00
EvilFactory ca3e99a095 Fixed CI 2025-04-10 11:07:29 -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 38cce0c933 Update bug-reports.yml 2025-04-10 14:37:29 +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 02e54090e8 Updated .gitignore 2025-04-07 17:14:07 +03:00
Markus Isberg c2705bc701 Updated .gitignore 2025-04-07 17:12:49 +03:00
EvilFactory fdfc3a77f3 HarmonyX 2025-04-04 09:59:38 -03:00
Joonas Rikkonen 6338c79410 Update bug-reports.yml 2025-04-04 15:17:35 +03:00
Markus Isberg f76095c2b2 New .gitignore additions
(cherry picked from commit c53cac841a)
2025-03-19 16:09:34 +02:00
Markus Isberg c53cac841a New .gitignore additions 2025-03-19 16:08:50 +02:00
Markus Isberg 1987d7f369 Unstable 1.8.4.1 2025-03-12 13:09:29 +00:00
Markus Isberg a4a3427e4e Unstable 1.8.4.0 2025-03-12 12:56:27 +00:00
Joonas Rikkonen fe87a65dbe Update bug-reports.yml 2025-02-28 09:57:52 +02:00
Joonas Rikkonen 8f0d89a88c Update bug-reports.yml 2025-01-29 17:00:54 +02:00
Joonas Rikkonen ffccd25ebd Update bug-reports.yml 2025-01-16 20:14:57 +02:00
EvilFactory 6da26ffa93 Merge remote-tracking branch 'upstream/master' into develop 2024-12-11 10:44:53 -03:00
Joonas Rikkonen 38ca721cb0 Update bug-reports.yml 2024-12-11 13:27:12 +02:00
Regalis11 f6349b2175 v1.7.7.0 (Winter Update 2024) 2024-12-11 13:26:13 +02:00
EvilFactory b4f264df04 Fixed destination path not being checked 2024-11-25 15:48:55 -03:00