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

18743 Commits

Author SHA1 Message Date
James Chen 81608ba153 Merge pull request #5920 from CocosRobot/update_lua_bindings_1395391030 
[AUTO]: updating luabinding automatically
 2014-03-21 16:40:14 +08:00
koowolf 504501896f closed #4497: use /z7 to build without .pdb, or will face with error c3130. 2014-03-21 16:39:00 +08:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
James Chen 526b9d4a0c Update AUTHORS [ci skip] 2014-03-21 16:37:27 +08:00
James Chen 2328694cb1 Update CHANGELOG [ci skip] 2014-03-21 16:35:48 +08:00
James Chen a9a6c0a674 Update AUTHORS [ci skip] 2014-03-21 16:35:01 +08:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
boyu0 5edb9b9f86 closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist. 2014-03-21 16:25:22 +08:00
shujunqiao 40f025e330 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-21 16:04:24 +08:00
cw c0db4e91d1 fixed "/" 2014-03-21 15:59:26 +08:00
cocos2d-html5 2a2ed1ed47 Merge pull request #2 from pandamicro/develop 
Merge cocos2d:develop
 2014-03-21 15:57:48 +08:00
chuanweizhang2013 3c575d36d8 / 2014-03-21 15:53:02 +08:00
boyu0 41f9760f15 closed #4498: Refactor PhysicsDebugDraw. 2014-03-21 15:49:18 +08:00
James Chen 7c2ff48957 Update CHANGELOG [ci skip] 2014-03-21 15:27:22 +08:00
James Chen c30f466d56 Merge pull request #5915 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background 
closed #3509: PhysicsBody moves randomly when switch foreground/background
 2014-03-21 15:25:52 +08:00
pandamicro e59d17ffa7 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2014-03-21 15:17:51 +08:00
boyu0 bc13956981 closed #3509: PhysicsBody moves randomly when switch foreground/background. 2014-03-21 15:16:55 +08:00
James Chen d8bbb66864 Merge pull request #5911 from CocosRobot/update_cocosfiles_1395385180 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 15:16:35 +08:00
James Chen 8ee911adbc Merge pull request #5912 from CocosRobot/update_lua_bindings_1395385232 
[AUTO]: updating luabinding automatically
 2014-03-21 15:16:23 +08:00
James Chen e9d7937431 Merge pull request #5913 from dumganhar/develop 
Remove AccelerometerSimulation.h for cpp template.
 2014-03-21 15:16:00 +08:00
James Chen e89b203b13 Remove AccelerometerSimulation.h for cpp template. 2014-03-21 15:08:53 +08:00
CocosRobot 4721306fef [AUTO]: updating luabinding automatically 2014-03-21 07:01:27 +00:00
CocosRobot 1303985165 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 06:59:41 +00:00
James Chen 8f27611539 Merge pull request #5908 from CocosRobot/update_lua_bindings_1395383144 
[AUTO]: updating luabinding automatically
 2014-03-21 14:53:40 +08:00
James Chen cecc00c650 Merge pull request #5893 from Dhilan007/develop_label 
closed #4489: Label: Refactoring relevant functions of setting text color.
 2014-03-21 14:52:55 +08:00
shujunqiao a66a2a9bba Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test 2014-03-21 14:36:28 +08:00
CocosRobot 566c014060 [AUTO]: updating luabinding automatically 2014-03-21 06:26:33 +00:00
James Chen e879e0399d Merge pull request #5904 from lmskater/clean-workspace 
[Jenkins] Clean workspace after build finish
 2014-03-21 14:19:44 +08:00
James Chen 6f767cdb39 Update CHANGELOG [ci skip] 2014-03-21 14:18:20 +08:00
shujunqiao d18ee12678 for test close project in cocos-console-test.py. 2014-03-21 14:15:59 +08:00
James Chen 6d1d7bca84 Merge pull request #5903 from dumganhar/merge5898 
closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS.
 2014-03-21 14:15:28 +08:00
cw 2b458d6f8f update prebuilt runtime pc 2014-03-21 14:13:57 +08:00
lm 9598c151ed [Jenkins] Clean workspace after build finish 2014-03-21 13:57:38 +08:00
Dhilan007 1a08cd9b32 fix typo. 2014-03-21 13:52:12 +08:00
James Chen f51c39c034 closed #3897 : Constructors should be protected, but should be a way to disable them, added CC_CONSTRUCTOR_ACCESS. 
Thank @pandamicro.
 2014-03-21 13:44:29 +08:00
cw 8a40fbc159 update pc show msg 2014-03-21 11:56:21 +08:00
James Chen c2ce7b91d6 Merge pull request #5902 from CocosRobot/update_cocosfiles_1395372145 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 11:54:32 +08:00
samuele3hu e2ed17f69c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_script_mgr 2014-03-21 11:28:39 +08:00
samuele3hu 71f3cb7862 close #4452:Make `addCustomHandler` more distinct 2014-03-21 11:24:24 +08:00
CocosRobot 3c9acc938b [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-21 03:22:25 +00:00
James Chen b2d25ea092 Update CHANGELOG [ci skip] 2014-03-21 11:22:12 +08:00
James Chen 6340547fc5 Merge pull request #5900 from heliclei/fix-test-memory-leak 
fix memory leak in CocosDenshionTest.
 2014-03-21 11:21:04 +08:00
James Chen a9d8a325db Merge pull request #5899 from CocosRobot/update_cocosfiles_1395370450 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-21 11:11:38 +08:00
James Chen 368d5216ad Merge pull request #5897 from Dhilan007/develop_edtaa_license 
update license.
 2014-03-21 11:09:36 +08:00
heliclei 9c00484022 Autorelease custom extended class, fix memory leak 2014-03-21 11:07:28 +08:00
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