vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,074 Commits 5 Branches 2 Tags
a28333ff4e7d53cf8f4b60b337fe3e0dbca5ed32
Commit Graph

6074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
EvilFactory
15daa64f66 Merge https://github.com/Regalis11/Barotrauma into develop 2023-06-15 12:13:50 -03:00
Regalis11
94f5a93a0c Merge remote-tracking branch 'origin/master' into dev 
# Conflicts:
#	Barotrauma/BarotraumaClient/ClientSource/DebugConsole.cs
#	Barotrauma/BarotraumaClient/ClientSource/Events/EventManager.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/CrewManagement.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/MedicalClinicUI.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/Store.cs
#	Barotrauma/BarotraumaClient/ClientSource/GUI/SubmarineSelection.cs
#	Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/CampaignMode.cs
#	Barotrauma/BarotraumaClient/ClientSource/GameSession/GameModes/MultiPlayerCampaign.cs
#	Barotrauma/BarotraumaClient/ClientSource/GameSession/RoundSummary.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/Door.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/Machines/Fabricator.cs
#	Barotrauma/BarotraumaClient/ClientSource/Items/Components/Projectile.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Lights/ConvexHull.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightManager.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Lights/LightSource.cs
#	Barotrauma/BarotraumaClient/ClientSource/Map/Structure.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/Voip/VoipClient.cs
#	Barotrauma/BarotraumaClient/ClientSource/Networking/Voting.cs
#	Barotrauma/BarotraumaClient/ClientSource/Screens/ServerListScreen/ServerListScreen.cs
#	Barotrauma/BarotraumaClient/LinuxClient.csproj
#	Barotrauma/BarotraumaClient/MacClient.csproj
#	Barotrauma/BarotraumaClient/WindowsClient.csproj
#	Barotrauma/BarotraumaServer/LinuxServer.csproj
#	Barotrauma/BarotraumaServer/MacServer.csproj
#	Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs
#	Barotrauma/BarotraumaServer/ServerSource/GameSession/MedicalClinic.cs
#	Barotrauma/BarotraumaServer/ServerSource/Items/Inventory.cs
#	Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs
#	Barotrauma/BarotraumaServer/ServerSource/Utils/DoSProtection.cs
#	Barotrauma/BarotraumaServer/WindowsServer.csproj
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/HumanAIController.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/IndoorsSteeringManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveContainItem.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveFindSafety.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGetItem.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveGoTo.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/Objectives/AIObjectiveIdle.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/AI/ShipCommand/ShipIssueWorkerOperateWeapons.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Attack.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Character.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/Affliction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/Afflictions/AfflictionPrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Health/CharacterHealth.cs
#	Barotrauma/BarotraumaShared/SharedSource/Characters/Params/CharacterParams.cs
#	Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackageManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/Enums.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/MissionAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCChangeTeamAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCFollowAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventActions/NPCWaitAction.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/EventManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/Missions/Mission.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/Missions/PirateMission.cs
#	Barotrauma/BarotraumaShared/SharedSource/Events/Missions/SalvageMission.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/CargoManager.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/Data/Reputation.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/GameModes/CampaignMode.cs
#	Barotrauma/BarotraumaShared/SharedSource/GameSession/GameSession.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Door.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/LevelResource.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Holdable/RangedWeapon.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemContainer.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Projectile.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/LightComponent.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Components/Turret.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs
#	Barotrauma/BarotraumaShared/SharedSource/Items/ItemPrefab.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Gap.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Levels/Level.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/Location.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Map/Map.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Outposts/OutpostGenerator.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/Submarine.cs
#	Barotrauma/BarotraumaShared/SharedSource/Map/SubmarineBody.cs
#	Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs
#	Barotrauma/BarotraumaShared/SharedSource/Settings/GameSettings.cs
#	Barotrauma/BarotraumaShared/SharedSource/StatusEffects/PropertyConditional.cs
#	Barotrauma/BarotraumaShared/SharedSource/StatusEffects/StatusEffect.cs
#	Barotrauma/BarotraumaShared/changelog.txt
 2023-06-15 16:55:39 +03:00
