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

18648 Commits

Author SHA1 Message Date
CocosRobot 0b7a052fa6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 02:54:10 +00:00
James Chen b2d7769d05 Update CHANGELOG [ci skip] 2014-03-21 10:53:56 +08:00
James Chen d5e8bde89e Merge pull request #5889 from samuele3hu/develop_socket 
close #4400: Use the latest version of LuaSocket and modify the related project config
 2014-03-21 10:52:38 +08:00
Dhilan007 6da2773117 add licenses for AA-EDT 2014-03-21 10:49:07 +08:00
shujunqiao 686ed5dfa1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-21 10:42:23 +08:00
Dhilan007 cca1591e8a update license. 2014-03-21 10:23:11 +08:00
minggo 5439f02cc5 Merge pull request #5882 from natural-law/develop 
Backup the environment  file when adding environment variable in setup.py.
 2014-03-21 09:50:44 +08:00
Dhilan007 6b74794c74 fix typo and mistake in Label::setTextColor. 2014-03-21 09:47:29 +08:00
James Chen 767d427dc6 Update CHANGELOG [ci skip] 2014-03-21 09:35:27 +08:00
James Chen 3cde66dce8 Merge pull request #5854 from boyu0/iss4424_setgravityenable_fix 
closed #4424: fix PhysicsBody::setGravityEnable() doesn't work correctly sometimes
 2014-03-21 09:34:33 +08:00
Dhilan007 9dfa099bef Label:Refactoring related functions of color. 2014-03-20 20:56:10 +08:00
James Chen 2c9d8e80c7 Update CHANGELOG [ci skip] 2014-03-20 18:25:53 +08:00
James Chen c3ef689724 Merge pull request #5890 from dumganhar/iss4462-ccb 
closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode...
 2014-03-20 18:24:54 +08:00
James Chen b3cfc693ca Merge pull request #5887 from andyque/fix_tests_warnings 
Fix warnings in cpp-tests.
 2014-03-20 18:24:10 +08:00
samuele3hu 21a21c2d3d close #4400: Update the anrroid.mk for lua-bindings 2014-03-20 18:09:52 +08:00
samuele3hu 11bbeb4a30 close #4452:Using better spelling format 2014-03-20 17:56:33 +08:00
James Chen dcd919d9f7 closed #4462: Wrong logic in CCBAnimationManager::moveAnimationsFromNode. 2014-03-20 17:43:44 +08:00
samuele3hu 977ef0092b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-20 17:43:28 +08:00
shujunqiao fdb87cc69d ignore [] in command [console run]. 2014-03-20 17:40:41 +08:00
zhangbin bcb635c19b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-20 17:23:09 +08:00
samuele3hu 4b25c9f62e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-20 17:07:33 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
andyque 91d972ba87 rollback the scheme mode of projects 2014-03-20 17:01:21 +08:00
andyque dd790ce54d add id return value to LuaObjectCBridge 2014-03-20 16:59:18 +08:00
andyque cf86fd619f fix lua bindings warnings 2014-03-20 16:48:12 +08:00
andyque f26ae8a019 remove unused params warnings 2014-03-20 16:34:42 +08:00
James Chen 625ec5a882 Merge pull request #5886 from lmskater/add-master-build 
[Jenkins] Add master build in pull-request-builder.py
 2014-03-20 16:32:10 +08:00
andyque 7ab639ec0f fix lots compile warnings 2014-03-20 16:24:55 +08:00
lm 3db3a12318 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into add-master-build 2014-03-20 16:20:02 +08:00
lm 3f09fbdade [Jenkins] Add master build in pull-request-builder.py 2014-03-20 16:19:35 +08:00
zhangbin 74cb49661a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-20 15:29:12 +08:00
James Chen 7c56f45f28 Merge pull request #5881 from CocosRobot/update_cocosfiles_1395300160 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-20 15:28:11 +08:00
James Chen d3eecf367a Merge pull request #5883 from CocosRobot/update_lua_bindings_1395300230 
[AUTO]: updating luabinding automatically
 2014-03-20 15:27:45 +08:00
CocosRobot 0f22720da5 [AUTO]: updating luabinding automatically 2014-03-20 07:25:03 +00:00
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