Open
Conversation
EclipsedButter
force-pushed
the
main
branch
2 times, most recently
from
0c775ee to
5cbde13
Compare
Don't bother testing macOS workload, can't deploy it anyway
# Conflicts: # .github/workflows/dotnet-desktop.yml # Smithbox.sln # src/Havok/HKLib/Havok.HKLib.csproj # src/Smithbox.Data/Smithbox.Data.csproj # src/Smithbox.Program/Core/ProjectEntry.cs # src/Smithbox.Program/Debugging/QuickScript.cs # src/Smithbox.Program/Editors/ModelEditor/Data/GxDescriptorBank.cs # src/Smithbox.Program/Editors/ModelEditor/Utils/ModelColladaExporter.cs # src/Smithbox.Program/Editors/Param Editor/Tools/ParamUpgrader.cs # src/Smithbox.Program/Editors/Text Editor/Tools/TextNamingTemplateManager.cs # src/Smithbox.Program/Resource/Locators/VirtualPathLocator.cs # src/Smithbox.Program/Smithbox.Program.csproj # src/Smithbox/Smithbox.csproj
EclipsedButter
force-pushed
the
main
branch
2 times, most recently
from
e31e41c to
0e171e5
Compare
Merged
# Conflicts: # src/Smithbox.Program/Renderer/Locators/ParamLocator.cs
# Conflicts: # src/Smithbox.Program/Application/CFG.cs # src/Smithbox.Program/Application/Data/HelpBank.cs # src/Smithbox.Program/Application/GUI/EditorSettings.cs # src/Smithbox.Program/Application/ProjectEntry.cs # src/Smithbox.Program/Application/Tools/ProjectAliasEditor.cs # src/Smithbox.Program/Editors/File Browser/FileBrowserScreen.cs # src/Smithbox.Program/Editors/Gparam Editor/Data/GparamData.cs # src/Smithbox.Program/Editors/Map Editor/Data/MapData.cs # src/Smithbox.Program/Editors/Material Editor/Data/MaterialData.cs # src/Smithbox.Program/Editors/Param Editor/Data/ParamBank.cs # src/Smithbox.Program/Editors/Param Editor/Data/ParamData.cs # src/Smithbox.Program/Editors/Param Editor/Framework/Decorators/FieldDecorators.cs # src/Smithbox.Program/Editors/Param Editor/Framework/MassEdit/MassEditHandler.cs # src/Smithbox.Program/Editors/Param Editor/Tools/ParamCategories.cs # src/Smithbox.Program/Editors/Param Editor/Tools/ParamUpgrader.cs # src/Smithbox.Program/Editors/Text Editor/Data/TextData.cs # src/Smithbox.Program/Editors/Text Editor/Tools/TextNamingTemplateManager.cs # src/Smithbox.Program/Editors/Texture Viewer/GUI/TexToolView.cs # src/Smithbox.Program/Project/Data/ProjectData.cs # src/Smithbox.Program/Renderer/Locators/PathBuilder.cs # src/Smithbox.Program/Smithbox.Program.csproj
Contributor
Author
|
I deferred some of the stretch goals like soapstone support for a later PR |
# Conflicts: # src/Smithbox.Program/Editors/Map Editor/Tools/Actions/EntityRenameAction.cs
# Conflicts: # .gitignore # Smithbox.sln # src/Smithbox.Program/Smithbox.cs
EclipsedButter
force-pushed
the
main
branch
2 times, most recently
from
29c4a3f to
cda5ab5
Compare
EclipsedButter
force-pushed
the
main
branch
3 times, most recently
from
3a586b3 to
244688b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Also comes with some graphics and validation patches