Joonas Rikkonen
f95be0511c Update bug_report.yml 2023-06-15 16:52:20 +03:00
Regalis11
406562f522 Removed a duplicate class 2023-06-15 16:50:39 +03:00
itchyOwl
83de72e3d2 v1.0.20.1 (summer patch) 2023-06-15 16:46:54 +03:00
EvilFactory
6b461e1026 Added cl_toggleluadebug to the multiplayer permitted commands 2023-06-11 13:33:38 -03:00
EvilFactory
3bc8f06e58 Throw a nicer error message if the user tries to use cl_lua without it being initialized 2023-06-10 20:36:29 -03:00
dependabot[bot]
b606cc770f Bump actions/checkout from 3.5.2 to 3.5.3 
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.2 to 3.5.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](8e5e7e5ab8...c85c95e3d7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-10 20:34:04 -03:00
peelz
8cfb698c67 Fix upstream CS9104 compile error 
This should let us build the project again while we wait for the upstream fix.
 2023-06-05 20:03:27 -03:00
peelz
c7123aeec2 Fix run-tests workflow checking out incorrect target 2023-06-05 20:03:27 -03:00
peelz
0496e4ab75 Fix empty target error on scheduled nightly CI builds 2023-06-05 20:03:27 -03:00
EvilFactory
4ea50ee0f6 Fixed invalid type Voting 
i am going insane
 2023-06-05 19:53:54 -03:00
EvilFactory
2006294c94 Fixed create enum invalid type VoteType 2023-06-05 19:44:39 -03:00
EvilFactory
296feca265 Added Voting and VoteType to default lib 2023-06-02 17:48:12 -03:00
Joonas Rikkonen
6acac1d143 Update bug_report.yml 2023-06-01 18:24:08 +03:00
dependabot[bot]
c769ecf693 Bump actions/setup-dotnet from 3.1.0 to 3.2.0 
Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](aa983c550d...3447fd6a9f)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-29 21:16:54 -03:00
peelz
cf386943a5 Fix check-if-release-needed check for create-prerelease workflow 2023-05-28 00:15:27 -03:00
Evil Factory
560ebed848 Merge pull request #139 from notpeelz/feat-nightly-ci-builds 
Add nightly CI builds
 2023-05-27 23:29:09 -03:00
