Update master with new features from develop

BeardedManStudios / ForgeNetworkingRemastered

See various forks, also please join the Forge Community fork of Forge Alloy! -> https://github.com/ForgeAlloyCommunity/ForgeAlloy

https://twitter.com/FarrisFaulds

Apache License 2.0

1.49k stars 306 forks source link

Update master with new features from develop #288

Closed phalasz closed 5 years ago

phalasz commented 5 years ago

Anyone has any issue with the changes in the develop branch right now or can we update master with it?

BrentFarris commented 5 years ago

Newest update has created a conflict with the "Forge Networking Remastered Unity/Assets/Bearded Man Studios Inc/Editor/Resources/BMS_Forge_Editor/NetworkManagerTemplate.txt". Apparently something is on master that isn't on develop. I may have some time tonight to move those changes over to develop