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

9266 Commits

Author SHA1 Message Date
James Chen f7e4dc04a7 Merge pull request #2554 from dumganhar/iss2149-const 
fixed #2149: Adding const qualification to some CCNode's getters
 2013-05-13 01:05:06 -07:00
James Chen 558dea5d83 fixed #2105: Updating the URL of 'Building Status' for travis. 2013-05-13 16:04:08 +08:00
James Chen a0c634aee5 Merge pull request #2553 from dumganhar/iss2105-travis 
fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'.
 2013-05-13 00:24:08 -07:00
James Chen f35e96a9f8 fixed #2105: Adding Travis build support. Moving script to 'tools/travis-script'. 2013-05-13 15:18:18 +08:00
James Chen c0a6f0c74f fixed #2149: "const CCSize& CCScrollView::getContentSize()" --> "const CCSize& CCScrollView::getContentSize() const". 2013-05-13 15:07:47 +08:00
James Chen fa8daa2ebb Merge branch 'master' of https://github.com/metalgit92/cocos2d-x into metalgit92-master 2013-05-13 14:03:29 +08:00
James Chen 2ca0334765 Update AUTHORS 2013-05-13 11:48:02 +08:00
James Chen 28154b1e66 Merge pull request #2533 from beingstudio/cec80e62ef4344aee1a34a0e6f35fd22f9147459 
fixed #2147: fix Null pointer access in CCBAnimationManager::getRunningSequenceName.
 2013-05-12 20:45:56 -07:00
minggo 6de50e2420 Update AUTHORS 2013-05-13 11:40:30 +08:00
minggo aa5e5661ce Merge pull request #2551 from silverscania/master 
Fix for corrupted texture issue: https://github.com/cocos2d/cocos2d-x/issues/2550
 2013-05-12 20:36:41 -07:00
minggo b10e896423 Update AUTHORS 2013-05-13 10:55:12 +08:00
minggo 3ebb61a09c Merge pull request #2543 from FlagellumDei/patch-1 
centerWindow() fix
 2013-05-12 19:44:15 -07:00
minggo f34c977520 Merge pull request #2552 from samuele3hu/FirstBranch 
First branch
 2013-05-12 19:15:49 -07:00
samuele3 8015520834 issue #2103 Add more lua test case(Replace encoding error) 2013-05-13 10:07:22 +08:00
Xavier Arias 71df5706bd Added const to CCNode::getChildrenCount() 2013-05-12 20:45:41 +02:00
silverscania ddafa42850 Fix for wrong alignment using texture format sizes other than 4 bytes. 
For example RGBA4444 is 2 bytes per pixel. A texture with width of 1 passes the previous power of 2 test, but the alignment value needs to be 2, not 4.
 2013-05-12 18:08:33 +03:00
samuele3 3c9b98cb30 issue #2103 Add more lua test case(Add PerformanceSpriteTest of PerformanceTest) 2013-05-11 17:00:19 +08:00
Xavier Arias Botargues 4d78d102dd Merge remote-tracking branch 'upstream/master' 2013-05-11 08:55:38 +02:00
Carsten Sandtner e86f11e36a Using CChttpClient instead of curl. 2013-05-10 15:00:03 +02:00
James Chen 2efb66e61d Merge pull request #2406 from dumganhar/data-visitor 
fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter.
 2013-05-10 01:28:59 -07:00
James Chen e3e07b4c1e Fixing compilation errors for NaCl port. 2013-05-10 16:03:01 +08:00
James Chen 23f23be681 Bug fixes for Nacl port. 2013-05-10 16:02:12 +08:00
James Chen 00391997ae Travis only build master branch. 2013-05-10 16:01:07 +08:00
James Chen 8ebde4df7f Merge branch 'data-visitor' of https://github.com/dumganhar/cocos2d-x into iss2142-datavisitor 2013-05-10 15:54:47 +08:00
James Chen db464530fb fixed #2142: updating win32. 2013-05-10 15:46:24 +08:00
James Chen 42427634f2 fixed #2142: Adding datavisitor support for other platforms except win32. 2013-05-10 15:37:40 +08:00
James Chen 0f77af8012 fixed #2142: Reset the build status to my repo. 2013-05-10 15:16:33 +08:00
James Chen fe27a5f75d fixed #2142: Adding travis-ci support for android. 2013-05-10 15:15:56 +08:00
James Chen cbafaf67a6 fixed #2142: Adding CCDataVisitor and Implementing CCPrettyPrinter, iOS port is ok. 2013-05-10 15:07:05 +08:00
samuele3 c47b104eca issue #2103 Add more lua test case(Add PerformanceParticleTest of PerformanceTest) 2013-05-10 14:59:21 +08:00
zhangbin cc2e198627 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-05-10 13:54:50 +08:00
zhangbin 3ce52e56aa Refactor the framework of plugin on iOS. 2013-05-10 13:54:11 +08:00
Darragh Coy 032aed4499 Fix custom font loading on Android when using fonts that are in resource mapped directories/paths. 
1: Use the CCFileUtils::fullPathForFilename function to lookup the resolved path for the font in the Android specific function, CCImage::getBitmapFromJava.

