AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 03:07:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into omegapirate

Browse Source
This commit is contained in:
Luke Street
2020-04-09 20:06:33 -04:00
parent 416ca4653b c796cf5315
commit 6b814262fc
157 changed files with 707 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/CScriptPlatform.hpp
View File

@@ -91,7 +91,7 @@ public:
void PreThink(float, CStateManager&) override;
void Think(float, CStateManager&) override;
void PreRender(CStateManager&, const zeus::CFrustum&) override;
void Render(const CStateManager&) const override;
void Render(CStateManager&) override;
std::optional<zeus::CAABox> GetTouchBounds() const override;
zeus::CTransform GetPrimitiveTransform() const override;
const CCollisionPrimitive* GetCollisionPrimitive() const override;