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

23670 Commits

Author SHA1 Message Date
yangxiao 9901cad113 merge cocos 2014-09-11 15:55:00 +08: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
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
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
Ricardo Quesada 11dcc37d4d Fixes cmakefile for mac 2014-09-10 09:51:56 -07:00
minggo b7d49858c5 Merge pull request #7995 from Dhilan007/v3 
fix compile error on android.
 2014-09-10 18:11:42 +08:00
Dhilan007 26142e1300 fix compile error on android. 2014-09-10 17:49:26 +08:00
Dhilan007 336c85e88e update project for audio engine on IOS. 2014-09-10 17:13:51 +08:00
Dhilan007 1d43c6ec82 Fix name of variables and coding style. 2014-09-10 17:12:46 +08:00
Dhilan007 61b316e12f Update the reference of submodule cocos2d-console 2014-09-10 14:46:21 +08:00
Dhilan007 fc27c5e32a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-09-10 14:35:33 +08:00
samuele3hu 51879a7e39 Update lua bindings ini config files 2014-09-10 14:18:21 +08:00
Dhilan007 e588b371bd Replace with 'struct' for AudioInfo/ProfileHelper. 2014-09-10 14:09:42 +08:00
minggo 4fd4a6fb94 Merge pull request #7994 from CocosRobot/update_cocosfiles_1410329274 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 14:08:40 +08:00
CocosRobot deef5cb3d7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:07:55 +00:00
minggo 46d4f487bb Merge pull request #7978 from super626/v3 
Calculate Content Size for Sprite3D
 2014-09-10 14:06:47 +08:00
minggo 896510c3db Merge pull request #7993 from CocosRobot/update_cocosfiles_1410328993 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 14:06:06 +08:00
minggo f032286787 Merge pull request #7961 from andyque/addChipmunkStaticLib 
Add chipmunk static lib
 2014-09-10 14:05:10 +08:00
CocosRobot 2656b94fe6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 06:03:14 +00:00
minggo 5a4c8644e9 Merge pull request #7992 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-10 14:01:53 +08:00
andyque 8aea6330a5 modify linux cmakelist 2014-09-09 22:59:55 -07:00
zhangbin c20caa7c35 Update the reference of submodule cocos2d-console. 2014-09-10 13:59:48 +08:00
minggo 1ec0375edf Merge pull request #7989 from CocosRobot/update_lua_bindings_1410313823 
[AUTO]: updating luabinding automatically
 2014-09-10 13:50:56 +08:00
Dhilan007 e45a4ff1bd 1.Fix name of variables. 
2.Fix control of volume on android.
 2014-09-10 13:47:17 +08:00
minggo cb3450a99b Merge pull request #7988 from CocosRobot/update_cocosfiles_1410313808 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-10 13:41:39 +08:00
andyque 499d828179 add chipmunk static library for linux 2014-09-10 10:58:20 +08:00
andyque 182a76a0f5 add chipmunk config for iOS & mac 2014-09-10 10:08:38 +08:00
andyque acae8a2535 Merge branch 'v3' into addChipmunkStaticLib 
Conflicts:
	CMakeLists.txt
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/cocos2d_wp8.vcxproj.filters
	cocos/CMakeLists.txt
 2014-09-10 10:00:15 +08:00
CocosRobot 0e49107514 [AUTO]: updating luabinding automatically 2014-09-10 01:52:43 +00:00
CocosRobot 15254a5ddb [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-10 01:50:11 +00:00