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

16272 Commits

Author SHA1 Message Date
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
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
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
James Chen 1cd5ad3626 Updates COMMITTAG 
Skips to build the Pull Request of updating cocos_files.json.
 2014-02-13 13:58:55 +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
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
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
James Chen 67630311f2 Adds 'ParticleSystemQuad::updateTexCoords' method. 2014-02-13 11:03:35 +08:00
James Chen 5da57e4c7d closed #3990: Adds test case for issue 3990. 2014-02-13 11:03:35 +08:00
James Chen c0b8460aef closed #3990: ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value. 2014-02-13 11:03:34 +08:00
James Chen a255478127 [Linux] Installs libssl-dev package. 2014-02-13 10:08:03 +08:00
James Chen 4146ce69da Merge pull request #5339 from azmeuk/jsb-linux 
closed #3895: Linux javascript bindings support.
 2014-02-13 09:51:45 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards. 
Dependencies installation is skipped on linux distributions that does not use .deb package format.
 2014-02-13 01:25:23 +01:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00
Ricardo Quesada 2108ae0c35 Merge pull request #5324 from heliclei/develop 
set prompt for async console commands
 2014-02-13 08:05:07 +08:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
Éloi Rivard 3fb2b61591 Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
Ricardo Quesada c13a38e42f Merge pull request #5340 from ricardoquesada/fix_fps 
quick fix for positioning the FPS on non HD
 2014-02-13 04:11:18 +08:00
Ricardo Quesada 61e4ffbc3c quick fix for positioning the FPS on non HD 2014-02-13 04:10:23 +08:00
Denis 3595a4f31b -fixed memleak 2014-02-12 16:48:18 +03:00
Ricardo Quesada e7af234d31 Merge pull request #5337 from ricardoquesada/droid_fonts 
Droid fonts
 2014-02-12 20:27:51 +08:00
Ricardo Quesada 200eb9713c Merge branch 'develop' into droid_fonts 2014-02-12 20:23:40 +08:00
James Chen cd4478f17c Merge pull request #5327 from chuanweizhang2013/jsruntime 
issue #3984: Adds JS runtime and project-creator supports creating JS runtime.
 2014-02-12 18:51:30 +08:00
chuanweizhang2013 ea82fa33e6 lower-case for StartRuntime and ReloadRuntime 2014-02-12 18:23:07 +08:00
James Chen 130c326811 Update CHANGELOG [ci skip] 2014-02-12 17:42:45 +08:00
James Chen 8ede1607a2 Merge pull request #5325 from boyu0/iss3988_physics_setRotation_bug 
closed #3988: fix bug Node::setRotation() moves opposite when node has a physics body.
 2014-02-12 17:00:31 +08:00
boyu0 e7c077bb16 closed #3988: fix indent. 2014-02-12 16:21:26 +08:00
boyu0 4fda8a2635 closed #3988: add bug test 2014-02-12 15:57:02 +08:00