2: Remove a warning previously added in pull request 2422 (https://github.com/cocos2d/cocos2d-x/pull/2422) in CCFileUtils::fullPathForFilename in order to support change (1) above. If we pass just a system font name to CCFileUtils::fullPathForFilename such as 'Arial' (instead of a path) then it should just return 'Arial' and not generate a warning. We can't assume that when a path (or handle) given to CCFileUtils::fullPathForFilename isn't found within Cocos2dx that it doesn't exist or isn't valid. Depending on the platform there might be files or folders or handles that could be accessible to the app which might exist outside of the knowledge of Cocos2dx. The correct place to warn about missing resource files would be at the point where the resource loading itself fails; e.g if a texture or sound fails to load for example.
 2013-05-09 14:29:42 +01:00
Attila Szilágyi 989b0a249c Fix centerWindow() when the taskbar is located along the top or left screen edge 
centerWindow() will not center the window correctly when the taskbar is located along the top or left screen edge.
 2013-05-09 14:13:24 +03:00
James Chen c25c89e5a8 Update AUTHORS 2013-05-09 18:36:25 +08:00
James Chen bc4bf29f51 Merge pull request #2526 from djh-/master 
fixed #2140: The displayed color of CCDrawNode is incorrect when VAO is disabled.
 2013-05-09 03:34:49 -07:00
James Chen 22823d6ce8 Merge pull request #2536 from sunzhuoshi/master 
fixed #2106: Adding compile tool of JS bytecode for win32.
 2013-05-09 03:02:29 -07:00
samuele3 4e73425622 issue #2103 Add more lua test case(Add ToucheTest of PerformanceTest) 2013-05-09 16:59:39 +08:00
samuele3 e264582254 issue #2103 Add more lua test case(Add TextureTest of PerformanceTest) 2013-05-09 14:46:48 +08:00
samuele3 c39d6e2977 issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest) 2013-05-09 11:31:40 +08:00
samuele3 c76a373c60 issue #2103 Add more lua test case(Add NodeChildrenTest of PerformanceTest) 2013-05-09 09:57:05 +08:00
minggo ee8ec25f6a Merge pull request #2541 from j4m3z0r/emscriptenate 
Compile for Emscripten in asm.js mode
 2013-05-08 18:53:35 -07:00
James Chen 7900979f0b Update AUTHORS 2013-05-09 08:55:22 +08:00
James Chen 4b8d60bfe1 Merge pull request #2538 from FlowerpotGames/ccCArray-Fix 
fixed #2127: Fix for broken of ccArrayGetIndexOfObject after merging this commit(076f38c).
 2013-05-08 17:53:19 -07:00
Xavier Arias 1c6c13b3e5 Added const to CCNode's getTag & getContentSize 2013-05-09 00:20:08 +02:00
James Gregory 7f03838639 Use asm.js by default. 2013-05-08 14:59:48 -07:00
Ed Bartley 8b55f1285f Fix ccCArray 2013-05-08 15:22:05 -04:00
minggo c4965f8ca5 Update AUTHORS 2013-05-08 22:32:57 +08:00
minggo eb6c79b745 Merge pull request #2458 from FlowerpotGames/TexturePacker-SpriteSheetProtection 
Add encrypted PVR.CCZ support to ZipUtils + Tests
 2013-05-08 07:29:56 -07:00
Ed Bartley 2e8abad402 Merge pull request #1 from minggo/TexturePacker-SpriteSheetProtection 
Add TexturePackerEncryptionTest for other platforms
 2013-05-08 07:25:09 -07:00