Commit Graph

5951 Commits

Author SHA1 Message Date
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
10ad5d296e Renamed GUI.Style to match the rest 2024-04-21 14:34:20 -03:00
EvilFactory
38f8e26635 Added IReadMessage and IWriteMessage plus some enums to the documentation 2024-04-20 19:45:42 -03:00
dependabot[bot]
fb725f9433 Bump actions/download-artifact from 4.1.4 to 4.1.5 (#197)
Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](c850b930e6...8caf195ad4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-20 18:49:33 -03:00
dependabot[bot]
968de086ed Bump actions/upload-artifact from 4.3.1 to 4.3.2 (#196)
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](5d5d22a312...1746f4ab65)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-20 18:49:22 -03:00
dependabot[bot]
10cb862269 Bump zgosalvez/github-actions-ensure-sha-pinned-actions (#195)
Bumps [zgosalvez/github-actions-ensure-sha-pinned-actions](https://github.com/zgosalvez/github-actions-ensure-sha-pinned-actions) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/zgosalvez/github-actions-ensure-sha-pinned-actions/releases)
- [Commits](ba37328d4e...19ebcb0bab)

---
updated-dependencies:
- dependency-name: zgosalvez/github-actions-ensure-sha-pinned-actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-20 18:49:00 -03:00
dependabot[bot]
54e1c62fc5 Bump peaceiris/actions-gh-pages from 3.9.3 to 4.0.0 (#194)
Bumps [peaceiris/actions-gh-pages](https://github.com/peaceiris/actions-gh-pages) from 3.9.3 to 4.0.0.
- [Release notes](https://github.com/peaceiris/actions-gh-pages/releases)
- [Changelog](https://github.com/peaceiris/actions-gh-pages/blob/main/CHANGELOG.md)
- [Commits](373f7f263a...4f9cc6602d)

---
updated-dependencies:
- dependency-name: peaceiris/actions-gh-pages
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-20 18:48:44 -03:00
dependabot[bot]
c562982b05 Bump dorny/test-reporter from 1.8.0 to 1.9.0 (#193)
Bumps [dorny/test-reporter](https://github.com/dorny/test-reporter) from 1.8.0 to 1.9.0.
- [Release notes](https://github.com/dorny/test-reporter/releases)
- [Changelog](https://github.com/dorny/test-reporter/blob/main/CHANGELOG.md)
- [Commits](eaa763f6ff...c40d89d5e9)

---
updated-dependencies:
- dependency-name: dorny/test-reporter
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-04-20 18:48:19 -03:00
EvilFactory
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
EvilFactory
123a212251 Register KarmaManager 2024-04-17 20:00:25 -03:00
EvilFactory
ac69537784 Merge remote-tracking branch 'upstream/master' into develop 2024-04-16 12:20:09 -03:00
Regalis11
8face2f344 Updated issue template 2024-04-16 18:01:42 +03:00
Regalis11
536346da11 v1.3.0.4 2024-04-16 18:00:23 +03:00
EvilFactory
5e89e2ea11 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-04-12 12:11:06 -03:00
Regalis11
18af2754db v1.3.0.3 2024-04-12 16:38:50 +03:00
EvilFactory
895924b537 Register EpicAccountId 2024-04-11 06:31:35 -03:00
EvilFactory
3f014660cc Pass in a copy of the config instead 2024-04-02 12:49:04 -03:00
EvilFactory
077cd0bec3 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-04-02 12:28:51 -03:00
Regalis11
332be4c9d2 Updated bug report template 2024-04-02 18:16:17 +03:00
Regalis11
95a8b89e2b v1.3.0.2 2024-04-02 18:15:50 +03:00
EvilFactory
7dc75c6dd2 Fixed stackoverflow caused by ParseDerived due to GetDerivedNonAbstract not returning abstract types 2024-03-29 11:32:35 -03:00
EvilFactory
ee337e4f18 Fixed config not saving 2024-03-28 23:39:29 -03:00
EvilFactory
06a226a26e Fixed wrong xml attribute name 2024-03-28 21:20:02 -03:00
EvilFactory
85a6a26fcd Include BarotraumaCore in the publicized assemblies 2024-03-28 18:59:59 -03:00
EvilFactory
5a4a85564a Forgor to change this text 2024-03-28 18:15:34 -03:00
EvilFactory
8b4f5d1d04 Fixed the prevent-crash-on-missing-dir patch 2024-03-28 16:54:25 -03:00
EvilFactory
19af26ddbe Fixed the disable-interactivity CI patch 2024-03-28 16:48:50 -03:00
EvilFactory
a55b165d9e Added new assemblies to CI 2024-03-28 16:39:43 -03:00
EvilFactory
bf34934e9c Merge fixes 2024-03-28 16:19:53 -03:00
EvilFactory
a95ef7ac08 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-03-28 16:18:15 -03:00
Regalis11
47badaf760 Updated bug report template 2024-03-28 20:20:06 +02:00
EvilFactory
eabbf92c16 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-03-28 15:14:18 -03:00
Regalis11
945051708e Added missing DebugConsoleCore file 2024-03-28 20:14:02 +02:00
Joonas Rikkonen
0ab5180b7d Update .gitignore (so the Debugging folder doesn't get ignored) 2024-03-28 20:12:53 +02:00
EvilFactory
7a74cd052f Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2024-03-28 14:26:18 -03:00
Regalis11
3791670c42 v1.3.0.1 (Epic Store release) 2024-03-28 18:34:33 +02:00
Regalis11
81ca8637be Deleted bug report template (let's see what this does) 2024-03-28 14:21:15 +02:00
Regalis11
cc592ce1dc Disabled blank issues (must use the issue template, which now redirects to the Discussions section) 2024-03-28 14:17:23 +02:00
Joonas Rikkonen
9472034c22 Update bug_report.yml 2024-03-28 14:13:10 +02:00
Joonas Rikkonen
e34a9654e8 Update bug_report.yml (ffs) 2024-03-28 14:11:52 +02:00
Joonas Rikkonen
bf5e4aeb54 Update bug_report.yml 2024-03-28 14:10:00 +02:00
Joonas Rikkonen
b6b28568a2 Update bug_report.yml 2024-03-28 14:08:31 +02:00
Joonas Rikkonen
ccf874f954 Update bug_report.yml 2024-03-28 14:02:53 +02:00
Joonas Rikkonen
ac7017c5a0 Update bug_report.yml 2024-03-28 14:01:28 +02:00
Joonas Rikkonen
92893babd4 Update bug_report.yml 2024-03-28 13:59:35 +02:00
Joonas Rikkonen
c73945c1f4 Update bug_report.yml 2024-03-28 13:58:55 +02:00
Joonas Rikkonen
b7e96b7823 Update bug_report.yml 2024-03-28 13:57:39 +02:00
Joonas Rikkonen
20d187cebf Update bug_report.yml 2024-03-28 13:56:02 +02:00
Joonas Rikkonen
ad49aa2547 Update bug_report.yml 2024-03-28 13:55:44 +02:00
Regalis11
b77981165a Changed bug report template fields to match those in github's example file 2024-03-20 13:17:07 +02:00