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

22600 Commits

Author SHA1 Message Date
xuzhiqiang 85dd898319 bug fix 2014-08-02 08:04:29 +08:00
andyque 5af4657fbb fix windows utf8 source code file can not compile erorr 2014-08-01 21:20:27 +08:00
andyque d7b17c598d fix potential crash when user remove self in widgets callback 2014-08-01 20:58:42 +08:00
minggo f74626e946 Merge pull request #7648 from CocosRobot/update_cocosfiles_1406879885 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-01 15:59:03 +08:00
CocosRobot ea1d9d4657 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 07:58:06 +00:00
minggo 6d6864056d Merge pull request #7646 from CocosRobot/update_lua_bindings_1406879478 
[AUTO]: updating luabinding automatically
 2014-08-01 15:56:09 +08:00
CocosRobot fda11428bf [AUTO]: updating luabinding automatically 2014-08-01 07:53:19 +00:00
minggo 2ca623a26a Merge pull request #7630 from huangshiwu/v3_pr 
GLView Hook
 2014-08-01 15:47:45 +08:00
huangshiwu 575c9787c0 Merge branch 'v3' into v3_pr 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-08-01 15:11:34 +08:00
andyque 6dee943352 fix mac EditBox callback issue 2014-08-01 14:56:47 +08:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
Ningyu 137de84b05 add test case 2014-08-01 14:39:45 +08:00
andyque 630c41e4a3 Merge branch 'patch-1' of https://github.com/yongkangchen/cocos2d-x into testPR7549 2014-08-01 13:37:27 +08:00
minggo e5aad1fa39 Merge pull request #7641 from CocosRobot/update_lua_bindings_1406865618 
[AUTO]: updating luabinding automatically
 2014-08-01 12:04:18 +08:00
minggo 80eaca9d84 Merge pull request #7640 from CocosRobot/update_cocosfiles_1406865528 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-01 12:02:48 +08:00
CocosRobot 26c76f5cf1 [AUTO]: updating luabinding automatically 2014-08-01 04:02:13 +00:00
minggo 0c9b960de3 [ci skip] 2014-08-01 12:01:12 +08:00
minggo 780549e5a7 [ci skip] 2014-08-01 11:59:44 +08:00
CocosRobot ce8c5ee327 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-01 03:58:50 +00:00
minggo 0b6254d095 Merge pull request #7587 from dzl-ian/fixTextWidgetColor 
Add getter and setter for TextColor to Text Widget
 2014-08-01 11:57:10 +08:00
kaile.yin d1407ca929 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-08-01 11:42:18 +08:00
maltium baba808391 RotateBy action now uses just Vec3() to keep track of the state 2014-07-31 23:28:33 +02:00
maltium 98354e9f8e RotateTo action now uses Vec3() to keep track of the state 2014-07-31 23:05:58 +02:00
Dhilan007 aea83926f0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 23:41:56 +08:00
yangxiao 52d3c4461f adjust 2014-07-31 20:20:29 +08:00
yangxiao 7562214c63 adjust 2014-07-31 20:19:43 +08:00
yangxiao 342dc05890 adjust 2014-07-31 20:17:51 +08:00
yangxiao 4aec1d37c8 code adjust 2014-07-31 20:14:43 +08:00
yangxiao e03d284e26 merge cocos2d 2014-07-31 18:55:41 +08:00
yangxiao 49052ab28d code adjust 2014-07-31 18:42:58 +08:00
yangxiao ca0afcfa92 add Quaternion::ZERO 2014-07-31 18:36:30 +08:00
yangxiao 17304b4775 add comment 2014-07-31 18:28:52 +08:00
yangxiao 780914687e code style adjust according minggo 2014-07-31 18:14:01 +08:00
minggo e3d17ac67d Merge pull request #7638 from natural-law/protected-node 
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
 2014-07-31 17:58:47 +08:00
kaile.yin 2fc082cac1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 17:52:49 +08:00
samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	tools/tolua/cocos2dx.ini
 2014-07-31 17:52:22 +08:00
zhangbin d224c77bd4 Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8. 2014-07-31 17:51:06 +08:00
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +08:00
minggo d44a359a1f Merge pull request #7635 from samuele3hu/v3_new_module 
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
 2014-07-31 17:39:01 +08:00
samuele3hu 27b98ee237 Update cocos2d-console submodule 2014-07-31 17:31:59 +08:00
samuele3hu 2b562ace1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 2014-07-31 17:22:33 +08:00
minggo 2851bd9193 Merge pull request #7627 from andyque/fixScale9Sprite 
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
 2014-07-31 16:58:56 +08:00
samuele3hu 5b620e610f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_module 2014-07-31 16:44:29 +08:00
samuele3hu ee4e479ce1 Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting 2014-07-31 16:38:55 +08:00
minggo 8d8176737a Merge pull request #7634 from dabingnn/v3_mac_fix 
fix some misc issues for mac
 2014-07-31 16:28:33 +08:00
Huabing.Xu 2bf2bbeed7 1. remove mac 32bit 
2. remove copy files for mac(because of mac use .a instead of dylib)
 2014-07-31 15:46:16 +08:00
samuele3hu a47e52b5bc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-07-31 15:22:46 +08:00
samuele3hu 9666f1ad7f Split luabindings module to some independent modules 2014-07-31 15:20:23 +08:00
minggo 0e7eb3614e Merge pull request #7618 from dabingnn/v3_buildAllTarget 
add target to build All target
 2014-07-31 14:25:37 +08:00
minggo 35d50e873d Merge pull request #7633 from CocosRobot/update_lua_bindings_1406785652 
[AUTO]: updating luabinding automatically
 2014-07-31 14:23:01 +08:00