Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -103,10 +103,10 @@ namespace Multiplayer
        //! Helper method to compute clamped array index values accounting for the offset head index.
        AZStd::size_t GetOffsetIndex(AZStd::size_t absoluteIndex) const;

-        mutable AzNetworking::ConnectionId m_owningConnectionId = AzNetworking::InvalidConnectionId;
+        AZStd::array<BASE_TYPE, REWIND_SIZE> m_history;
+        AzNetworking::ConnectionId m_owningConnectionId = AzNetworking::InvalidConnectionId;
        ApplicationFrameId m_headTime = ApplicationFrameId{0};
        uint32_t m_headIndex = 0;
-        AZStd::array<BASE_TYPE, REWIND_SIZE> m_history;
    };
 }