AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 16:57:02 +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

4
Runtime/MP1/World/CShockWave.hpp
View File

@@ -57,9 +57,9 @@ public:
void Accept(IVisitor& visitor) override;
void AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateManager& mgr) override;
void AddToRenderer(const zeus::CFrustum& frustum, const CStateManager& mgr) const override;
void AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) override;
[[nodiscard]] std::optional<zeus::CAABox> GetTouchBounds() const override;
void Render(const CStateManager& mgr) const override;
void Render(CStateManager& mgr) override;
void Think(float dt, CStateManager& mgr) override;
void Touch(CActor& actor, CStateManager& mgr) override;