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

19664 Commits

Author SHA1 Message Date
CocosRobot 789a1496c8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-20 07:22:42 +00:00
zhangbin 1d73e75a0e closed #4419, Backup the environment file when adding environment variable in setup.py. 2014-03-20 15:21:15 +08:00
James Chen 3e83dc9b1d Merge pull request #5872 from shujunqiao/cocos-console-test 
[jenkins] modify job-comment-trigger to support [console].
 2014-03-20 15:14:42 +08:00
James Chen af228ac7ac Merge pull request #5876 from andyque/fix_warnings 
Fix warnings in cocos2dx target of XCode project.
 2014-03-20 15:06:41 +08:00
andyque 8c1bf48357 fixed label font size: from int to float 2014-03-20 15:03:48 +08:00
andyque e6645400a3 fix a paramers miss match 2014-03-20 14:54:09 +08:00
andyque ae3310bffb Merge branch 'develop' into fix_warnings 
Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h
 2014-03-20 14:50:02 +08:00
andyque 2dcc600fa1 remove unused accelerometer 2014-03-20 14:29:05 +08:00
James Chen eee5c278ad Merge pull request #5878 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-20 14:28:49 +08:00
James Chen 9dbae352fb Update CHANGELOG [ci skip] 2014-03-20 14:28:03 +08:00
James Chen 86d013b162 Merge pull request #5844 from heliclei/refactor-console-upload 
refactor upload:encode file with base64, detach upload from main loop
 2014-03-20 14:26:59 +08:00
andyque abf7598b1c remove deprecated classes in CCNodeLoader 2014-03-20 14:17:48 +08:00
andyque 8a409db1b6 change setFontSize from int to float 2014-03-20 14:14:02 +08:00
zhangbin 64f90e5f04 Update the reference of submodule "cocos2d-console". 2014-03-20 14:12:58 +08:00
andyque 957eb9363e fix win32 compile error 2014-03-20 13:42:09 +08:00
andyque ca6851f114 fix warnings of font and RichText 2014-03-20 11:58:36 +08:00
andyque 6c16f16b1d fix CCDirectorCaller warnings 2014-03-20 11:32:43 +08:00
cw e58270b099 updatewin32 2014-03-20 11:12:03 +08:00
andyque 7ae77c9335 fix cocos2dx engine internal warnings 2014-03-20 10:58:04 +08:00
cw ac99da1472 update 2dx Merge branch 'luamerage' of https://github.com/chuanweizhang2013/cocos2d-x into luamerage 2014-03-20 10:45:51 +08:00
andyque 6b042d26da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-20 10:43:31 +08:00
andyque abc88ecc6a delete not need variable in cocos-console-test.py. 2014-03-20 10:41:19 +08:00
cw b505e06500 update beside win32 2014-03-20 10:38:36 +08:00
andyque 7ea6185bbb "modify console_cmd to console_param in cocos-console-test.py." 2014-03-20 10:32:04 +08:00
andyque 4bd7a60ca9 modify args of [console]. 2014-03-20 10:24:10 +08:00
James Chen 0160d55349 Merge pull request #5875 from CocosRobot/update_lua_bindings_1395282033 
[AUTO]: updating luabinding automatically[ci skip]
 2014-03-20 10:23:00 +08:00
boyu0 9ba9687fc1 closed #4424: change name _enable->_enabled, _rotationEnable->_rotationEnabled, _gravityEnable->_gravityEnabled 2014-03-20 10:21:59 +08:00
CocosRobot 4b7f729154 [AUTO]: updating luabinding automatically 2014-03-20 02:21:28 +00:00
andyque 23c3fabeb2 fix box2d ios & mac library warnings 2014-03-20 10:18:56 +08:00
James Chen 577d473fd5 Merge pull request #5874 from samuele3hu/develop_tip 
Update `bindings-generator` submodule
 2014-03-20 10:17:16 +08:00
andyque d7b3737605 fix cocos2d tests and lu-bdinings and cocos2d_libs project config warnings 2014-03-20 10:14:25 +08:00
samuele3hu 3b2a5274ea Update `bindings-generator` submodule 2014-03-20 10:12:04 +08:00
cocos2d-html5 4e32f7c4c8 Merge pull request #1 from cocos2d/develop 
Merge cocos2d:develop
 2014-03-20 10:10:17 +08:00
samuele3hu 0afcf59539 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-20 09:56:06 +08:00
samuele3hu 0026fc2b2a close #4452:Add `addCustomHandler` in the ScriptHandlerMgr for Console auto test. 2014-03-20 09:54:38 +08:00
Sergey 13df593ae7 file attributes fixed 2014-03-19 18:58:19 +04:00
James Chen 287b0d3c35 Merge pull request #5873 from CocosRobot/update_lua_bindings_1395225104 
[AUTO]: updating luabinding automatically
 2014-03-19 18:33:18 +08:00
CocosRobot 0a57a5be11 [AUTO]: updating luabinding automatically 2014-03-19 10:32:42 +00:00
James Chen d102114d2a Update CHANGELOG [ci skip] 2014-03-19 18:31:39 +08:00
James Chen bed76d4460 Merge pull request #5870 from dabingnn/fix_scale0Bug 
closed #4382: added missed scaleZ feature in ScaleTo and ScaleBy.
 2014-03-19 18:28:12 +08:00
chuanweizhang2013 0d4afe3c54 reset files 2014-03-19 18:12:09 +08:00
chuanweizhang2013 aef2ccac11 Merge commit 'refs/pull/5871/head' of https://github.com/cocos2d/cocos2d-x into luamerage 2014-03-19 18:09:06 +08:00
James Chen 6485324d21 Update CHANGELOG [ci skip] 2014-03-19 18:00:25 +08:00
James Chen db4dd81030 Merge pull request #5871 from dumganhar/iss4450-missing-slash 
closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path.
 2014-03-19 17:57:40 +08:00
andyque 2f5e9ed654 modify job-comment-trigger to support [console]. 2014-03-19 17:57:19 +08:00
James Chen a84873a67b closed #4450: FileUtils::addSearchResolutionsOrder doesn't check whether there is a 'slash' at the end of path. 2014-03-19 17:56:29 +08:00
James Chen d523fc6a2a Update CHANGELOG [ci skip] 2014-03-19 17:46:52 +08:00
James Chen 7ad17e1e69 Merge pull request #5868 from dumganhar/iss4447 
closed #4447: [Desktop] Can't receive touchEnded event when mouse up outside of window
 2014-03-19 17:46:49 +08:00
James Chen 09a98df063 Merge pull request #5869 from dumganhar/iss4448-scrollview 
closed #4448: Elastic bounce back effect support for cocos2d::extension::ScrollView.
 2014-03-19 17:42:58 +08:00
samuele3hu a1ca3195ce Rename `addConsoleHandler` to `addCustomHandler` 2014-03-19 17:28:23 +08:00