Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
11,058 Commits 3 Branches 31 Tags 1.1 GiB
Commit Graph

11058 Commits

Author SHA1 Message Date
Ricardo Quesada 8bf24f0475 ccGLXXX -> GL::xxx 
Adds GL namespace. Deprecates the `ccGLFunctionName` functions. New functions are `GL::functionName`

Also, converts the class `DrawPrimitives` into a namespace
 2013-07-25 18:42:53 -07:00
James Chen 43f9ebafac Merge pull request #3262 from natural-law/develop 
[ci skip]Update the JS binding for plugin.
 2013-07-25 18:41:07 -07:00
Ricardo Quesada 191aaebe2a More const fixes 
`Menu::STATE_XXX` -> `Menu::State::XXX`
Removes more Hungarian notation
Removes Configuration::Type <- I added it a few months ago, and it was not being used. It is safe to remove it
 2013-07-25 17:47:42 -07:00
Ricardo Quesada 07c6c904cc Removes more Hungarian notation and more 
Adds Touch::DispatchMode. Removes Layer::TouchDispatchMode
 2013-07-25 16:27:24 -07:00
Ricardo Quesada 058935aa8d Removes Hungarian notation 
Removes Hungarian notation from the code.
 2013-07-25 15:53:24 -07:00
Ricardo Quesada d683e10808 More constant fixes 
Transition::ORIENTATION_XXX -> Transition::Orientation::XXX
Image::FORMAT_XXX -> Image::Format::XXX
Image::_function() -> Image::function() // private methods should not start with '_'
DrawPrimitives::drawColor() -> DrawPrimitives::setDrawColor()

And fixes Premultiplied Alpha in PVR v3 images
And tests are updated with the new functions
 2013-07-25 14:49:43 -07:00
Ricardo Quesada 16d0b43181 Constant fixes 
Director::PROJECTION_2D, 3D,... -> Director::Projection::_2D, _3D, ...
Label::TEXT_ALIGNMENT_... -> Label::HAlignment::...
Label::TEXT_VERTICAL_ALIGNMENT_... -> Label::VAlignment::...
Texture2D::PIXEL_FORMAT_... -> Texture2D::PixelFormat::...
BlendFunc::BLEND_FUNC_DISABLE -> BlendFunc::DISABLE

Also adds more constant for BlendFunc
 2013-07-25 13:36:19 -07:00
minggo 4caea01021 Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into iss2430-modify_enum 2013-07-25 23:09:56 +08:00
James Chen 4417e9c829 Merge pull request #3259 from dumganhar/iss2430-modify_enum 
issue #2404: DrawPrimitives deprecated.
 2013-07-25 08:09:30 -07:00
minggo b36a4f1df0 issue #2430:use upper letters for enum item in Image 2013-07-25 23:09:18 +08:00
James Chen fd9e2235be Delete CC_DLL. 2013-07-25 22:43:12 +08:00
James Chen 6870615efe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-25 22:40:13 +08:00
James Chen 60abcd04e5 Merge pull request #3258 from CocosRobot/updategeneratedsubmodule_1374762976 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-25 07:40:02 -07:00
James Chen f7c0ad8151 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2430-modify_enum 2013-07-25 22:39:14 +08:00
James Chen a1c3631962 issue #2404: DrawPrimitives deprecated. 2013-07-25 22:38:55 +08:00
CocosRobot 53d2e8ac30 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-25 14:36:24 +00:00
minggo 323af3c889 issue #2430:use upper letters for enum item in AssetsManager and WebSocket 2013-07-25 22:29:12 +08:00
minggo 7dc710a77f Merge pull request #3257 from minggo/iss2430-modify_enum 
move enum into class
 2013-07-25 07:28:21 -07:00
minggo 4ef197b579 Merge pull request #13 from dumganhar/iss2430-modify_enum 
issue #2430: Fixing compilation errors for Mac and JSB projects.
 2013-07-25 07:02:57 -07:00
