55e97a8baa
Merge remote-tracking branch 'upstream/master' into develop
2024-06-27 10:52:55 -03:00
4f556236b8
v1.5.9.1 (Summer Update Hotfix 2)
2024-06-27 16:46:33 +03:00
f4219b0c75
Merge remote-tracking branch 'upstream/master' into develop
2024-06-19 12:45:44 -03:00
169eced79a
v1.5.7.0 (Summer Update Hotfix 1)
2024-06-19 18:42:16 +03:00
e163f7ed73
Merge remote-tracking branch 'upstream/master' into develop
2024-06-18 12:19:13 -03:00
230d1b6e78
v1.5.7.0 (Summer Update)
2024-06-18 16:50:02 +03:00
c518b696f6
Merge remote-tracking branch 'upstream/master' into develop
2024-05-02 12:25:49 -03:00
0a0a9784c5
Blood in the Water Hotfix 2 - 1.4.6.0
2024-05-02 14:08:04 +03:00
b98dec4c3b
Merge remote-tracking branch 'upstream/master' into develop
2024-04-26 12:31:21 -03:00
848113b8cb
v1.4.5.0 (Blood in the Water Hotfix)
2024-04-26 17:03:10 +03:00
0a9ff43986
Merge remote-tracking branch 'upstream/master' into develop
2024-04-24 12:20:11 -03:00
ff1b8951a7
v1.4.4.1 (Blood in the Water Update)
2024-04-24 18:09:05 +03:00
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
ac69537784
Merge remote-tracking branch 'upstream/master' into develop
2024-04-16 12:20:09 -03:00
536346da11
v1.3.0.4
2024-04-16 18:00:23 +03:00
5e89e2ea11
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2024-04-12 12:11:06 -03:00
18af2754db
v1.3.0.3
2024-04-12 16:38:50 +03:00
077cd0bec3
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2024-04-02 12:28:51 -03:00
95a8b89e2b
v1.3.0.2
2024-04-02 18:15:50 +03:00
5a4a85564a
Forgor to change this text
2024-03-28 18:15:34 -03:00
bf34934e9c
Merge fixes
2024-03-28 16:19:53 -03:00
7a74cd052f
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2024-03-28 14:26:18 -03:00
3791670c42
v1.3.0.1 (Epic Store release)
2024-03-28 18:34:33 +02:00
b3ac01cb22
Remove all uses of the Cs Package now that we don't need it anymore
...
LuaCs Settings no longer uses LuaCsConfig
Cs Package is no longer is used for enabling CSharp Scripting (except for dedicated server, to not make those people confused)
Added popups for when you have CSharp mods enabled but don't have CSharp enabled when going to singleplayer/multiplayer
2024-03-19 19:03:32 -03:00
40beade15a
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2024-01-11 11:42:33 -03:00
0c433eb187
v1.2.8.0 (Winter Update hotfix 2)
2024-01-11 16:19:43 +02:00
2ebaa72a12
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-12-20 11:34:03 -03:00
ada8d6f260
v1.2.7.0 (Winter Update hotfix)
2023-12-20 15:00:42 +02:00
a846ff2ea5
Fixed whoopie in the Hide UserNames setting
2023-12-14 13:05:35 -03:00
448e4cdfbb
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-12-14 11:56:39 -03:00
b91e85559d
v1.2.6.0 (Winter Update)
2023-12-14 16:11:27 +02:00
c7b8cda902
Hide host machine UserName when displaying error logs
2023-12-10 12:26:38 -03:00
fb5ea537bf
Unstable 1.2.4.0
2023-11-30 13:53:00 +02:00
8a2e2ea0ae
Unstable 1.2.1.0
2023-11-10 17:45:19 +02:00
b841dee7ad
Fixed Initialize being called instead of CheckInitialized if you downloaded mods from the mod screen
2023-11-06 20:28:24 -03:00
759f66cf9f
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-10-30 12:40:09 -03:00
a8f9c97dda
v1.1.19.3 (Treacherous Tides Hotfix 2)
2023-10-30 17:38:29 +02:00
79dd55836f
Fixed asm mods not being considered when prompting the user
2023-10-25 14:26:47 -03:00
d0dd49b70b
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
2023-10-20 12:20:18 -03:00
2ea58c58a7
Hotfix 1.1.18.1 (real this time)
2023-10-20 18:17:33 +03:00
6cc82976a1
Hotfix 1.1.18.1
2023-10-20 18:05:28 +03:00
7f311a6526
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
2023-10-19 13:36:40 -03:00
df7e8f1625
v1.1.18.0 (Treacherous Tides Update)
2023-10-19 19:28:43 +03:00
9838cc59ee
Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop
2023-10-19 12:18:30 -03:00
34ffc520cc
v1.1.18.0 (Treacherous Tides Update)
2023-10-19 17:18:51 +03:00
966236652a
Copy publicized folder on install script and clean up
2023-10-08 17:49:46 -03:00
cf8f0de659
Unstable 1.1.14.0
2023-10-02 16:43:54 +03:00
8724254247
Fixed initialization not being called on the client if there's csharp mods present without the cs package
2023-08-11 11:52:44 -03:00
90e2105bc8
Fixed receive queue being given the wrong net message, causing the rest of the ReadIds message to be read incorrectly
2023-07-02 16:13:36 -03:00
6b149e0498
Merge branch 'master' of https://github.com/Regalis11/Barotrauma
2023-06-21 10:36:16 -03:00
EvilFactory
Regalis11
Markus Isberg
itchyOwl