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

31987 Commits

Author SHA1 Message Date
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
XiaoFeng 91c88ec535 Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247 2015-08-06 18:12:08 +08:00
Liam 8b2747c53b fix particle3D file error 2015-08-06 18:03:50 +08:00
pandamicro 0d778386f4 Merge pull request #13208 from dabingnn/v3_fixViewportCompile 
Make viewport constructor more compile friendly
 2015-08-06 17:45:23 +08:00
pandamicro d6df8ae238 Merge pull request #13225 from CocosRobot/update_cocosfiles_1438772880 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-06 17:38:57 +08:00
pandamicro 7a758bb961 Merge pull request #13243 from jianglong0156/fixExitButton 
[ci skip]fix the close button function in main list frame
 2015-08-06 17:33:47 +08:00
pandamicro ad4c349800 Merge pull request #13245 from ZhangMenghe/v3-1586bugfix 
Fix offset on retina screen in shaderTest
 2015-08-06 17:27:47 +08:00
pandamicro a170b1caf1 Made SocketIO events correctly fired when compile in release mode 
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248

Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.

Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.

I also did the following in this commit:

- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
 2015-08-06 17:20:04 +08:00
ZhangMenghe 91ae9e07b6 Fix offset on retina screen in shaderTest 2015-08-06 15:14:13 +08:00
Liam 34000f4bde fix particle3d crash with error file 2015-08-06 15:13:54 +08:00
子龙山人 a0a34deb78 Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze 
CppTests: Avoid freeze when the program crashed on Android.
 2015-08-06 15:03:30 +08:00
jianglong0156 482b8f3583 fix the close button function in main list frame 2015-08-06 14:14:52 +08:00
WenhaiLin ffda8ace82 CppTests: Avoid freeze when the program crashed on Android. 2015-08-06 13:50:15 +08:00
子龙山人 41afa9695c Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost 
Spaces should not be lost if label created with Fingerpop.ttf
 2015-08-06 11:01:35 +08:00
fusijie 9b148b08cd Fixed SpriteBatchNode setFlipped bug. 2015-08-06 10:53:22 +08:00
pandamicro c4046591f7 Merge pull request #13238 from CocosRobot/update_cocosfiles_1438825122 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-08-06 09:52:15 +08:00
pandamicro 3066fb40a5 Merge pull request #13227 from geron-cn/3.7.1 
delete useless code
 2015-08-06 09:46:57 +08:00
CocosRobot a0b0c020f8 [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-06 01:38:44 +00:00
pandamicro 69c0d15e12 Merge pull request #13223 from natural-law/v3 
Move the framework-compile tools into cocos2d-console.
 2015-08-06 09:36:34 +08:00
Vladimir Perminov 7cacdaeaf1 Add getFileExtension to FileUtils 
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.

More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )

And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
 2015-08-05 22:21:16 +03:00
WenhaiLin e81d5af12d Spaces should not be lost if label created with Fingerpop.ttf 2015-08-05 23:46:41 +08:00
geron-cn ee6253319a delete useless code 2015-08-05 23:07:42 +08:00
CocosRobot 49dd429c2a [AUTO][ci skip]: updating cocos2dx_files.json 2015-08-05 11:08:02 +00:00
pandamicro 6831e24deb Merge pull request #13198 from ZhangMenghe/v3-UItestcase 
[ci skip]Modify UItestcase structure
 2015-08-05 19:06:11 +08:00