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

23576 Commits

Author SHA1 Message Date
andyque b00a7b3b38 add Node normalizedPosition bug test 2014-09-03 09:16:31 +08:00
andyque a79d35d08b remove NodeNormalizedPositionTest 2014-09-03 09:16:31 +08:00
andyque fab9a0052b fix normalizedPosition bug 2014-09-03 09:16:31 +08:00
yangxiao 8dff467b27 Merge branch 'newcode' into transition 2014-09-03 09:15:12 +08:00
lite3 6ff1289aed fix compile error on Xcode 2014-09-02 20:26:21 +08:00
andyque aa929fe106 add chipmunk prebuilt lib for linux 2014-09-02 03:51:41 -07:00
andyque 3743f02c7e finish ios/mac/android 2014-09-05 11:39:11 +08:00
andyque 4f217ed577 remove include 2014-09-05 10:43:33 +08:00
andyque 4276c59975 remove chipmunk source code 2014-09-05 10:42:59 +08:00
minggo 4881ca31d5 Merge pull request #7929 from andyque/fixVs2013CompileError 
Fix vs2013 compile error
 2014-09-02 18:17:30 +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
yangxiao f84c6a5d27 Merge branch 'newcode' into transition 2014-09-02 17:15:05 +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
lite3 5d935c2cea fix compile error on android 2014-09-02 16:16:36 +08:00
andyque 28f00df0cf Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox 2014-09-02 16:14:16 +08:00
andyque a0c28e49ac remove exteion edtibox 2014-09-02 16:14:07 +08:00
andyque 2deeee2109 remove extension luabindings 2014-09-02 01:11:50 -07:00
Huabing.Xu 05d0e04073 [ci skip] update template for triangles command 2014-09-02 15:05:21 +08:00
andyque 8033b1f7bb Merge branch 'v3' into mergeExtensionEditBox 2014-09-02 00:03:16 -07:00
minggo 4749205b61 Merge pull request #7917 from super626/v3 
bundle code adjustment
 2014-09-02 14:58:53 +08:00
yangxiao 49a2122e17 add sequence3d to template 2014-09-02 14:28:46 +08:00
minggo a7c71470f9 Merge pull request #7928 from CocosRobot/update_lua_bindings_1409636609 
[AUTO]: updating luabinding automatically
 2014-09-02 14:18:41 +08:00
CocosRobot dc15287ac3 [AUTO]: updating luabinding automatically 2014-09-02 05:45:07 +00:00
minggo a6ec956bc7 [ci skip] 2014-09-02 13:43:14 +08:00
minggo 2aaae00e47 Merge pull request #7926 from kaishiqi/patch-1 
Update CCGLViewImpl.cpp
 2014-09-02 13:41:04 +08:00
yangxiao 50a7a1703a add sequence3d to template 2014-09-02 12:05:37 +08:00
andyque dffdef1118 fix transition scene stencil buffer 2014-09-02 11:21:11 +08:00
kaishiqi 8f11dd7f8b Update CCGLViewImpl.cpp 
fix GLViewImpl::onGLFWMouseScrollCallback forger transform cursor position.
 2014-09-02 11:13:30 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
yangxiao aab78c898e Merge branch 'newcode' into transition 2014-09-02 10:45:46 +08:00
yangxiao d542624bfd remove from map when release 2014-09-02 10:40:29 +08:00
andyque c13e7b7224 Merge branch 'mergeExtensionEditBox' of github.com:andyque/cocos2d-x into mergeExtensionEditBox 2014-09-02 10:06:17 +08:00
andyque 6dc45f86e4 fix windows compile error 2014-09-02 10:05:22 +08:00
minggo 88a80495df Merge pull request #7923 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-02 09:41:41 +08:00
zhangbin 3e1053aa2a Update the reference of submodule cocos2d-console. 2014-09-02 09:31:23 +08:00
andyque fa33ab76fc remove UIEditBox test 2014-09-01 18:23:45 +08:00
andyque e24192aeb2 fix linux compile 2014-09-01 18:06:21 +08:00
XiaoYang 2a0743e5a5 Merge pull request #121 from liuliang2004/transition 
Configure project file
 2014-09-01 17:58:22 +08:00
yangxiao 9ce30bdabd add to linux 2014-09-01 17:52:13 +08:00
liuliang c4242b4d0b Configure project file 2014-09-01 17:45:45 +08:00
andyque ffee7b27d4 fix linux and android compile error 2014-09-01 17:43:40 +08:00
andyque 85ce801fdd remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
yangxiao 57a70b629f add sequence3d 2014-09-01 16:00:50 +08:00
andyque 0076953f97 fix iOS compile error 2014-09-01 15:55:09 +08:00
yangxiao 33005bedcb add to cocos3d 2014-09-01 15:32:06 +08:00
andyque aef0f5e729 Merge branch 'v3' into mergeExtensionEditBox 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/ui/Android.mk
	cocos/ui/CMakeLists.txt
	cocos/ui/proj.win32/libui.vcxproj
	cocos/ui/proj.win32/libui.vcxproj.filters
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
	tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
 2014-09-01 15:26:25 +08:00