AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/PathShagged

This commit is contained in:
Jack Andersen 2015-12-03 15:35:42 -10:00
parent f869ba7fca bf2487d036
commit 54a41e5087
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/DNAMP1/MLVL.hpp
View File

@ -26,7 +26,7 @@ struct MLVL : BigYAML
Value<atUint32> memRelayId; Value<atUint32> memRelayId;
Value<atUint32> targetId; Value<atUint32> targetId;
Value<atUint16> msg; Value<atUint16> msg;
Value<atUint8> unk; Value<bool> active;
}; };
Vector<MemRelayLink, DNA_COUNT(memRelayLinkCount)> memRelayLinks; Vector<MemRelayLink, DNA_COUNT(memRelayLinkCount)> memRelayLinks;

2
Editor/main.cpp
View File

@ -31,7 +31,7 @@ struct Application : boo::IApplicationCallback
unsigned dpi = m_mainWindow->getVirtualPixelFactor() * 72; unsigned dpi = m_mainWindow->getVirtualPixelFactor() * 72;
HECL::CVar* cvDPI = m_cvarManager.newCVar("ed_dpi", "User-selected UI DPI", HECL::CVar* cvDPI = m_cvarManager.newCVar("ed_dpi", "User-selected UI DPI",
int(dpi), HECL::CVar::EFlags::Editor); int(dpi), HECL::CVar::EFlags::Editor | HECL::CVar::EFlags::Archive);
boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory(); boo::IGraphicsDataFactory* gf = m_mainWindow->getMainContextDataFactory();
m_viewResources.init(gf, &m_fontCache, Specter::ThemeData(), dpi); m_viewResources.init(gf, &m_fontCache, Specter::ThemeData(), dpi);