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

17719 Commits

Author SHA1 Message Date
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
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
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
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
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
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
boyu0 41f9760f15 closed #4498: Refactor PhysicsDebugDraw. 2014-03-21 15:49:18 +08:00
James Chen 7c2ff48957 Update CHANGELOG [ci skip] 2014-03-21 15:27:22 +08:00
James Chen c30f466d56 Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: PhysicsBody moves randomly when switch foreground/background
 2014-03-21 15:25:52 +08:00
pandamicro e59d17ffa7 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-03-21 15:17:51 +08:00
boyu0 bc13956981 closed #3509: PhysicsBody moves randomly when switch foreground/background. 2014-03-21 15:16:55 +08:00
James Chen d8bbb66864 Merge pull request #5911 from CocosRobot/update_cocosfiles_1395385180 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 15:16:35 +08:00
James Chen 8ee911adbc Merge pull request #5912 from CocosRobot/update_lua_bindings_1395385232 
[AUTO]: updating luabinding automatically
 2014-03-21 15:16:23 +08:00
James Chen e9d7937431 Merge pull request #5913 from dumganhar/develop 
Remove AccelerometerSimulation.h for cpp template.
 2014-03-21 15:16:00 +08:00
James Chen e89b203b13 Remove AccelerometerSimulation.h for cpp template. 2014-03-21 15:08:53 +08:00
CocosRobot 4721306fef [AUTO]: updating luabinding automatically 2014-03-21 07:01:27 +00:00
CocosRobot 1303985165 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 06:59:41 +00:00
James Chen 8f27611539 Merge pull request #5908 from CocosRobot/update_lua_bindings_1395383144 
[AUTO]: updating luabinding automatically
 2014-03-21 14:53:40 +08:00
James Chen cecc00c650 Merge pull request #5893 from Dhilan007/develop_label 
closed #4489: Label: Refactoring relevant functions of setting text color.
 2014-03-21 14:52:55 +08:00
CocosRobot 566c014060 [AUTO]: updating luabinding automatically 2014-03-21 06:26:33 +00:00
James Chen e879e0399d Merge pull request #5904 from lmskater/clean-workspace 
[Jenkins] Clean workspace after build finish
 2014-03-21 14:19:44 +08:00
James Chen 6f767cdb39 Update CHANGELOG [ci skip] 2014-03-21 14:18:20 +08:00
James Chen 6d1d7bca84 Merge pull request #5903 from dumganhar/merge5898 
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
 2014-03-21 14:15:28 +08:00
lm 9598c151ed [Jenkins] Clean workspace after build finish 2014-03-21 13:57:38 +08:00