peelz
5e84d65cdc Rename CI workflow 'ref' inputs to 'target' 2023-05-27 22:23:34 -04:00
peelz
c6b9c753fe Change dependabot's config to target the dev branch 2023-05-27 22:23:34 -04:00
peelz
6348ddae63 Prevent CI from running publish-release for non-code changes 2023-05-27 22:23:34 -04:00
peelz
a36157e40f Add CI workflow for generating nightly builds 2023-05-27 22:23:33 -04:00
dependabot[bot]
a26b00a5d8 Bump notpeelz/action-gh-create-release from 4.0.0 to 5.0.0 
Bumps [notpeelz/action-gh-create-release](https://github.com/notpeelz/action-gh-create-release) from 4.0.0 to 5.0.0.
- [Release notes](https://github.com/notpeelz/action-gh-create-release/releases)
- [Commits](35fc26709d...a12edfc71d)

---
updated-dependencies:
- dependency-name: notpeelz/action-gh-create-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-27 19:28:37 -04:00
dependabot[bot]
f08ec51640 Bump notpeelz/action-gh-create-release from 1.0.2 to 4.0.0 
Bumps [notpeelz/action-gh-create-release](https://github.com/notpeelz/action-gh-create-release) from 1.0.2 to 4.0.0.
- [Release notes](https://github.com/notpeelz/action-gh-create-release/releases)
- [Commits](a3caaff31c...35fc26709d)

---
updated-dependencies:
- dependency-name: notpeelz/action-gh-create-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-27 16:27:13 -03:00
dependabot[bot]
b7c152df52 Bump actions/setup-dotnet from 3.0.3 to 3.1.0 
Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.0.3 to 3.1.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](607fce577a...aa983c550d)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-27 16:26:42 -03:00
peelz
1309a9a273 Add dependabot config 2023-05-26 20:39:32 -03:00
EvilFactory
abb9e1eb1d Added Util.GetItemGroup and Util.RegisterItemGroup 2023-05-26 19:56:17 -03:00
peelz
be178715a8 Use upstream deploy scripts in CI 2023-05-26 16:23:50 -03:00
peelz
8890607c53 Remove workaround for upstream duplicate-file-on-publish OSX issue 2023-05-26 16:23:50 -03:00
peelz
a5baf9cfba Migrate asm publicization to msbuild (#132) 
* Make publish-release workflow fail on missing build artifacts
* Remove assembly publicization step from CI
* Add AssemblyPublicizer MSBuild task
* Add explanation for SatelliteResourceLanguages prop
* Move and document workaround for duplicate-file-on-publish OSX issue
* Move the Luatrauma.props import to the bottom of project files, this should give us a chance to override properties/items defined in the project file.
 2023-05-25 16:31:46 -03:00
EvilFactory
f32da0bff7 Got rid of old unused properties, moved the remaining stuff to the separate props file and renamed the props file to Luatrauma.props 2023-05-25 13:32:18 -03:00
peelz
4017feca6d Remove vendored CI release action (#131) 2023-05-24 16:49:39 -03:00
EvilFactory
3836ed40d6 Fixed file access with the io module when using append mode 2023-05-23 17:56:05 -03:00
EvilFactory
2093e7ca7f Added GUIComponent to the GUI lib 2023-05-18 17:28:52 -03:00
Joonas Rikkonen
5a6b3d1c49 Update bug_report.yml 2023-05-17 19:38:44 +03:00
EvilFactory
6b96927b23 Added docs for the util functions and fixed timer docs 2023-05-17 10:14:16 -03:00
EvilFactory
09c36a9213 Merge https://github.com/Regalis11/Barotrauma into develop 2023-05-11 11:22:12 -03:00
Joonas Rikkonen
8a89b18a63 Update bug_report.yml 2023-05-11 16:58:02 +03:00
Regalis11
e5ef2adc55 v1.0.13.2 2023-05-11 16:39:23 +03:00
EvilFactory
9f84941792 Quick fix for failing MacOS builds 2023-05-10 12:06:51 -03:00
EvilFactory
2c45c3d020 Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop 2023-05-10 11:55:46 -03:00
Joonas Rikkonen
235d42b34f Update bug_report.yml 2023-05-10 15:08:03 +03:00
Regalis11
ee1db852b1 v1.0.13.1 (first post-1.0 patch) 2023-05-10 15:07:17 +03:00
github-actions[bot]
768a1f309c Update submodule: Libraries/moonsharp 2023-05-09 15:51:56 +00:00
peelz
0219b3de73 Add publicized assemblies to CI archives (#129) 2023-05-09 12:39:52 -03:00
Evil Factory
eb3c126aea Merge pull request #128 from notpeelz/harden-ci-security 
Vendor publish-release CI action
Add ensure-sha-pinned-actions action to CI pipeline
Pin CI actions to specific commit hashes
 2023-05-09 11:26:15 -03:00
peelz
0a8fa6f5d4 Pin CI actions to specific commit hashes 2023-05-08 20:02:45 -04:00
peelz
4c1557e7fd Add ensure-sha-pinned-actions action to CI pipeline 2023-05-08 20:02:45 -04:00
peelz
32645c0dd2 Vendor publish-release CI action 
This replaces `marvinpinto/action-automatic-releases`, which hasn't been
updated since Jan 29 2022.
 2023-05-08 20:02:45 -04:00
EvilFactory
886fa9ed80 Prevent some types from being re-registered 2023-05-08 13:13:47 -03:00