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

10490 Commits

Author SHA1 Message Date
James Chen 52160e1c40 Merge pull request #3149 from dumganhar/iss2403-progresstimer 
closed 2403: Reverting commit 239323c to fix the bug that Tint and Fade action can't work for ProgressTimer.
 2013-07-15 01:11:43 -07:00
James Chen 39fc98d7fb issue #2403: Removing unused implemented methods like setOpacityModifyRGB, isOpacityModifyRGB since they're defined in their super class. 2013-07-15 16:08:42 +08:00
James Chen b6f78b257f closed #2403: Reverting commit 239323c to fix the bug that Tint and Fade action can't work for ProgressTimer. 2013-07-15 16:06:59 +08:00
James Chen c937824051 Update AUTHORS [ci skip] 2013-07-15 11:54:43 +08:00
James Chen a6a237c017 Merge pull request #3144 from jllust/Fix#2354 
closed 2401: CCLabelBMFont crashes in glDrawElements of CCTextureAtlas::drawNumberOfQuads sometimes
 2013-07-14 20:53:15 -07:00
James Chen 0b6f09f08f Update AUTHORS [ci skip] 2013-07-15 11:42:07 +08:00
James Chen d5a00b2830 Merge pull request #3135 from hannon235/create-socketio-ext 
closed 2399: Implements a socket.io client extension, adds a test case and updates th...
 2013-07-14 20:40:30 -07:00
minggo e038a7480e [ci skip] 2013-07-15 11:38:56 +08:00
minggo 2c499a6a9a Merge pull request #2658 from michaelcontento/use-onWindowFocusChanged-instead-of-onPause 
[Android] use onWindowFocusChanged(bool) instead of onResume()/onPause()
 2013-07-14 20:37:23 -07:00
Chris fada9af9a9 Merge pull request #1 from dumganhar/iss2399-socketio 
Sync with upstream and some small fixes. Updating iOS and Mac projects.
 2013-07-13 06:34:12 -07:00
James Chen 93bb7bcb31 friend SIOClientImpl --> friend class SIOClientImpl, that will be clearer. 2013-07-13 19:26:46 +08:00
James Chen 4b2165e648 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio 2013-07-13 19:24:41 +08:00
James Chen 1bdb8f1bb2 Adding SocketIO test for iOS and Mac projects. 2013-07-13 19:24:09 +08:00
James Chen e88ec5ba06 Adding SocketIO source files to iOS and Mac project. 2013-07-13 19:22:18 +08:00
James Chen b5ca0b4ed5 Fixing warnings in SocketIOTest.cpp. 2013-07-13 19:21:31 +08:00
James Chen 8409e2942f Fixing warning in SocketIO.cpp 2013-07-13 19:20:11 +08:00
Jason Lust 5455d20fc1 Fix Issue #2354 
Once a Texture Atlas VAO has deallocated by glDeleteVertexArrays. The GLStateCache may have been recently set to that vaoID. When shortly after a new glGenVertexArrays gets the same vaoID but the glBindVertexArray is bypassed because of the GLStateCache is not aware the VAO was just invalidated, and new vertex are copied to the old freed address.
 2013-07-12 19:51:42 -07:00
Chris Hannon 8791c8119e task: hiding non-interface methods in the SsocketIO and SIOClient classes, adding SIOClientImpl as friend to access 2013-07-12 13:05:15 -04:00
minggo 34b60e99f1 Merge pull request #3140 from minggo/iss2393-mark_deprecated 
Use Point, Rect and Size member functions instead of global functions
 2013-07-12 08:59:27 -07:00
minggo 98fffdf7fc closed #2393:revert some wrong modification when fix conflicts 2013-07-12 23:58:31 +08:00
minggo 249e67d1f7 closed #2393:fix a compiling error 2013-07-12 18:25:36 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
James Chen a4a314376f Merge pull request #3143 from CocosRobot/updategeneratedsubmodule_1373619704 
[AUTO] : updating submodule reference to latest autogenerated bindings [ci skip]
 2013-07-12 02:06:24 -07:00
CocosRobot e0ed817177 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 09:01:48 +00:00
James Chen dda40ce9ab Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB. 2013-07-12 16:49:13 +08:00
James Chen 7ab5ec330b Merge pull request #3142 from dumganhar/iss2398-mac-raw-data 
closed 2398: [MAC] Adding Support for initializing Image with raw data.
 2013-07-12 01:41:18 -07:00
James Chen 81e3308585 Merge pull request #3141 from CocosRobot/updategeneratedsubmodule_1373618127 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-12 01:39:04 -07:00
James Chen 8d0888aa60 issue #2398: Trigger an assert when the default texture of Sprite was created unsuccessfully. 2013-07-12 16:36:19 +08:00
CocosRobot 746a077623 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-12 08:35:39 +00:00
James Chen ec1be2c1b2 closed #2398: [MAC] Adding Support for initializing Image with raw data. Otherwise, Sprite with no texture can't be created with default 2x2 texture which is RGBA raw data. 2013-07-12 16:35:07 +08:00
James Chen b74f286ea6 Merge pull request #3139 from dumganhar/iss2397-getInstance 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3136
 2013-07-12 01:27:44 -07:00
James Chen 1939534a2e [ci skip] Reverting cocos2dx/platform/android/java/project.properties. 2013-07-12 16:26:42 +08:00
James Chen c6b0882766 issue #2397: Updating Lua bindings. 2013-07-12 15:42:14 +08:00
James Chen 72f35aa14e issue #2397: Updating CCUserDefaultAndroid.cpp. 2013-07-12 15:32:37 +08:00
minggo 2d205c235f closed #2393:fix some warnings 2013-07-12 15:29:32 +08:00
James Chen f7b9c54cd1 issue #2397: Updating CCUserDefaultAndroid.cpp. 2013-07-12 15:21:21 +08:00
minggo 58fe3c7563 closed #2393: fixed conflicts 2013-07-12 15:07:44 +08:00
James Chen d5447eaea5 issue #2397: Typo fix. 2013-07-12 15:01:51 +08:00
James Chen d1527f39f5 issue #2397: FileUtils::sharedFileUtils() is not needed to be defined in CCFileUtilsXXX.cpp 2013-07-12 15:00:10 +08:00
minggo 5d9fea1416 issue #2393:mark PointZero RectZero and SizeZero as deprecated 2013-07-12 14:47:36 +08:00
James Chen 33c37f5f9d issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance. 2013-07-12 14:44:24 +08:00
James Chen 4a7e884de8 issue #2397: UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance(); 2013-07-12 14:34:57 +08:00
minggo 15096b0716 issue #2393:mark CCPointMake CCSizeMake CCRectMake as deprecated 2013-07-12 14:30:26 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 6038d69183 issue #2397: sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance. 2013-07-12 14:12:58 +08:00
minggo bb758df0d0 issue #2393:mark ccp as deprecated 2013-07-12 14:11:55 +08:00
James Chen f30ae2ef31 issue #2397: Updating CCAnimationCache.pkg 2013-07-12 13:57:05 +08:00
James Chen 41957f06c9 issue #2397: sharedAnimationCache --> getInstance. 2013-07-12 13:54:56 +08:00
James Chen 853a503d2f issue #2397: Updating bindings configuration. [Lua and JS]. 2013-07-12 13:48:31 +08:00
James Chen 1f8e852020 issue #2397: Shader::sharedShaderCache() --> Shader::getInstance(). 2013-07-12 13:40:01 +08:00