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

5752 Commits

Author SHA1 Message Date
Ricardo Quesada 33a4cd396d Adds missing xcshared data for missing projects 2014-09-05 14:32:14 -07:00
minggo 78d4e9797c Merge pull request #7955 from dabingnn/v3_reverse_VBOSIZE 
roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5
 2014-09-05 18:22:46 +08:00
Huabing.Xu 73b201b702 roll back, VBO_SIZE to 65536, INDEX_VBO_SIZE to 65536 * 1.5 2014-09-05 16:01:17 +08:00
minggo 1bf6c79329 Merge pull request #7953 from samuele3hu/v3_check_newnon 
Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create
 2014-09-05 11:37:57 +08:00
minggo 0fc1baee65 Merge pull request #7954 from huangshiwu/v3_wp8fix_pr 
fix wp8 compile error and modify default resource path
 2014-09-05 11:36:32 +08:00
huangshiwu 7372604f7f fix wp8 compile error and modify default resource path 2014-09-05 11:21:08 +08:00
samuele3hu 6209530e66 Fix the error that number of params was judged wrong for lua bindings of EventListenerMouse::create 2014-09-05 09:39:43 +08:00
samuele3hu 8c2ab3a4e7 Add manual lua bindings for GLView::getAllTouches 2014-09-04 22:12:59 +08:00
samuele3hu 61d1b67116 Merge branch 'v3_getAllTouches' of https://github.com/newnon/cocos2d-x into v3_check_newnon 2014-09-04 18:17:05 +08:00
minggo 060dfd94f3 Merge pull request #7948 from super626/v3 
Bugs on creating user custom mesh
 2014-09-04 17:39:40 +08:00
yangxiao 08a1405bdc fix bug on custom mesh 2014-09-04 14:26:23 +08:00
minggo 43e2b39bc0 Merge pull request #7921 from dabingnn/v3_trianglesCommand 
V3 triangles command
 2014-09-04 13:58:50 +08:00
minggo 659ba68199 Merge pull request #7942 from andyque/deleteRedundantCode 
remove dead code
 2014-09-04 13:45:12 +08:00
minggo cbe357bbca Merge pull request #7943 from Dhilan007/v3 
fix compile error on android.
 2014-09-04 13:43:39 +08:00
minggo 6539ff293d Merge pull request #7940 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-04 13:41:15 +08:00
minggo 7b1be80eb8 Merge pull request #7192 from kezhuw/bugfix_http_client 
bugfix: condition variable sleep on unrelated mutex
 2014-09-04 13:34:33 +08:00
Huabing.Xu 4ae2d6fc90 Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-09-04 11:27:12 +08:00
Huabing.Xu 6f03e97a6d add trianglesCommand head file to cocos2d 
remove invoking of base class constructor
 2014-09-04 11:20:43 +08:00
Dhilan007 64d926a75f fix compile error on android. 2014-09-04 11:04:50 +08:00
andyque a1edd4a819 remove dead code 2014-09-04 11:00:48 +08: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
andyque 3451672365 restore some configs 2014-09-04 10:49:45 +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 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
Sergey 89ed897f47 getAllTouches() in GLView 2014-09-03 23:25:30 +04:00
Ricardo Quesada 047025696c Merge pull request #7680 from andyque/fixNormalizedPosition 
fix normalizedPosition bug
 2014-09-03 10:07:22 -07:00
Kezhu Wang 925fb9aa38 bugfix: condition variable sleep on unrelated mutex 2014-09-03 23:56:54 +08:00
andyque 87af0ecdd6 add back libbox2d and libspine project to our solution 2014-09-03 17:37:34 +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
samuele3hu 45f08d54cb Fix the member name error in the `vec4_to_luaval ` 2014-09-03 15:07:31 +08:00
andyque 2e27a6865f update project to vs2013 2014-09-03 14:10:38 +08:00
minggo 66943eec98 Merge pull request #7932 from minggo/remove-unneeded-files 
remove unneeded files
 2014-09-03 13:36:31 +08:00
XiaoYang 4e0c358a90 Merge pull request #124 from liuliang2004/Meshv3 
Set the node name
 2014-09-03 13:12:33 +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 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 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
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