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

23428 Commits

Author SHA1 Message Date
Jeff Wang c1c942d673 Merge pull request #1 from cocos2d/v3 
update
 2014-09-04 11:39:10 +08:00
minggo 7d5b1ba74f Merge pull request #7941 from CocosRobot/update_cocosfiles_1409799384 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-04 10:57:00 +08:00
CocosRobot 071aedaa51 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-04 02:56:25 +00:00
minggo 99f3b371ed Merge pull request #7744 from lite3/customguireader 
GUIReader::registerTypeAndCallBack for std::function and add CustomGUIReader for lua
 2014-09-04 10:53:00 +08:00
minggo 83719db8d4 Merge pull request #7934 from wohaaitinciu/loc_ver 
fix: win32 cpp-tests sometimes cannot display font correctly
 2014-09-04 10:49:30 +08:00
minggo 0d777bfa95 Merge pull request #7099 from newnon/v3_edit_box_fixes 
EditBox fixes & improvements
 2014-09-04 10:34:44 +08:00
minggo cef9a21324 [ci skip] 2014-09-04 10:10:26 +08:00
minggo 139af3faa8 Merge pull request #7938 from super626/v3 
fix bundle
 2014-09-04 10:03:15 +08:00
Sergey 14853d46f2 setPlaceholderFontSize fix 2014-09-03 23:38:44 +04:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
minggo 290238f6e1 Merge pull request #7936 from andyque/fixWarning 
fxi compile warning
 2014-09-03 16:19:04 +08:00
XiaoYang f03c4d4790 Merge pull request #125 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 15:59:49 +08:00
liuliang c167ed17ee Set the node name 2014-09-03 15:55:11 +08:00
minggo 5fa3e11613 Merge pull request #7937 from samuele3hu/v3_template_fix 
Fix the crash of project which was created by the lua-template-runtime
 2014-09-03 15:12:36 +08:00
samuele3hu 45f08d54cb Fix the member name error in the `vec4_to_luaval ` 2014-09-03 15:07:31 +08:00
andyque 58f219fc20 test extension::Scale9Sprite and remove unused file compile flags 2014-09-03 15:00:09 +08:00
samuele3hu d681bdce92 Fix the crash of project which was created by the lua-template-runtime 2014-09-03 14:54:58 +08:00
andyque 7493c7bf3e fxi compile warning 2014-09-03 14:47:04 +08:00
minggo 1b9e9d2291 Merge pull request #7935 from CocosRobot/update_cocosfiles_1409722664 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-03 14:16:03 +08:00
CocosRobot 1ec9933045 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 05:37:45 +00:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
minggo 1ddd7149ee Merge pull request #7933 from CocosRobot/update_cocosfiles_1409717115 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-03 13:36:12 +08:00
XiaoYang 4e0c358a90 Merge pull request #124 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 13:12:33 +08:00
XiaoYang 92cfea4dfa Merge pull request #123 from lvlonggame/v3 
Make old version static model compatible.
 2014-09-03 13:12:19 +08:00
CocosRobot 61a3c80cb9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 04:05:23 +00:00
minggo 61f2efbc1b Merge pull request #7931 from CocosRobot/update_lua_bindings_1409714881 
[AUTO]: updating luabinding automatically
 2014-09-03 12:03:24 +08:00
minggo cb64b11781 Merge pull request #7930 from CocosRobot/update_cocosfiles_1409714789 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-03 12:03:06 +08:00
minggo b37ef4e1c3 remove unneeded files 2014-09-03 11:52:19 +08:00
liuliang 278a3441ce Set the node name 2014-09-03 11:43:42 +08:00
Jeff ed849a1863 fix: win32 cpp-tests sometimes cannot display font correctly 
Pass FILE_SHARE_READ to the 3rd parameter of CreateFileW. Otherwise, it
may fail to get date from the font file.
 2014-09-03 11:34:40 +08:00
CocosRobot ffb36d577e [AUTO]: updating luabinding automatically 2014-09-03 03:29:43 +00:00
minggo 8fd8ba97db [ci skip] 2014-09-03 11:27:45 +08:00
CocosRobot 2dea7c3a18 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-03 03:26:30 +00:00
minggo eee9ac626a Merge pull request #7815 from andyque/mergeExtensionEditBox 
merge extension EditBox to ui module
 2014-09-03 11:25:10 +08:00
minggo 9351caaa58 Merge pull request #7927 from andyque/fixTransitionSceneStencilBuffer 
fix transition scene stencil buffer
 2014-09-03 10:26:28 +08:00
andyque b00a7b3b38 add Node normalizedPosition bug test 2014-09-03 09:16:31 +08:00
andyque a79d35d08b remove NodeNormalizedPositionTest 2014-09-03 09:16:31 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
lite3 6ff1289aed fix compile error on Xcode 2014-09-02 20:26:21 +08:00
minggo 4881ca31d5 Merge pull request #7929 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-02 18:17:30 +08:00
lvlong 387f190ff1 Merge newcode into v3 2014-09-02 17:52:02 +08:00
lvlong 27f771744a static model load problem of old version . 2014-09-02 17:33:22 +08:00
andyque dafbf28283 fix release mode compile error 2014-09-02 16:42:23 +08:00
andyque fadfa87afd fix vs2013 compile error 2014-09-02 16:42:04 +08:00
andyque a429959e65 fix lua compile error 2014-09-02 01:31:02 -07:00
andyque 51e160beff fix EditBox lua compile error 2014-09-02 17:37:55 +08:00
lite3 5d935c2cea fix compile error on android 2014-09-02 16:16:36 +08:00
andyque 28f00df0cf Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox 2014-09-02 16:14:16 +08:00
andyque a0c28e49ac remove exteion edtibox 2014-09-02 16:14:07 +08:00
andyque 2deeee2109 remove extension luabindings 2014-09-02 01:11:50 -07:00