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

24277 Commits

Author SHA1 Message Date
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
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +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
yangxiao df9ab144fe light work 2014-09-11 15:46:32 +08: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
minggo 33b033fbe7 Merge pull request #8006 from CocosRobot/update_cocosfiles_1410418133 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-11 14:51:39 +08:00
CocosRobot 11005a6ce9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-11 06:48:54 +00:00
minggo a5855baac4 Merge pull request #7976 from samuele3hu/v3_check_mat 
Added Math SSE implementation on x86 and update bindings-generator submodule
 2014-09-11 14:47:39 +08:00
andyque 1945c4f31e fix compile error 2014-09-11 14:45:55 +08:00
yangxiao e849b997ed modify interface 2014-09-11 12:05:49 +08:00
Dhilan007 518fd7ab6f Optimized seek for large file and log output on IOS. 2014-09-11 10:53:01 +08:00
yangxiao 3cfc36591c merge cocos 2014-09-11 10:13:57 +08:00
yangxiao 33cabb553a add transparent property 2014-09-11 09:15:24 +08:00
Ricardo Quesada 222679e21b Merge pull request #7999 from ricardoquesada/cmake_project_name 
Project Name is Cocos2d-X not Cocos2dX
 2014-09-10 16:27:04 -07:00
Ricardo Quesada 7ca0203fdf Project Name is Cocos2d-X not Cocos2dX 2014-09-10 16:26:32 -07:00
Ricardo Quesada be81288b09 Merge pull request #7998 from ricardoquesada/xcode_6_compatible 
Fixes Xcode 6 warnings
 2014-09-10 12:06:55 -07:00
Ricardo Quesada e46fa14be9 Fixes Xcode 6 warnings 2014-09-10 12:01:35 -07:00
Ricardo Quesada f9005d47fe Merge pull request #7997 from ricardoquesada/fixes_cmakefile_for_mac 
Fixes cmakefile for mac
 2014-09-10 09:52:27 -07:00