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

26872 Commits

Author SHA1 Message Date
jianglong0156 5d781d7eb4 issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 20:49:43 +08:00
Huabing.Xu 33a8b3db61 Merge pull request #9943 from CocosRobot/update_cocosfiles_1421064818 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-01-12 20:14:52 +08:00
CocosRobot 27da58e4b5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-01-12 12:13:39 +00:00
Huabing.Xu 33c49bb8d1 Merge pull request #9942 from CocosRobot/update_lua_bindings_1421064387 
[AUTO]: updating luabinding automatically
 2015-01-12 20:12:30 +08:00
CocosRobot 93d1d9c940 [AUTO]: updating luabinding automatically 2015-01-12 12:08:54 +00:00
CocosRobot e396a6dfae [AUTO]: updating luabinding automatically 2015-01-12 12:06:33 +00:00
Huabing.Xu b18cfe3f80 [ci skip] update Authors 2015-01-12 20:03:36 +08:00
Huabing.Xu ae5530c29a Merge pull request #9915 from AknEp/v3 
FileUtils::fullPathForFilename should return "" if resource is not found.
 2015-01-12 20:01:56 +08:00
minggo 12539c24be Merge pull request #9937 from pipu/serialize_parse_inneractionframe_alphaframe 
Serialize parse inneractionframe alphaframe
 2015-01-12 20:01:45 +08:00
minggo f183b2f349 Merge pull request #9934 from andyque/fixWebViewCrash 
fix webView Test Crash issue
 2015-01-12 19:41:07 +08:00
minggo e5204ed89f [ci skip] Update CHANGELOG 2015-01-12 19:40:40 +08:00
minggo 74e9fc6382 Merge pull request #9932 from dabingnn/v3_addParamForVertexIndexBufferUsage 
add param for usage in class VertexBuffer and IndexBuffer
 2015-01-12 19:33:18 +08:00
minggo 731e6b179d Merge pull request #9931 from dabingnn/v3_fixGL_Invalid_value 
refresh attributes and uniforms in glprogramstate
 2015-01-12 19:33:04 +08:00
pipu aaccdef1eb Modify cocos/editor-support/cocostudio/CMakeLists.txt. 2015-01-12 19:14:04 +08:00
pipu c7a923b658 Update method clone() for InnerActionFrame. 2015-01-12 17:59:30 +08:00
yinjimmy d1205ceeea remove lua-template-runtime folder 2015-01-12 17:55:41 +08:00
yinjimmy 0978a88b7f Merge branch 'v3' into combine 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
	templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
	tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
	tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
 2015-01-12 17:54:58 +08:00
pipu d9adda89c2 Update cocos/scripting/lua-bindings/manual/cocostudio/lua_cocos2dx_csloader_manual.cpp 2015-01-12 16:51:50 +08:00
pipu 0982c6b4e5 Add "AlphaFrame" into cocos2dx_studio.ini. 2015-01-12 16:25:33 +08:00
andyque 32450ae9a3 fix empty http string 2015-01-12 16:16:39 +08:00
SunLightJuly 3a64d723de modified lua_cocos2dx_Node_setRotationQuat() to to support chain call 2015-01-12 15:21:21 +08:00
yinjimmy 53cc07a2f6 Add setEventTrackingEnable for event tracking 2015-01-12 15:18:30 +08:00
pipu c9afc4a4d4 Modify tools/tolua/cocos2dx_csloader.ini 2015-01-12 15:17:01 +08:00
SunLightJuly a902df93c6 modified the manual binding files to support functions call chain 2015-01-12 15:12:01 +08:00
Huabing.Xu 2b79ff1d87 add param for usage in class VertexBuffer and IndexBuffer 2015-01-12 14:59:12 +08:00
Huabing.Xu d5416d8a7a refresh attributes and uniforms in glprogramstate 2015-01-12 14:43:31 +08:00
pipu d364a329db Merge branch 'v3' into parse_inneractionframe 2015-01-12 14:26:05 +08:00
Nite Luo 7741daf091 Billboard Render correctly 2015-01-11 22:20:41 -08:00
pipu 7e83336af8 Update InnerActionFrame. 2015-01-12 13:54:17 +08:00
pipu 34402b75c9 Merge branch 'v3' into parse_inneractionframe 2015-01-12 13:38:30 +08:00
minggo 4f4d49ef79 Merge pull request #9929 from jianglong0156/v3 
issue cocos2d/cocos2d-js #2563 : ActionTimelineData constructor
 2015-01-12 13:38:00 +08:00
yinjimmy dea3cf9863 move runtime source to libsimulator project 2015-01-12 12:52:44 +08:00
yinjimmy d1821fb1ef update template for iOS 2015-01-12 12:46:43 +08:00
minggo c4e47ed38d Merge pull request #9902 from super626/v3 
add fog test and arcball test
 2015-01-12 11:58:03 +08:00
minggo 2bad7ac8d5 Merge pull request #9921 from super626/camera 
Do not show the objects visible by camera when the camera is invisible
 2015-01-12 11:57:49 +08:00
jianglong0156 4cc0dd129a issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 11:57:03 +08:00
minggo fe63a1a46c [ci skip]update version 2015-01-12 11:31:09 +08:00
pipu 82be4701b5 Update resource DemoPlayer.csb in path tests/cpp-tests/Resources/ActionTimeline 2015-01-12 11:12:38 +08:00
pipu 6237115fbf Fixes bug that clone InnerActionFrame. 2015-01-12 11:09:19 +08:00
pipu 78b32332d3 Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +08:00
minggo 45f54e8358 Merge pull request #9923 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-01-12 10:29:50 +08:00
zhangbin 489dc2da16 Update the reference of submodule cocos2d-console. 2015-01-12 10:27:14 +08:00
Huabing.Xu 20f6839821 [ci skip] update CHANGELOG(fix typo) 2015-01-12 10:25:15 +08:00
yangxiao 6d297d377b camera visible check 2015-01-12 10:08:55 +08:00
Satoshi SUZUKI b0d1dd2435 FileUtils::fullPathForFilename should return "" if resource is not found. 
I Think this method should return empty string when the resource is not found.
Because, I cannot check if the file found or not with current implementation.
 2015-01-10 19:30:42 +09:00
Nite Luo 6dfc021c02 Merge renderqueue to one 2015-01-09 14:06:21 -08:00
Huabing.Xu 6984e7097f Merge pull request #9909 from dabingnn/v3_updateReleaseNotes 
V3 update release notes
 2015-01-09 21:57:37 +08:00
Huabing.Xu df9713e060 [ci skip] update release notes 2015-01-09 21:55:59 +08:00
Huabing.Xu 23f20ef910 [ci skip] update release notes 2015-01-09 21:52:54 +08:00
Huabing.Xu ad42e15b62 [ci skip]Update CHANGELOG 2015-01-09 21:22:55 +08:00