757a7a1c37
Treat forced mods as normal is true by default
2024-05-23 13:07:58 -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
bfca2816c3
Added enum CanEnterSubmarine
2024-04-25 06:33:19 -03:00
079b0c3648
Fixed merge errors
2024-04-24 12:34:59 -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
10ad5d296e
Renamed GUI.Style to match the rest
2024-04-21 14:34:20 -03:00
71376cfe5f
You can now grab the parameters passed into XML status effects and added a variation of the Hook Add method that only takes the event name
2024-04-20 18:47:07 -03:00
123a212251
Register KarmaManager
2024-04-17 20:00:25 -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
895924b537
Register EpicAccountId
2024-04-11 06:31:35 -03:00
3f014660cc
Pass in a copy of the config instead
2024-04-02 12:49:04 -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
ee337e4f18
Fixed config not saving
2024-03-28 23:39:29 -03:00
06a226a26e
Fixed wrong xml attribute name
2024-03-28 21:20:02 -03:00
85a6a26fcd
Include BarotraumaCore in the publicized assemblies
2024-03-28 18:59:59 -03:00
5a4a85564a
Forgor to change this text
2024-03-28 18:15:34 -03:00
a55b165d9e
Added new assemblies to CI
2024-03-28 16:39:43 -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
2043f6411c
Set TreatForcedModsAsNormal to true by default
2023-12-17 14:58:13 -03:00
a0044d03c2
Fixed Lua dispose method not being called if you reload manually
2023-12-17 12:34:30 -03:00
a846ff2ea5
Fixed whoopie in the Hide UserNames setting
2023-12-14 13:05:35 -03:00
b8d238618f
Remove System.ValueType since it causes issues with enums
2023-12-14 13:02:24 -03:00
7c890b158c
Fixed compile errors
2023-12-14 12:13:42 -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
8eee3b070b
Removed CS8602 warning as error so CI stops blowing up due to an error in upstream
2023-12-10 12:42:04 -03:00
4fa52406a0
Turn the acl unloading warning into just a debug message
2023-12-10 12:29:11 -03:00
9149fcbdc4
Fixed System.ValueType register
2023-12-10 12:26:50 -03: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
e5e85e948b
Register FileSender
2023-11-19 12:09:31 -03:00
e544105a3e
Register System.ValueType`2
2023-11-12 11:00:06 -03:00
8a2e2ea0ae
Unstable 1.2.1.0
2023-11-10 17:45:19 +02:00
eeb7e3080f
Potential fix for #158
2023-11-10 10:59:03 -03:00
EvilFactory
Markus Isberg
itchyOwl
Regalis11