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

23720 Commits

Author SHA1 Message Date
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
yangxiao 97c8764ae7 remove unused header 2014-09-01 15:21:47 +08:00
Huabing.Xu 57dd8fd4e1 remove commented code 2014-09-01 15:19:02 +08:00
yangxiao 538fe2e543 Merge branch 'newcode' into transition 2014-09-01 15:14:30 +08:00
yangxiao c24701ac79 Merge branch 'newcode' into v3 2014-09-01 15:11:27 +08:00
Huabing.Xu 6824453804 windows work for trianglesCommand 2014-09-01 15:08:09 +08:00
yangxiao b5a3bb1c03 sequence3d work 2014-09-01 15:07:06 +08:00
Huabing.Xu dad62ad6df Merge branch 'v3' into v3_trianglesCommand 
Conflicts:
	cocos/renderer/CCQuadCommand.h
 2014-09-01 14:27:19 +08:00
minggo d2a49d1c1f Merge pull request #7918 from samuele3hu/v3_tip_opt 
Update bindings-generators submodule
 2014-09-01 14:11:37 +08:00
samuele3hu b58ccc5961 Update bindings-generators submodule 2014-09-01 14:08:02 +08:00
Huabing.Xu bfaef3574a android works for trianglesCommand 2014-09-01 13:57:33 +08:00
Huabing.Xu 06eb6c2425 put TrianglesCommand in a seperate file 2014-09-01 11:49:04 +08:00
minggo 840f311f5c Merge pull request #7916 from andyque/fixChipumnk 
remove chipmunk.h include in header file
 2014-09-01 11:38:12 +08:00
minggo bb85ecf0da Merge pull request #7913 from chuanweizhang2013/v3fixed 
make debug writable path the same as release
 2014-09-01 10:15:52 +08:00
yangxiao 49e6b098a6 check running scene when checkVisibility 2014-09-01 09:56:05 +08:00
XiaoYang c46691796e Merge pull request #119 from songchengjiang/billboard 
Finished Billboard
 2014-09-01 09:51:22 +08:00
songchengjiang 97f7d21f50 Format 2014-09-01 09:36:07 +08:00
yangxiao f3e017e139 normalize quat 2014-09-01 09:34:09 +08:00
songchengjiang 3f8b430b3e deleted Meshcommand 2014-09-01 09:33:08 +08:00
XiaoYang d2a6eb385d Merge pull request #120 from lvlonggame/v3 
modify some logs and code standards
 2014-09-01 09:32:01 +08:00
andyque ff321ba1dc fix chipmunk 2014-08-30 21:09:28 +08:00
lite3 6d462c5013 fix ccs.CustomGUIReader not in ccs table 2014-08-30 12:23:03 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
lite3 1846482527 skip GUIReader::registerTypeAndCallBack for lua bindings 2014-08-30 00:46:38 +08:00
minggo 640bee2adb Merge pull request #7914 from CocosRobot/update_lua_bindings_1409308555 
[AUTO]: updating luabinding automatically
 2014-08-29 22:30:15 +08:00
lite3 3872ee9b59 add CustomGUIReader for lua 2014-08-29 18:50:21 +08:00
CocosRobot cdc41711f6 [AUTO]: updating luabinding automatically 2014-08-29 10:38:25 +00:00
minggo 7cec9573ed Merge pull request #7905 from minggo/optimize-compiling 
remove unneeded includes
 2014-08-29 18:28:00 +08:00
yangxiao a039d6b0fc animate3d transition 2014-08-29 18:25:42 +08:00
songchengjiang 9f715e4e00 Added Sprite3D Model 2014-08-29 18:18:19 +08:00
songchengjiang 8d971054f2 Android -p 10 2014-08-29 18:02:17 +08:00
songchengjiang 0d75998027 pressure test 2014-08-29 17:58:20 +08:00
songchengjiang 4aa4287d28 test on Android 2014-08-29 17:29:15 +08:00
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +08:00
songchengjiang 34070677ad Added testing Model Number 2014-08-29 17:11:18 +08:00
minggo 826e1018cb fix conflict 2014-08-29 16:55:09 +08:00
minggo 05c767be3b [ci skip] 2014-08-29 16:51:40 +08:00