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

16879 Commits

Author SHA1 Message Date
CocosRobot e5ff9e1290 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 03:19:46 +00:00
James Chen 84901995ea Update AUTHORS [ci skip] 2014-02-14 11:19:00 +08:00
James Chen 78163e604e Merge pull request #5358 from dumganhar/merge5343 
closed #4037:Exposed the missing data structures of Spine to JS
 2014-02-14 11:17:38 +08:00
James Chen a5aa547c7b Merge pull request #5316 from natural-law/ScenarioTest 
closed #3738: Add performance test case on game scenario.
 2014-02-14 11:12:01 +08:00
James Chen 32012ee72a Adds missing files for vs. 2014-02-14 10:53:30 +08:00
James Chen 79e7d218cb Updates Android.mk 2014-02-14 10:37:50 +08:00
James Chen 2078f6de57 Updates CMakeLists. 2014-02-14 10:34:28 +08:00
James Chen f04e604a51 Updates JS-Tests. 2014-02-14 10:27:19 +08:00
James Chen 9d764718f9 issue #4037: Removes unused files from Xcode setting. 2014-02-14 10:26:27 +08:00
James Chen ea7a27fdf7 Updates JS-Tests. 2014-02-14 09:59:54 +08:00
James Chen bc222774d8 Merge pull request #5354 from CocosRobot/updategeneratedsubmodule_1392341386 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-02-14 09:44:22 +08:00
James Chen 8700d0f64e Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:44:06 +08:00
James Chen 1c6250bf00 Merge pull request #5356 from dumganhar/develop 
Typo fix in CCDevice.mm. widht -> width
 2014-02-14 09:43:24 +08:00
James Chen 1693ea0ef6 Typo fix in CCDevice.mm. 2014-02-14 09:41:06 +08:00
James Chen 17dab13502 Resets JS-Tests. 2014-02-14 09:36:27 +08:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 498a5e5b47 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-02-14 01:29:48 +00:00
James Chen 7a48305525 Merge pull request #5353 from CocosRobot/update_cocosfiles_1392341165 
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
 2014-02-14 09:29:12 +08:00
CocosRobot 15dbef99d3 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 01:26:06 +00:00
James Chen fb4699359d Merge pull request #5326 from Dhilan007/develop_label 
issue #3821: Moving platform-dependent codes of LabelTTF from cocos2d::Image to cocos2d::Device.
 2014-02-14 09:24:11 +08:00
James Chen 24c15b6b21 Updates project-creator/config-create/create_config.py. 
Don't print paths to terminal, it is only useful when debugging.
 2014-02-14 09:13:52 +08:00
James Chen c8ec90781c Merge pull request #5351 from heliclei/xcode-scheme 
share xcode build schemes to support xcodebuild command line build
 2014-02-14 09:09:07 +08:00
heliclei 37b372d21e fix build scheme name 2014-02-13 22:42:59 +08:00
Dhilan007 0d5c702708 move labelttf's platform-dependent code from CCImage to CCDevice 2014-02-13 21:08:43 +08:00
James Chen 6142e02ce8 Update AUTHORS [ci skip] 2014-02-13 20:55:46 +08:00
James Chen 933ecc4f4c Merge pull request #5350 from bagobor/patch-1 
Code format fix and small optimizations.
 2014-02-13 20:53:58 +08:00
heliclei 1154c28516 share xcode build schemes to support xcodebuild command line build 2014-02-13 18:11:24 +08:00
heliclei 05e5af7f5f use realloc to avoid memory leaks 2014-02-13 17:15:47 +08:00
James Chen 4ca47b3e5f Merge pull request #5328 from dumganhar/iss3990-particle 
closed #3990: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
 2014-02-13 17:03:52 +08:00
James Chen 4837b2dd2d issue #3990: setTotalParticles works as expected. _emissionRate has to be updated in setTotalParticles. 2014-02-13 17:01:38 +08:00
Denis deb4666e27 -fixed formating and small optimizations 2014-02-13 11:39:53 +03:00
CaiWenzhi cffd1e0cc5 Merge branch 'develop' into develop_nutty_modify_framework_addlayoutparameterclone 2014-02-13 16:32:57 +08:00
zhangbin 8ae5d2a049 closed #3964, Solve the bug of logic code in method Image::saveImageToPNG(). 2014-02-13 16:22:41 +08:00
James Chen 0f0d3a3295 Update AUTHORS [ci skip] 2014-02-13 14:11:39 +08:00
James Chen c9fd923cf0 Merge pull request #5338 from rgde/develop 
Fixed memory leak in AssetsManager::uncompress.
 2014-02-13 14:10:14 +08:00
heliclei 391768007b do not allow adding same commands 2014-02-13 14:07:12 +08:00
James Chen 1cd5ad3626 Updates COMMITTAG 
Skips to build the Pull Request of updating cocos_files.json.
 2014-02-13 13:58:55 +08:00
xingsenma 4eecc7e56b #3947 Simulate 'setTimeout' and 'setInterval' in JSB. 2014-02-13 13:54:05 +08:00
James Chen 7155273b0e Merge pull request #5349 from CocosRobot/update_cocosfiles_1392270517 
[AUTO] : updating tools/project-creator/module/cocos_files.json
 2014-02-13 13:49:58 +08:00
CocosRobot 14adb36002 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 05:48:38 +00:00
James Chen 37fabcb6ce Merge pull request #5348 from dumganhar/develop 
issue #4020: Sorts the elements in cocos_files.
 2014-02-13 13:46:44 +08:00
James Chen 3ac6f01742 issue #4020: Sorts the elements in cocos_files. 2014-02-13 13:45:50 +08:00
ucchen 6e742077c2 add spine setAnimationListener test; 2014-02-13 11:58:54 +08:00
James Chen 508fcce64d Merge pull request #5346 from CocosRobot/update_cocosfiles_1392263816 
[AUTO] : updating tools/project-creator/module/cocos_files.json
 2014-02-13 11:58:04 +08:00
CocosRobot 8b0ed16205 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 03:56:58 +00:00
James Chen 18d72f20ed Merge pull request #5345 from dumganhar/iss4020-auto-cocos-files 
issue #4020: Adds execute permission for generate-cocosfile.sh.
 2014-02-13 11:54:56 +08:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 431409c640 Merge pull request #5344 from dumganhar/iss4020-auto-cocos-files 
closed #4020: cocos_files.json should be auto-generated by CocosRobot.
 2014-02-13 11:47:39 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00