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

11024 Commits

Author SHA1 Message Date
James Chen d37161a143 Merge pull request #3167 from CocosRobot/updategeneratedsubmodule_1373968198 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-07-16 07:13:42 -07:00
CocosRobot 1ea10c75c3 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 09:50:03 +00:00
James Chen 80590dcfc1 Merge pull request #3132 from samuele3hu/ScriptHandler 
issue 2377:Add scriptHandlerMgr to manager lua script handler
 2013-07-16 02:40:50 -07:00
minggo 52a27c5fc9 Merge pull request #3118 from jotel/text-shadow-opacity-fix 
Now opacity option for shadow in CCLabelTTF works.
 2013-07-16 02:39:36 -07:00
James Chen 84d520c7f9 Update AUTHORS [ci skip] 2013-07-16 17:37:50 +08:00
James Chen b71e9d83e1 Merge pull request #3165 from sunzhuoshi/master 
Fixed bad js constant names and added config macro for "spine" extension
 2013-07-16 02:36:49 -07:00
James Chen 5b06824036 closed #2410: Formatting codes in Texture2D::initWithString. 2013-07-16 16:47:35 +08:00
samuele3hu 596eb9df3e issue #2377:Modify tojs/cocos2dx.ini and a function name 2013-07-16 16:45:57 +08:00
minggo c6c50eb55a Merge pull request #3110 from sergey-shambir/opensl_fix 
CocosDenshion: fixed wrong assertion in android OpenSL engine
 2013-07-16 01:39:01 -07:00
James Chen 510b29a2ff Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2013-07-16 16:33:02 +08:00
sunzhuoshi ec7456a43c Removed config macro for "spine" extension 2013-07-16 16:19:20 +08:00
James Chen 617a763413 Merge pull request #3164 from dumganhar/develop 
Updating JS-test to the latest version.
 2013-07-16 00:37:34 -07:00
James Chen b543de648c [iOS, Mac]Adding jsb_deprecated.js to resource folder for JSB projects. 2013-07-16 15:35:13 +08:00
James Chen f09cf35dba Updating JS-test to the latest version. 2013-07-16 15:31:23 +08:00
James Chen 8c75416f4f Merge pull request #3163 from dumganhar/develop 
closed 2307: Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension.
 2013-07-16 00:08:48 -07:00
James Chen 63bd5cf10b closed #2307: Adding cc.PhysicsSprite.prototype.getBody in jsb_cocos2d_extension. 
The issue was fixed at https://github.com/cocos2d/cocos2d-x/pull/2869 .
Reported at http://www.cocos2d-x.org/boards/20/topics/25430?r=31702
 2013-07-16 15:06:36 +08:00
sunzhuoshi 6d0f7dfe88 Merge branch 'master' of https://github.com/sunzhuoshi/cocos2d-x 2013-07-16 15:04:51 +08:00
sunzhuoshi 8cad37a8d8 Fixed javascript constant names auto-generated 2013-07-16 14:47:47 +08:00
samuele3hu 241c01bec3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-16 14:47:46 +08:00
James Chen ec6e49e2ea Merge pull request #3162 from dumganhar/develop 
issue #2404: [JSB] Mark cc.Action.copy and cc.Animation.copy as deprecated methods.
 2013-07-15 23:45:35 -07:00
James Chen c813ff4b02 issue #2404: Mark cc.Action.copy and cc.Animation.copy as deprecated methods. 2013-07-16 14:43:20 +08:00
James Chen a9b1ac829f Update AUTHORS [ci skip] 2013-07-16 14:01:02 +08:00
James Chen 2ed5a40a36 Merge pull request #3146 from tks2shimizu/develop 
closed 2408: Add componentsSeparatedByString function for String class.
 2013-07-15 23:00:12 -07:00
James Chen 196aa59f37 Update AUTHORS [ci skip] 2013-07-16 13:44:05 +08:00
James Chen 570240a75f Merge pull request #3145 from jdmunro/jsb-distancesq 
Added JSB support for ccpDistanceSQ
 2013-07-15 22:42:37 -07:00
James Chen 388fb08e28 Update AUTHORS [ci skip] 2013-07-16 13:37:53 +08:00
James Chen 92d6fbddd3 Merge pull request #3156 from colesbury/js_log 
Ignore formatting specifiers in JavaScript log messages.
 2013-07-15 22:36:13 -07:00
samuele3hu e593956c38 issue #2377:Modify solution config 2013-07-16 13:26:37 +08:00
James Chen 18ba3e27d3 Merge pull request #3161 from CocosRobot/updategeneratedsubmodule_1373951450 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-15 22:13:36 -07:00
CocosRobot c956385841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-16 05:10:52 +00:00
James Chen 13e939b55e Merge pull request #3157 from ricardoquesada/override_love 
closed 2407: Adds more readability to the class internals.
 2013-07-15 22:05:33 -07:00
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 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