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

27460 Commits

Author SHA1 Message Date
samuele3hu 3dd590cf9d Update bindings-generator submodule 2015-01-21 17:18:54 +08:00
yusheng.lu bec9b0e6b3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-01-21 17:14:16 +08:00
yusheng.lu 304f28a58a Update the csb resources for current Cocos2d-x 2015-01-21 17:08:16 +08:00
minggo 72fb059aeb Merge pull request #10144 from andyque/fixButtonPressActionIssue 
fix button pressAction scale issue
 2015-01-21 16:37:59 +08:00
minggo aab3de0b3e [ci skip] Update CHANGELOG 2015-01-21 16:27:55 +08:00
minggo 6b5b0f9784 Merge pull request #10149 from Dhilan007/v3-audioengine-freeze-fix 
Fixed AudioEngine causes game 'freeze' on Android
 2015-01-21 16:23:14 +08:00
minggo 67fed12e1b Merge pull request #10148 from CocosRobot/update_cocosfiles_1421827655 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 16:21:00 +08:00
WenhaiLin 5fd9ccfecb Fixed AudioEngine causes game 'freeze' on Android 2015-01-21 16:18:47 +08:00
CocosRobot c1e586ebab [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 08:07:36 +00:00
minggo ead455eb08 Merge pull request #10143 from andyque/updateDeps 
update 3rd party libraries to v3-deps-33
 2015-01-21 16:05:11 +08:00
minggo 86b1f4594a Merge pull request #10147 from geron-cn/fixProjectNodeLoader 
ProjectNode's actiontimeline  should  jump to 0 frame when  after nest i...
 2015-01-21 15:49:39 +08:00
minggo 571e313ff5 Merge pull request #10146 from htlxyz/fixed_show_dialog_on_android_without_runtime 
fixed run lua samples 360 will popup access wifi note!
 2015-01-21 15:34:13 +08:00
htl 12010ce3da fixed run lua samples 360 will popup access wifi note! 2015-01-21 15:30:05 +08:00
geron-cn 2fc79e2da5 ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd 2015-01-21 15:21:23 +08:00
minggo b1e7d66294 [ci skip] Update CHANGELOG 2015-01-21 15:09:06 +08:00
minggo 97f29adf84 Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas 
fix crash for textureAtlas
 2015-01-21 15:02:06 +08:00
andyque d3241cae9c update 3rd party libraries to v3-deps-33 2015-01-21 15:00:27 +08:00
minggo 82bb5e6f69 Merge pull request #10142 from CocosRobot/update_lua_bindings_1421822695 
[AUTO]: updating luabinding automatically
 2015-01-21 14:58:52 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
CocosRobot 4f7b6608c4 [AUTO]: updating luabinding automatically 2015-01-21 06:46:49 +00:00
minggo 26bdd8b532 Merge pull request #10140 from minggo/crash-fix 
check if plist file exist
 2015-01-21 14:41:44 +08:00
minggo 097d4f3266 check if plist file exist 2015-01-21 14:36:49 +08:00
Huabing.Xu 0ca47ab40f fix crash for textureAtlas 2015-01-21 14:14:53 +08:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
minggo 607ae4c2ca Merge pull request #10136 from andyque/fixSliderProgressBarRender 
fix progress bar render issue when switch scale9
 2015-01-21 14:10:18 +08:00
minggo 060c7b6721 Merge pull request #10137 from CocosRobot/update_lua_bindings_1421818960 
[AUTO]: updating luabinding automatically
 2015-01-21 14:09:57 +08:00
Huabing.Xu 14e9ff4ba4 Merge pull request #10134 from CocosRobot/update_cocosfiles_1421818870 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 13:46:46 +08:00
CocosRobot b31b22491d [AUTO]: updating luabinding automatically 2015-01-21 05:44:30 +00:00
andyque 7f7506fb99 fix progress bar render issue when switch scale9 2015-01-21 13:41:40 +08:00
CocosRobot 8a78a7e8fd [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 05:41:12 +00:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537 
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
 2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo 4f982693b2 [ci skip] Update CHANGELOG 2015-01-21 11:20:38 +08:00
minggo 342d12201b Merge pull request #10131 from CocosRobot/update_lua_bindings_1421809643 
[AUTO]: updating luabinding automatically
 2015-01-21 11:12:42 +08:00
minggo dbee383247 Merge pull request #10130 from CocosRobot/update_cocosfiles_1421809616 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 11:12:14 +08:00
minggo 11ff48416f Merge pull request #10060 from doomsdayer/v3_layout_test 
Updated the Layout Component demo
 2015-01-21 11:11:44 +08:00
CocosRobot 8f099c7f0d [AUTO]: updating luabinding automatically 2015-01-21 03:09:35 +00:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
minggo 6426f31a03 [ci skip] Update CHANGELOG 2015-01-21 11:08:14 +08:00
CocosRobot e221424a64 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 03:06:58 +00:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error 
update for ui object scale9 state refresh
 2015-01-21 10:51:55 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
minggo 05a1510d53 Merge pull request #10126 from CocosRobot/update_cocosfiles_1421807736 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-21 10:36:30 +08:00
CocosRobot ef9fabbc51 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-21 02:35:37 +00:00
minggo 372b11422d Merge pull request #10115 from dabingnn/FixCrashOnWin32 
Fix crash on win32
 2015-01-21 10:34:22 +08:00
Liam 776f40ea6b reset cpp-test project option 2015-01-21 10:19:05 +08:00
minggo 0d95e6595a Merge pull request #10124 from CocosRobot/update_lua_bindings_1421806130 
[AUTO]: updating luabinding automatically
 2015-01-21 10:13:05 +08:00
minggo 6109a075f5 [ci skip] Update CHANGELOG 2015-01-21 10:12:17 +08:00
CocosRobot 2f75d56c9b [AUTO]: updating luabinding automatically 2015-01-21 02:10:47 +00:00