 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 |
|
|
EvilFactory
|
fdfc3a77f3
|
HarmonyX
|
2025-04-04 09:59:38 -03: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 |
|
|
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
|
b4f264df04
|
Fixed destination path not being checked
|
2024-11-25 15:48:55 -03: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
|
6ab0e7bee4
|
Fixed IsRunningInsideWorkshop check being inverted
|
2024-10-29 18:18:19 -03: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
|
0daaaf9fca
|
Fixed character.giveJobItems being in the wrong order due to the merge
|
2024-10-26 13:51:56 -03:00 |
|
|
EvilFactory
|
0cf0fce4d9
|
Don't run network test if we don't have the Content folder present
|
2024-10-22 14:33:29 -03:00 |
|
|
EvilFactory
|
32525b5676
|
Fixed broken tests
|
2024-10-22 14:12:44 -03:00 |
|
|
EvilFactory
|
14d3402b8d
|
Fixes for the new update
|
2024-10-22 13:02:59 -03: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
|
3e4b649162
|
Update moonsharp and move extension methods to register Lua file
|
2024-10-07 19:22:24 -03:00 |
|
|
EvilFactory
|
068d49f9c5
|
Register Lua conversion for Character,Character
|
2024-10-04 18:39:29 -03:00 |
|
|
EvilFactory
|
01207c86ff
|
Make NetworkConnection.TimeoutThreshold non constant
|
2024-09-11 21:36:00 -03:00 |
|
|
EvilFactory
|
307c81c3bd
|
Fixed lag caused by character.damageLimb
|
2024-09-06 18:58:08 -03:00 |
|
|
EvilFactory
|
0657efce21
|
Fixed compile error
|
2024-08-28 13:09:33 -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
|
a823eabea2
|
Make everything in NetConfig static instead of constant so mods can change it
|
2024-08-27 22:16:38 -03:00 |
|
|
EvilFactory
|
8d3d01c9e3
|
Added LuaUserData.HasMember and made CreateStatic automatically add call metatable if it the type has a constructor
|
2024-08-08 19:30:41 -03:00 |
|
|
EvilFactory
|
496ce0fb91
|
Added FarseerCollision stuff to default register
|
2024-08-08 18:53:25 -03:00 |
|
|
EvilFactory
|
6e622162e9
|
Revert "Upgrade Harmony to 2.3.3 (will revert if it causes issues)"
This reverts commit 071bfa2032.
|
2024-08-01 20:06:02 -03:00 |
|
|
EvilFactory
|
071bfa2032
|
Upgrade Harmony to 2.3.3 (will revert if it causes issues)
|
2024-08-01 18:19:07 -03:00 |
|
|
EvilFactory
|
03f1ec4c1d
|
Added GUIContextMenu and ContextMenuOption
|
2024-07-03 12:04:41 -03:00 |
|
|
EvilFactory
|
490ff655f3
|
CrewManagement -> HRManagerUI
|
2024-06-27 11:41:52 -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
|
91cc7dd1cd
|
Fixed compiler errors and project files
|
2024-06-18 12:41:37 -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
|
757a7a1c37
|
Treat forced mods as normal is true by default
|
2024-05-23 13:07:58 -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
|
bfca2816c3
|
Added enum CanEnterSubmarine
|
2024-04-25 06:33:19 -03:00 |
|
|
EvilFactory
|
079b0c3648
|
Fixed merge errors
|
2024-04-24 12:34:59 -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 |
|