Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Instanced Projects, AssetLocator, ParamBank, FMGBank #895

Merged
merged 43 commits into from
Jun 29, 2024
Merged
Show file tree
Hide file tree
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
03ae5ea
Create project replacing assetlocator, rework functions to use common…
Philiquaz Apr 29, 2024
4ea5fd6
Move statics usages
Philiquaz Apr 29, 2024
2950aca
Remove passing of AssetLocator - Make it (temporarily) static
Philiquaz Apr 29, 2024
6c42a46
Turn Assetlocator into a static dummy
Philiquaz Apr 29, 2024
68afcf0
Move static hack to AssetLocator
Philiquaz Apr 29, 2024
9218d1a
Rename project to projectassetlocator, introduce owning project object
Philiquaz Apr 29, 2024
b09337d
Clean some imports
Philiquaz Apr 29, 2024
522aded
END SUPPORT of ER PartialParams, ParamBank to use new assetlocator.
Philiquaz May 7, 2024
cfc43f9
Stop reusing parambank instances, make them part of Project. Also kee…
Philiquaz May 10, 2024
eec8a6a
Change comparison menus to select project/mod folder
Philiquaz May 10, 2024
e08fe37
Allow to still select json from compare, including loading settings f…
Philiquaz May 10, 2024
dccb513
Defs loaded on a per-project/bank basis
Philiquaz May 11, 2024
28567cf
Merge remote-tracking branch 'Soulsmods/master' into feat/Projects
Philiquaz May 11, 2024
563ccf1
Repair from merge
Philiquaz May 11, 2024
509024a
Merge branch 'feat/Projects' into feat/ProjectsPt2
Philiquaz May 11, 2024
59d44a9
Move parammeta to be part of parambank
Philiquaz May 12, 2024
c0cb605
deduplicate project gametype (again)
Philiquaz May 22, 2024
f6d09c8
undo privacy because we are setting it outside and I don't want to fi…
Philiquaz May 22, 2024
e3dccc2
Scuffed start on instanced FMGBank
Philiquaz May 22, 2024
a58e6fd
Use own assetlocator in fmgbank, fix writemode
Philiquaz May 22, 2024
24abf0e
fmg loading with fromOptions
Philiquaz May 22, 2024
4f25dae
Move FMG enums to their own class
Philiquaz May 22, 2024
64d97b6
Move big switches
Philiquaz May 22, 2024
6980550
move post-load fmginfo edits
Philiquaz May 24, 2024
fccf0c2
Renamed UICategories to FileCategories so that we're not putting UI s…
Philiquaz Jun 3, 2024
aa21aef
Move data into dictionary rather than list
Philiquaz Jun 3, 2024
bdd38db
rename fmginfo uicategory, filecategory.text
Philiquaz Jun 3, 2024
014853d
Move the game-based hacks to generateInfo
Philiquaz Jun 3, 2024
ab250b9
naming and insertion consistency
Philiquaz Jun 3, 2024
d0ad25c
Loaded categories is now backed by the fmgbank itself
Philiquaz Jun 3, 2024
a6c2056
Patching is on lookup instead of modifying data
Philiquaz Jun 3, 2024
88476fc
Move sorting logic to lookup stuff
Philiquaz Jun 3, 2024
f049647
Split up Exporter, EntryGroup and FMGInfo
Philiquaz Jun 3, 2024
d5fc007
no more partial class
Philiquaz Jun 3, 2024
f5e32c0
Move reloading of FMGs to bank and outside of screen.
Philiquaz Jun 3, 2024
830fe86
Move most of FMGBank into FMGLang
Philiquaz Jun 3, 2024
efec21f
Introduce FMGFileSet, finally some semblence of functioning again.
Philiquaz Jun 4, 2024
b9f0c7e
Merge remote-tracking branch 'Soulsmods/master' into feat/ProjectsFMG…
Philiquaz Jun 4, 2024
93e77c9
Fix Errors when no project loaded, assetbrowser ordering
Philiquaz Jun 4, 2024
4b0ae66
Merge remote-tracking branch 'Soulsmods/master' into feat/ProjectsFMG…
Philiquaz Jun 4, 2024
e9b45a0
GetProjectFileAllPaths util
Philiquaz Jun 16, 2024
df5d439
Merge remote-tracking branch 'Soulsmods/master' into feat/ProjectsFMG…
Philiquaz Jun 29, 2024
263fb66
merge compile fixes
Philiquaz Jun 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/StudioCore/AssetBrowser/AssetBrowserScreen.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using SoulsFormats;
using Microsoft.Extensions.Logging;
using SoulsFormats;
using StudioCore.Banks;
using StudioCore.Banks.AliasBank;
using StudioCore.Editor;
Expand Down Expand Up @@ -116,6 +117,12 @@ public void OnProjectChanged()
_selectedAssetType = AssetCategoryType.None;
_selectedAssetTypeCache = AssetCategoryType.None;

if (ModelAliasBank.Bank.IsLoadingAliases)
{
TaskLogs.AddLog("Assetbrowser tried updating before aliasbank finished loading!", LogLevel.Warning);
return;
}

foreach (AliasReference v in ModelAliasBank.Bank.AliasNames.GetEntries("Characters"))
{
if (!chrReferenceDict.ContainsKey(v.id))
Expand Down
Loading
Loading