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

24041 Commits

Author SHA1 Message Date
minggo ba7c0475ba Merge pull request #8023 from CocosRobot/update_lua_bindings_1410509636 
[AUTO]: updating luabinding automatically
 2014-09-12 16:21:49 +08:00
CocosRobot 29f9cbfd6a [AUTO]: updating luabinding automatically 2014-09-12 08:15:54 +00:00
minggo 35a481f36b Merge pull request #8021 from huangshiwu/v3_shadercompilefix 
V3 shadercompilefix
 2014-09-12 16:10:01 +08:00
Dhilan007 23f1b740bf Label:It may display incorrectly with outline feature enabled. 2014-09-12 16:03:01 +08:00
Huabing.Xu 1571367042 fix bug for MeshCommand materialID generation 2014-09-12 15:43:10 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
huangshiwu f1f6373b6e fix Cocos2dShaderCompile's compile error --use chipmunk static library 2014-09-12 15:29:10 +08:00
minggo 7256865f76 [ci skip] 2014-09-12 15:19:31 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
minggo 2f5a3b6f8c [ci skip] 2014-09-12 15:09:50 +08:00
minggo 52d16afd12 Merge pull request #8016 from minggo/template-fix 
fix template compiling error
 2014-09-12 15:07:02 +08:00
minggo cecdab4d62 Merge pull request #8015 from andyque/fixButtonIssue 
Fix text only button can't be touched issue
 2014-09-12 15:06:33 +08:00
minggo 11f9eaa4a0 fix template compiling error 2014-09-12 15:02:18 +08:00
huangshiwu 11d8829b3a Deprecate DrawPrimitives and enhance DrawNode --little modify 2014-09-12 14:50:41 +08:00
andyque 294271682b change return const value to value 2014-09-12 14:39:22 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
huangshiwu 6182a872c6 Deprecate DrawPrimitives and enhance DrawNode --more modify 2014-09-12 11:12:20 +08:00
yangxiao 9eb62ed1f6 Merge branch 'newcode' into v3 2014-09-12 10:00:13 +08:00
Jeff Wang ec4ae7e238 Merge pull request #7 from cocos2d/v3 
update
 2014-09-12 09:59:32 +08:00
Ricardo Quesada db1505ca1a Merge pull request #8013 from ricardoquesada/more_cmake_fixes 
even more cmake fixes
 2014-09-11 18:36:10 -07:00
huangshiwu 147bb7301b fix wp8 compile error --add BillBoard and BillBoardTest 2014-09-12 09:33:30 +08:00
minggo 18ebcd5621 Merge pull request #8011 from CocosRobot/update_cocosfiles_1410424277 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-12 09:29:52 +08:00
Ricardo Quesada 525fecc4ce even more cmake fixes 2014-09-11 17:36:49 -07:00
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu 8d8f4436db Deprecate DrawPrimitives and enhance DrawNode --fix android compile error 2014-09-11 17:55:47 +08:00
honghui cb0faeac7e fix merge error 2014-09-11 17:50:46 +08:00
honghui 59c8c3abf2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-11 17:19:31 +08:00
honghui 83d7bdcae9 Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3 2014-09-11 17:07:55 +08:00
honghui d5a8904fbb open WIFI is not necessary for runtime 2014-09-11 17:04:26 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
CocosRobot 827679099c [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 08:31:19 +00:00
minggo bb0b7a9b8a Merge pull request #7950 from super626/billboard 
3D BillBoard
 2014-09-11 16:29:05 +08:00
yangxiao 75b46e9a09 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-09-11 16:06:00 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
minggo b8810f1d10 Merge pull request #8008 from CocosRobot/update_cocosfiles_1410420542 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-11 15:53:11 +08:00
minggo 8935a35c77 Merge pull request #8010 from CocosRobot/update_cocosfiles_1410421693 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-11 15:52:54 +08:00
CocosRobot 974e810bb2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 07:48:14 +00:00
minggo 775008a752 Merge pull request #8009 from andyque/removeArrivalOrder 
remove orderOfArrival = 0
 2014-09-11 15:46:26 +08:00
andyque 67ad24e7c1 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
CocosRobot 876fcb891a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 07:29:03 +00:00
minggo 4106596f9d [ci skip] 2014-09-11 15:24:22 +08:00
minggo e0df8114fa Merge pull request #7968 from Dhilan007/v3-audio903 
New Audio Engine[ios/android]
 2014-09-11 15:23:17 +08:00
minggo edf5c8109b Merge pull request #8007 from CocosRobot/update_lua_bindings_1410419367 
[AUTO]: updating luabinding automatically
 2014-09-11 15:22:38 +08:00
CocosRobot 434d4fbfdd [AUTO]: updating luabinding automatically 2014-09-11 07:11:40 +00:00
minggo 04d4df54c0 [ci skip] 2014-09-11 15:10:45 +08:00
minggo 561ec7ea7b [ci skip] 2014-09-11 15:09:12 +08:00
minggo 702a90091a Merge pull request #7956 from denpen/fix-scrollview-bug 
fix ScrollView bug
 2014-09-11 15:06:17 +08:00
minggo 138d419505 Merge pull request #8005 from andyque/fixWin32CompileError 
fix compile error
 2014-09-11 15:01:10 +08:00