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

32060 Commits

Author SHA1 Message Date
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix 
Fixed minor problems in test cases.
 2015-08-08 12:04:30 +08:00
pandamicro 8e5338040e Merge pull request #13280 from CocosRobot/update_lua_bindings_1438987793 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-08-08 12:00:17 +08:00
pandamicro c6e86a707a Merge pull request #13283 from pandamicro/ccs-3d 
[ci skip]Fix cocostudio 3d test crash on mobile platform
 2015-08-08 11:59:12 +08:00
肖峰 4575587cf7 Fix cocostudio 3d test crash on mobile platform 2015-08-08 11:57:40 +08:00
CocosRobot eb9d1ea205 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-08-07 22:55:48 +00:00
Ricardo Quesada 0cbd71fd11 Merge pull request #13279 from ricardoquesada/xcode7_fixes 
compiles on xcode7
 2015-08-07 15:46:06 -07:00
Ricardo Quesada 789da4edd8 compiles on xcode7 2015-08-07 14:00:18 -07:00
pandamicro 4a333f0fdd Merge pull request #13277 from pandamicro/skeleton-fix 
[ci skip] Fix bugs of skeleton animation
 2015-08-08 00:45:45 +08:00
geron-cn 744fd74b3b make skeleton's debugdraw contorls all subbone's debug draw 2015-08-08 00:39:01 +08:00
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +08:00
pandamicro 7f215e97ff Merge pull request #13275 from jianglong0156/fixWebinitError 
[ci skip]fix error tips in web
 2015-08-07 20:26:39 +08:00
pandamicro eb932acd55 Merge pull request #13276 from cocos2d/revert-13274-animate3d 
Revert "remove unused code"
 2015-08-07 20:21:45 +08:00
pandamicro 4fe7c6de2a Revert "remove unused code" 2015-08-07 20:21:24 +08:00
pandamicro 5293dcb5bb Merge pull request #13274 from super626/animate3d 
remove unused code
 2015-08-07 20:05:14 +08:00
jianglong0156 99a52a34cb fix error tips in web 2015-08-07 18:29:45 +08:00
yangxiao d74245bfa9 remove unused code 2015-08-07 18:03:50 +08:00
pandamicro a8c729fb42 Merge pull request #13270 from jianglong0156/fixlabelColordisplay 
[ci skip]fix the node color property can not use
 2015-08-07 17:50:27 +08:00
Vincent Yang 354f64ec51 fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response. 2015-08-07 17:36:35 +08:00
andyque a35e89225e Re-implement Editbox on Android platform. 
This PR also fixed issue:

https://github.com/cocos2d/cocos2d-x/issues/9572

For the new EditBox:

1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.

When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.

2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.

3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
 2015-08-07 17:27:15 +08:00
jianglong0156 2c3b9009cb fix the node color property can not use 
code example:
````
node.color = xxxx // fix it
````
 2015-08-07 17:26:35 +08:00
WenhaiLin 5c33f2f6ed Add test case for issue 11143. 2015-08-07 16:50:54 +08:00
Huabing.Xu ba02d9df1d fix engine crash because of wrong initialisation on some android device 2015-08-07 16:37:41 +08:00
Vincent Yang 56204dbef9 Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable. 2015-08-07 16:30:22 +08:00
yangxiao 544c96385a fix background to foreground 2015-08-07 16:16:43 +08:00
pandamicro cb751e3c1a Merge pull request #13265 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-08-07 15:59:28 +08:00
zhangbin cf3f5ab26c Update the reference of submodule cocos2d-console. 2015-08-07 15:56:52 +08:00
geron-cn e1108c594c Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
 2015-08-07 15:48:33 +08:00
geron-cn c7bc84e19b fix crash when BoneNode destruct after skeleton destructed. 2015-08-07 15:41:31 +08:00
yangxiao d744554a4b avoid to trigger touch event multiple times 2015-08-07 15:09:01 +08:00
pandamicro ca95015adf Merge pull request #13262 from pandamicro/v3.7.1 
Update web reference
 2015-08-07 15:04:42 +08:00
pandamicro eeb68b38b2 Update web reference 2015-08-07 15:03:54 +08:00
geron-cn c6bc81d420 add destruct 2015-08-07 13:13:48 +08:00
pandamicro 22812cbc23 Merge pull request #13258 from jianglong0156/fixScriptLocation 
[ci skip]move script dir into js-tests  , the operation modified iOS,Mac project
 2015-08-07 11:53:32 +08:00
pandamicro c794523613 Merge pull request #13260 from ZhangMenghe/v3-tileMap 
TileMap Testcase abnormal
 2015-08-07 11:52:28 +08:00
geron-cn c569e70aea fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode 2015-08-07 11:44:06 +08:00
ZhangMenghe 7753a07359 TileMap Testcase abnormal 2015-08-07 11:20:17 +08:00
子龙山人 782c9588a4 Merge pull request #13253 from zilongshanren/fix-touch-intercept-issue 
Fix improper touch intercept event propagation.
 2015-08-07 10:28:51 +08:00
jianglong0156 121d6cff16 move script dir into js-tests , the operation modified iOS,Mac project 2015-08-07 10:25:57 +08:00
pandamicro d182c37f29 Merge pull request #13257 from ZhangMenghe/v3-UItestcase 
UIScene testcase modification
 2015-08-07 09:47:42 +08:00
pandamicro ecd0f68018 Merge pull request #13256 from pandamicro/skeleton-fix 
Fix crash when call removeChild from a bone which is already removed.
 2015-08-07 09:39:23 +08:00
子龙山人 4c88f1dd63 Merge pull request #13255 from ZhangMenghe/Docs 
Modify framework architecture graph
 2015-08-07 09:38:28 +08:00
geron-cn 7b572bed9d Fix crash when call removeChild from a bone which is already removed. 2015-08-07 09:37:18 +08:00
pandamicro 1b53d5b3d5 Merge pull request #13246 from VisualSJ/v3.7.1-13214 
Add loader tests
 2015-08-07 09:33:50 +08:00
ZhangMenghe 0ddd4e4a5b UIScene testcase modification 2015-08-07 09:30:22 +08:00
ZhangMenghe ed1a4b9ebb Modify framework architecture graph 2015-08-07 09:20:20 +08:00
andyque 211dde38e9 Fix improper touch intercept event propagation. 
When the container widget is disabled, it shouldn't intercept touch.

https://github.com/cocos2d/cocos2d-x/issues/8316
 2015-08-06 22:50:53 +08:00
pandamicro 934764af83 Merge pull request #13250 from xiaofeng11/v3.7.1 
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
 2015-08-06 22:23:40 +08:00
pandamicro 1bd948dcde Merge pull request #13247 from liamcindy/v3.7.1_reader 
fix particle3d crash with error file
 2015-08-06 22:03:42 +08:00
geron-cn 3ae3020d61 fix crash when fore call remove child bone from a bone which already removed from a skeleton. 2015-08-06 19:43:11 +08:00
VisualSj ca82f41c1b Add loader tests 2015-08-06 19:03:26 +08:00