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

11612 Commits

Author SHA1 Message Date
samuele3hu 1761669832 issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr 2013-07-16 12:47:40 +08:00
James Chen 72d1a074df Updating travis-script/before-install.sh, install gcc4.7 when build linux port. 2013-07-16 11:58:08 +08:00
James Chen 81d8b08e9e Merge pull request #3160 from CocosRobot/updategeneratedsubmodule_1373942764 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-15 20:13:19 -07:00
CocosRobot 5ce0e0df50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 02:46:07 +00:00
James Chen 14976a92d6 Update AUTHORS [ci skip] 2013-07-16 10:42:38 +08:00
James Chen b11000908e Merge pull request #3155 from pktangyue/patch 
issue #2406: Override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class.
Resolved issue: Color and Opacity of Scale9Sprite will not be changed when it's added to NodeRGBA and run with FadeIn/Out actions.
 2013-07-15 19:40:29 -07:00
James Chen e52ae63268 Merge pull request #3159 from CocosRobot/updategeneratedsubmodule_1373942008 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-15 19:34:48 -07:00
CocosRobot c2fc2219f5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 02:33:31 +00:00
James Chen dd5a745626 Merge pull request #3158 from dumganhar/deprecated-func 
closed 2405: Updating bindings-generator, bindings-generator should not bind deprecated methods.
 2013-07-15 19:27:22 -07:00
James Chen 62b12cbe82 Updating jsb_deprecated.js. 2013-07-16 10:14:52 +08:00
James Chen de4b231264 closed #2405: Updating bindings-generator, Bindings-generator should not bind deprecated methods. 2013-07-16 10:04:03 +08:00
James Chen ebf382b02f issue #2405: Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now. 2013-07-16 10:03:25 +08:00
James Chen a36a4bf19b issue2405: Adding jsb_deprecated.js for the compatibility of deprecated variables and methods. 2013-07-16 10:02:02 +08:00
samuele3hu c955a559bf issue #2377:Del register/unregister function in .cpp and .h files 2013-07-16 09:55:06 +08:00
Ricardo Quesada f9268c8054 small API changes 
::create()
and const chars
 2013-07-15 14:35:25 -07:00
Ricardo Quesada 9958e0d7f9 Adds more readability to the class internals. 
Changes:
  - creator (static) methods, and singleton methods (static) are always at the top of the class
  - Constructors, destructros, and init methods comes next
  - Then the instance methods for the class
  - Then the overriden methods
  - and finally the ivars

Also, overriden methos have the "override" context keyword
 2013-07-15 12:43:22 -07:00
Sam Gross 903b63abaf Ignore formatting specifiers in JavaScript log messages. 2013-07-15 15:10:02 -04:00
pktangyue 652f679d50 override updateDisplayedColor and updateDisplayedOpacity method in Scale9Sprite class 2013-07-15 20:13:30 +08:00
pktangyue 6bb2d64f19 add S9CascadeOpacityAndColor test 2013-07-15 20:13:30 +08:00
minggo 93e75bad9f Merge pull request #3154 from minggo/add-deprecated-header 
Add deprecated header
 2013-07-15 03:20:32 -07:00
minggo bee3b60b5a Merge branch 'add-deprecated-header' of https://github.com/minggo/cocos2d-x into add-deprecated-header 2013-07-15 17:52:20 +08:00
minggo cb271e21d8 issue #2404:fixed some compiling warnings 2013-07-15 17:51:36 +08:00
minggo dc2daf31ea issue #2404:fixed some compiling errors 2013-07-15 17:29:35 +08:00
minggo 07ae0c6da2 issue #2404:remove unneeded files 2013-07-15 17:18:30 +08:00
James Chen a86696ac0d Merge pull request #3152 from CocosRobot/updategeneratedsubmodule_1373879025 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-15 02:06:25 -07:00
CocosRobot 00052e8f4f [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-15 09:03:47 +00:00
James Chen 17a6b58f11 Merge pull request #3151 from dumganhar/iss2397-getInstance 
issue #2397: Application::sharedApplication --> Application::getInstance and mark Application::sharedApplication as deprecated function.
 2013-07-15 01:58:37 -07:00
minggo b97ea0815f issue #2404:re-add some global functions and variables and mark them as deprecated 2013-07-15 16:42:31 +08:00
James Chen 3bdf6b9c69 issue #2397: Mark Application::sharedApplication as deprecated function. 2013-07-15 16:37:38 +08:00
James Chen a83cc0ff69 issue #2397: Updating LUA bindings. 2013-07-15 16:25:46 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
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
samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
samuele3hu 51c3ced4ba issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples 2013-07-15 10:38:16 +08:00
rafael.x 3d23b65ad9 Changed the order of function calls within CocosDenshion::SimpleAudioEngine::end() 
to first detach the OpenAL source from the buffers so that sound buffers can be successfully deleted afterwards.

Additionally, improved the documentation within the header file a little bit.
 2013-07-14 17:27:00 +02:00
jdmunro 81d03c845f Merge branch 'jsb-distancesq' of https://github.com/jdmunro/cocos2d-x into jsb-distancesq 
Conflicts:
	scripting/javascript/bindings/cocos2d_specifics.cpp
 2013-07-14 09:56:57 +01:00
Tomoaki Shimizu 5e285add28 Add componentsSeparatedByString function for String class. 
For String Class and string, there is no function to split the string.
So, I added componentsSeparatedByString function.
The function name is the same as NSString.
 2013-07-14 17:56:34 +09:00
jdmunro 43f5b09964 Added JSB support for ccpDistanceSQ. 2013-07-14 09:53:09 +01:00
jdmunro 4cd3e2f738 Added JSB support for ccpDistanceSQ. 2013-07-14 09:24:51 +01: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