"modify console_cmd to console_param in cocos-console-test.py."
update beside win32
delete not need variable in cocos-console-test.py.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
update 2dx Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage
fix cocos2dx engine internal warnings
updatewin32
fix CCDirectorCaller warnings
fix warnings of font and RichText
fix win32 compile error
Update the reference of submodule "cocos2d-console".
change setFontSize from int to float
remove deprecated classes in CCNodeLoader
Merge pull request #5844 from heliclei/refactor-console-upload

refactor upload:encode file with base64, detach upload from main loop
Update CHANGELOG [ci skip]
Merge pull request #5878 from natural-law/develop

Update the reference of submodule "cocos2d-console".
remove unused accelerometer
Merge branch 'develop' into fix_warnings

Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h
fix a paramers miss match
fixed label font size: from int to float