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

21363 Commits

Author SHA1 Message Date
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
minggo f525500a41 [ci skip] 2014-07-03 14:20:31 +08:00
minggo 6e711c0e63 Merge pull request #7301 from samuele3hu/v3_animation3D 
Update ini files for Lua bindings to support ndk-r9d
 2014-07-03 14:09:28 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00
minggo 0b8f15dc2e Merge pull request #7298 from heliclei/update-ndk-r9d 
[ci skip]update travis ci to use ndk-r9d
 2014-07-03 13:56:29 +08:00
minggo 2cfea323b0 Merge pull request #7300 from 2youyouo2/v3 
fixed add relative data bug
 2014-07-03 13:56:04 +08:00
samuele3hu 4aeaa715e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D 2014-07-03 12:44:44 +08:00
samuele3hu 7b0126cdb7 Update ini files for Lua bindings 2014-07-03 12:02:48 +08:00
heliclei ec92f81446 [ci skip]update travis ci to use ndk-r9d 2014-07-03 11:02:04 +08:00
minggo 30c8f42217 Merge pull request #7294 from samuele3hu/v3_animation3D 
Update Sprite3D test cases for Lua
 2014-07-02 17:33:20 +08:00
samuele3hu ff79be2d3d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D 2014-07-02 17:01:14 +08:00
samuele3hu 320dc4737b Update Sprite3D test cases for Lua 2014-07-02 17:00:31 +08:00
zhangcheng 1551854c30 revert submodule res-ccs 2014-07-02 17:00:30 +08:00
minggo 1a089f4a18 Merge pull request #7286 from Dhilan007/v3-gc0702 
fixed can't get valid value from trigger button.
 2014-07-02 16:24:24 +08:00
minggo 8fa1283021 Merge pull request #7292 from CocosRobot/update_cocosfiles_1404289312 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-02 16:23:34 +08:00
CocosRobot 0b0b9ccdf3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-02 08:21:52 +00:00
minggo 666b0e3a2e Merge pull request #7289 from boyu0/lua_xcode6_support 
add lua Xcode6 iphone 5s simulator support.
 2014-07-02 16:17:33 +08:00
minggo c2d39605e3 Merge pull request #7288 from Dhilan007/v3-gc-removeAutoAdapter 
remove ControllerAutoAdapter project.
 2014-07-02 16:16:46 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 2b1ef55ea9 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
Dhilan007 e1bb1158bc update test case. 2014-07-02 15:25:18 +08:00
Dhilan007 097f782c38 remove ControllerAutoAdapter project. 2014-07-02 15:17:29 +08:00
boyu0 35ff23fa6d support for Xcode6 iphone 5s simulator 2014-07-02 15:16:06 +08:00
Dhilan007 adfc010555 fixed can't get valid value from trigger button[Moga] 2014-07-02 15:09:24 +08:00
Dhilan007 c5dc7b9cd0 fixed can't get valid value from trigger button. 2014-07-02 14:19:10 +08:00
minggo f49e230e97 Merge pull request #7284 from chengstory/v3_fixesWarning 
1. fixes same name warning.
 2014-07-02 13:40:07 +08:00
minggo c4423d6848 Merge pull request #7285 from andyque/fixScrollChildren 
fix scroll
 2014-07-02 11:55:48 +08:00
andyque 6e64714331 fix scroll 2014-07-02 11:48:28 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
cheng.zhang 492d7bcc20 Merge pull request #46 from geron-cn/chengstoryopbin 
fix win can not compile
 2014-07-02 10:31:25 +08:00
yinkaile c9f676d970 Merge pull request #13 from geron-cn/youyouv3 
fix bug: did not addArmatureFileInfo to the relativedata
 2014-07-02 10:28:07 +08:00
minggo 77762cd8b9 Merge pull request #7282 from Dhilan007/v3-320beta 
fixed no response in test case of curl.
 2014-07-02 10:19:37 +08:00
Dhilan007 bcf2b0e2b6 fixed no response in test case of curl. 2014-07-02 10:18:07 +08:00
minggo 8fa0412c55 Merge pull request #7280 from CocosRobot/update_lua_bindings_1404267188 
[AUTO]: updating luabinding automatically
 2014-07-02 10:16:40 +08:00
CocosRobot 2821a23640 [AUTO]: updating luabinding automatically 2014-07-02 02:15:26 +00:00
minggo a7a168169f Merge pull request #7263 from samuele3hu/v3_hot_fix 
Update the bindings-generaotr submodule
 2014-07-02 10:09:49 +08:00
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader 
fix Text reader font name
 2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
minggo d2587cc3a9 Merge pull request #7278 from minggo/v3 
fix effect of spine
 2014-07-02 09:59:01 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
Dhilan007 427e9d2388 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-02 09:47:22 +08:00
minggo aa80776eaa [ci skip] 2014-07-02 09:41:50 +08:00
samuele3hu 9ffbafaecd Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-02 09:37:47 +08:00
minggo 60a791ac12 Merge pull request #7276 from minggo/v3 
fix compiling error
 2014-07-01 22:27:10 +08:00
minggo aff1e3e1d2 fix compiling error 2014-07-01 22:26:15 +08:00
minggo ca7e95b342 Merge pull request #7274 from Dhilan007/v3-320beta 
fixed crash cause by addChild on win 7.
 2014-07-01 22:15:26 +08:00
minggo a5452a29aa Merge pull request #7275 from andyque/fixBinaryLoaderSize 
fix content Size
 2014-07-01 22:03:14 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
Dhilan007 6294a3024f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gcsplitadapter 2014-07-01 19:10:15 +08:00