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

17737 Commits

Author SHA1 Message Date
zhangbin beb6f7359c Update the reference of submodule "cocos2d-console". 2014-03-25 14:19:46 +08:00
James Chen d8793a87b9 Update CHANGELOG [ci skip] 2014-03-25 14:12:21 +08:00
James Chen 093b792221 Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected 
closed #3804: Change private functions and variables in Image class to protected, since its subclasses may need them.
 2014-03-25 14:07:58 +08:00
James Chen 32f647d38b Merge pull request #5940 from boyu0/iss4513_particle_readd_bug 
closed #4513: Particle doesn't animate when it was removed and re-added to another node.
 2014-03-25 14:05:12 +08:00
James Chen 2549368c62 Update AUTHORS [ci skip] 2014-03-25 14:03:48 +08:00
James Chen 190d0ab0b6 Merge pull request #5941 from LoungeKatt/patch-1 
Corrected a mistake of building android project in README.md.
 2014-03-25 14:00:21 +08:00
James Chen e11e290d9f Update AUTHORS [ci skip] 2014-03-25 13:56:40 +08:00
James Chen 004d5b421a Merge pull request #5947 from CocosRobot/update_lua_bindings_1395726548 
[AUTO]: updating luabinding automatically
 2014-03-25 13:53:38 +08:00
James Chen d2044eeede Update CHANGELOG [ci skip] 2014-03-25 13:53:05 +08:00
CocosRobot 5d2906ad8b [AUTO]: updating luabinding automatically 2014-03-25 05:50:20 +00:00
James Chen 400408f204 Merge pull request #5944 from aeonmine/develop 
Fix a memory leak in ActionManagerEx::initWithDictionary.
 2014-03-25 13:48:33 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: Uses new label instead of LabelTTF in engine.
 2014-03-25 13:46:17 +08:00
aeonmine 4edaa62ec7 Update CCActionManagerEx.cpp 
modify intent
 2014-03-25 12:41:16 +09:00
James Chen 5625c98443 Merge pull request #5942 from Dhilan007/develop_label2 
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
 2014-03-25 11:39:53 +08:00
boyu0 289e632a40 closed #4513: change 1.0 to 1.0f to avoid the warning. 2014-03-25 11:36:35 +08:00
boyu0 db0fe60974 closed #3804: Change Image private function and variable to protected, for the subclasses can use them. 2014-03-25 11:13:44 +08:00
Dhilan007 a3b83d68b2 update test case. 2014-03-25 11:10:48 +08:00
Dhilan007 b074890b57 update test case 2014-03-25 10:57:44 +08:00
mine_masahiro 3a0ee65a7e Fix ActionObject memory leak bug 2014-03-25 11:44:26 +09:00
Dhilan007 8278a510aa Label:fixed shadow offset didn't consider 'contentScaleFactor' 2014-03-25 10:41:53 +08:00
Dhilan007 859fe98502 label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
TwistedUmbrella 9034549932 Update README.md 2014-03-24 11:28:03 -04:00
boyu0 1520f85b32 closed #4513: fix titles. 2014-03-24 18:20:11 +08:00
James Chen bfa7d3e38c Update CHANGELOG [ci skip] 2014-03-24 18:12:16 +08:00
James Chen e583748347 Update AUTHORS [ci skip] 2014-03-24 18:10:25 +08:00
boyu0 759ec61639 closed #4513: Particle doesn't animate when readd it. 2014-03-24 18:08:55 +08:00
James Chen ec4b1ee485 Merge pull request #5939 from dumganhar/merge5923 
Merge PR #5923: implement fireEventToScript method to integrate JSB event handling with the original native code
 2014-03-24 18:08:02 +08:00
James Chen ae2027ea53 Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp 2014-03-24 17:59:44 +08:00
James Chen e075b82dfe tab -> 4 spaces, whitespace cleanup. 2014-03-24 17:58:35 +08:00
James Chen b6a175457c Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923 2014-03-24 17:55:43 +08:00
James Chen 666f2f34e9 Merge pull request #5938 from pandamicro/develop 
Issue #3897: Add missed constructors
 2014-03-24 17:47:53 +08:00
pandamicro bdfcc6c8cc Issue #3897: Add missed constructors 2014-03-24 17:44:01 +08:00
pandamicro cdb15dfe7c Merge pull request #3 from pandamicro/develop 
Sync Cocos2d-x
 2014-03-24 15:38:44 +08:00
James Chen 892662c5ef Merge pull request #5932 from pandamicro/ComponentScriptSupport 
Component script support
 2014-03-24 14:41:16 +08:00
pandamicro 6a8dfc4664 Fixed #4512: JSB script support added to Component 2014-03-24 14:24:27 +08:00
James Chen 3af864a808 Merge pull request #5927 from dumganhar/develop 
Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target.
 2014-03-24 10:27:57 +08:00
James Chen f6b94d8c3e Updates iOS/Mac project configuration, CCTweenFunc.h/.cpp was included to wrong target. 2014-03-24 10:23:21 +08:00
Chris Hannon ba37c07053 [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code 
-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
 2014-03-21 11:45:14 -04:00
James Chen 87cfbc9773 Merge pull request #5849 from shujunqiao/autotest 
[jenkins] updates autotest.py
 2014-03-21 16:52:58 +08:00
James Chen 1a9826a6cd Update CHANGELOG [ci skip] 2014-03-21 16:52:20 +08:00
James Chen 7e526f1976 Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw 
closed #4498: Refactor PhysicsDebugDraw.
 2014-03-21 16:50:42 +08:00
James Chen 900cce2e81 Update CHANGELOG [ci skip] 2014-03-21 16:50:11 +08:00
James Chen 832ab120aa Merge pull request #5862 from samuele3hu/develop_script_mgr 
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
 2014-03-21 16:48:53 +08:00
James Chen 81608ba153 Merge pull request #5920 from CocosRobot/update_lua_bindings_1395391030 
[AUTO]: updating luabinding automatically
 2014-03-21 16:40:14 +08:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
James Chen 526b9d4a0c Update AUTHORS [ci skip] 2014-03-21 16:37:27 +08:00
James Chen 2328694cb1 Update CHANGELOG [ci skip] 2014-03-21 16:35:48 +08:00
James Chen a9a6c0a674 Update AUTHORS [ci skip] 2014-03-21 16:35:01 +08:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
cocos2d-html5 2a2ed1ed47 Merge pull request #2 from pandamicro/develop 
Merge cocos2d:develop
 2014-03-21 15:57:48 +08:00