Merge with develop

--HG--
branch : compatibility-develop
hg/compatibility-develop
Nimetu 7 years ago
commit fd2e269e3c

@ -308,8 +308,8 @@ CameraSpeedMax = 100.0;
CameraResetSpeed = 10.0; // Speed in radian/s CameraResetSpeed = 10.0; // Speed in radian/s
// Default values for map // Default values for map
MaxMapScale = 2.0f; MaxMapScale = 2.0;
R2EDMaxMapScale = 8.0f; R2EDMaxMapScale = 8.0;
////////////////// //////////////////
// SOUND CONFIG // // SOUND CONFIG //

Loading…
Cancel
Save