James Chen 8958f28257 Reset submodule of scripting/javascript/bindings/generated 2013-07-25 22:01:11 +08:00
James Chen 3f36e8300e issue #2430: Fixing compilation errors for Mac and JSB projects. 2013-07-25 21:59:47 +08:00
minggo 17946c084a issue #2430:fix android compiling error 2013-07-25 21:59:37 +08:00
minggo 4d7ac6c800 issue #2430:fix conflict 2013-07-25 21:37:12 +08:00
minggo d44333ce37 issue #2430:build lua correctly 2013-07-25 21:26:26 +08:00
minggo e95c3b9150 issue #2430:make functions really deprecated 2013-07-25 21:15:24 +08:00
James Chen fbb867381c Merge pull request #3256 from CocosRobot/updategeneratedsubmodule_1374757673 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-25 06:15:10 -07:00
minggo f5b116095c issue #2430:make functions really deprecated 2013-07-25 21:09:44 +08:00
CocosRobot 74cdb25f8f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-25 13:07:58 +00:00
minggo 8b748e2992 issue #2430:use const member variable instead of macro 2013-07-25 21:04:32 +08:00
James Chen 4505e07585 Merge pull request #3255 from samuele3hu/deprectedOperator 
issue #2404:Add more functions to Deprecated.lua and modify some .pkg files
 2013-07-25 05:59:43 -07:00
minggo 051caf5e54 issue #2430:move TransitionScene enum into class 2013-07-25 20:50:39 +08:00
samuele3hu 6854bd6b19 issue #2404:replace LuaEngine::defaultEngine() with LuaEngine::getInstance() 2013-07-25 20:40:44 +08:00
minggo df48f52aa3 issue #2430:use Image::Format instead of tImageFormat 2013-07-25 20:38:15 +08:00
minggo 2bb577be8b issue #2430:change Image enum item to upper letter 2013-07-25 20:29:53 +08:00
minggo 18a19d5168 issue #2430:move Layer enum into class 2013-07-25 20:12:55 +08:00
minggo beb192ecaa issue #2430:move Menu enum into class 2013-07-25 20:04:24 +08:00
samuele3hu 456a26d7ab issue #2404:Modify tab to spaces 2013-07-25 20:03:58 +08:00
samuele3hu 11d7c9c653 issue #2404:Add more functions to Deprecated.lua and modify some .pkg files 2013-07-25 19:58:59 +08:00
minggo 77afae124b issue #2430:move Texture2D enum into class 2013-07-25 19:52:44 +08:00
metalbass 2982a42fbf Fixed typo. virutal -> virtual 2013-07-25 13:03:40 +02:00
metalbass c7329e9301 Added virtual destructors to some interfaces to fix issue 3095 2013-07-25 12:54:51 +02:00
minggo 2293630335 issue #2430:move enum in ccTypes.h class 2013-07-25 18:46:43 +08:00
James Chen f40c5aa280 Merge pull request #3250 from dumganhar/develop 
closed 2431: Potential crash when loading js files.
 2013-07-25 02:59:42 -07:00
James Chen 0e1bbcfa90 closed #2431: Potential crash when loading js files. 2013-07-25 17:58:15 +08:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
James Chen 1e00a0a6bf Merge pull request #3241 from minggo/releasing 
fix some errors for template
 2013-07-25 02:25:09 -07:00
minggo 8a2baff4a0 Merge pull request #12 from dumganhar/minggo-releasing 
[Android] Fixing path error and reducing dependence for extension.
 2013-07-25 02:03:33 -07:00
James Chen 25beed0051 [Android] Fixing path error and reducing dependence for extension. 2013-07-25 16:53:35 +08:00
zhangbin 75f5c49a64 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-25 16:07:32 +08:00
zhangbin dd6ed6e6a8 closed #2356 
1. Modify the JS binding of interface ProtocolAds::showAds.
2. Update the JS binding for plugin.
 2013-07-25 16:07:09 +08:00