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

17595 Commits

Author SHA1 Message Date
James Chen 3f3831f0ac Merge pull request #5757 from samuele3hu/develop_new_fix 
Update `bindings-generator` submodule and add auto-binding for the `RichText`
 2014-03-13 14:48:50 +08:00
samuele3hu a30ce6cfc5 Update `bindings-generator` submodule 2014-03-13 14:47:00 +08:00
samuele3hu 5942a6d55d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-13 14:32:58 +08:00
chuanweizhang2013 fe7c911cd3 Merge pull request #15 from cocos2d/develop 
update lua
 2014-03-13 14:32:21 +08:00
samuele3hu 108928e1a7 Update `bindings-generator` submodule and add auto-binding for the `RichText` 2014-03-13 14:31:07 +08:00
linchaogithub 347dd55f3d [jenkins-job-watchdog-threshold]replace[duration] 2014-03-13 14:12:29 +08:00
James Chen 4611a54f81 Merge pull request #5754 from CocosRobot/update_lua_bindings_1394683297 
[AUTO]: updating luabinding automatically[ci skip]
 2014-03-13 12:04:47 +08:00
CocosRobot 107a8791e1 [AUTO]: updating luabinding automatically 2014-03-13 04:02:44 +00:00
James Chen 57a0c71cd0 Merge pull request #5753 from CocosRobot/update_lua_bindings_1394682303 
[AUTO]: updating luabinding automatically
 2014-03-13 11:47:03 +08:00
CocosRobot 6d8bc4e616 [AUTO]: updating luabinding automatically 2014-03-13 03:45:57 +00:00
James Chen 3f3325494a Merge pull request #5750 from CocosRobot/update_lua_bindings_1394681799 
[AUTO]: updating luabinding automatically
 2014-03-13 11:39:10 +08:00
CocosRobot e3c6497c2b [AUTO]: updating luabinding automatically 2014-03-13 03:37:37 +00:00
James Chen 91e8032f25 Merge pull request #5749 from CocosRobot/update_cocosfiles_1394681739 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-13 11:37:33 +08:00
CocosRobot 2c59743abf [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-13 03:35:40 +00:00
linchaogithub ab4841e774 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-13 11:17:50 +08:00
linchaogithub 9dcca7641c [Jenkins] watchdog 2014-03-13 11:16:21 +08:00
James Chen 5f376e0b5b Update CHANGELOG [ci skip] 2014-03-13 11:10:53 +08:00
James Chen ad316654c2 Merge pull request #5743 from heliclei/remove-node-name 
remove node name related features from v3.0
 2014-03-13 11:09:49 +08:00
James Chen 51b708db8e Merge pull request #5741 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
[UI] Potential crash in cocos2d::ui::ScrollView.
 2014-03-13 11:06:15 +08:00
James Chen 817ce7cab9 Merge pull request #5742 from chuanweizhang2013/luamerage 
fixed template android build errors
 2014-03-13 10:54:05 +08:00
James Chen 2da4b7f375 Update CHANGELOG [ci skip] 2014-03-13 10:52:47 +08:00
James Chen 46649b3d1a Merge pull request #5744 from dingpinglv/Iss4277_fixedControlButtonBug 
Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback.
 2014-03-13 10:50:25 +08:00
heliclei c26b103b23 remove node name related features from v3.0 2014-03-13 10:45:02 +08:00
CaiWenzhi a4d558adee Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-13 10:25:32 +08:00
dingpinglv f8af43a7a5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Iss4277_fixedControlButtonBug 2014-03-13 10:15:05 +08:00
dingpinglv a567d467b3 Issue #4277: fixed a bug of ControlButton that it will crash when it deletes itself in its callback. 2014-03-13 10:14:24 +08:00
CaiWenzhi b8ce59962a Fixed bug of ScrollView 2014-03-13 10:11:41 +08:00
chuanweizhang2013 0dc85e42a7 modify module_path 2014-03-13 09:51:43 +08:00
chuanweizhang2013 d4fe9509fc Merge pull request #14 from cocos2d/develop 
update lua
 2014-03-13 09:43:25 +08:00
Ricardo Quesada c5cfb11eb8 Merge pull request #5739 from ricardoquesada/xcode_only_active_arch 
only active arch for DEBUG
 2014-03-12 08:40:41 -07:00
Ricardo Quesada 372c26b5ba only active arch for DEBUG 
RELEAES compiles all valid archs
 2014-03-12 08:40:04 -07:00
James Chen ac0aecb394 Merge pull request #5737 from dumganhar/runtime-fix 
Lua Runtime fix
 2014-03-12 21:48:35 +08:00
James Chen 77a8476c80 GLView::end needs to release self. 2014-03-12 21:45:57 +08:00
James Chen cc8738ee94 Simulator fix: After main loop, NSApplication needs to be terminated immediately. 2014-03-12 21:45:15 +08:00
Dhilan007 9c9d2c24bf EditBox:fixes clip the text width to fit to the text box on Android and IOS. 2014-03-12 21:40:58 +08:00
minggo e1afa0ad5c Merge pull request #5735 from minggo/template-java-des 
add description for how to load .so
 2014-03-12 21:31:30 +08:00
minggo 656211a72f add description for how to load .so 2014-03-12 21:28:38 +08:00
James Chen ac4faeb8c4 Merge pull request #5730 from Dhilan007/develop_label 
Label:Fixes the font rendering on Windows and  possible crash when create the label by font name.
 2014-03-12 21:25:38 +08:00
James Chen 8a1d5f0e2e Merge pull request #5729 from CocosRobot/update_cocosfiles_1394627952 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-12 20:40:07 +08:00
Dhilan007 3acaf3ece5 1.Label:Fixes the font rendering on Windows. 
2.fixed Label::setColor crash when create the label by font name.
 2014-03-12 20:39:13 +08:00
CocosRobot 0c68e4b1d5 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:39:13 +00:00
James Chen 2b657e71c4 Merge pull request #5727 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-12 20:36:44 +08:00
James Chen 8138df66e1 Merge pull request #5728 from dumganhar/develop 
[travis ci] Sort file list in generate-template-files.py.
 2014-03-12 20:36:20 +08:00
zhangbin be51779c4e Update the reference of submodule "cocos2d-console". 2014-03-12 20:35:05 +08:00
James Chen 04038a912f [travis ci] Sort file list in generate-template-files.py. 2014-03-12 20:34:49 +08:00
James Chen e691602205 Merge pull request #5725 from CocosRobot/update_cocosfiles_1394627042 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-12 20:25:05 +08:00
CocosRobot 6d867fb294 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-12 12:24:03 +00:00
James Chen b85a265cbb Merge pull request #5724 from dumganhar/develop 
Updates tools/travis-scripts/generate-template-files.py.
 2014-03-12 20:21:55 +08:00
James Chen c4752b260b Updates tools/travis-scripts/generate-template-files.py. 2014-03-12 20:18:55 +08:00
minggo 67e3a25582 Merge pull request #5669 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Develop nutty modify framework for315 crash fixed
 2014-03-12 19:45:46 +08:00