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

23428 Commits

Author SHA1 Message Date
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
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
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
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
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
andyque 0076953f97 fix iOS compile error 2014-09-01 15:55:09 +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 c24701ac79 Merge branch 'newcode' into v3 2014-09-01 15:11:27 +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
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 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
chuanweizhang2013 25a7f21056 make debug writable path the same as release 2014-08-29 17:27:55 +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
minggo afaea360fd Merge pull request #7908 from dabingnn/v3_fix_bugs 
V3 fix bugs
 2014-08-29 16:45:52 +08:00
minggo 29a4296a87 Merge pull request #7912 from CocosRobot/update_lua_bindings_1409299844 
[AUTO]: updating luabinding automatically
 2014-08-29 16:45:32 +08:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
lite3 4a374a1a2a Merge branch 'v3' into customguireader 2014-08-29 16:36:42 +08:00
CocosRobot 3b3747d518 [AUTO]: updating luabinding automatically 2014-08-29 08:12:40 +00:00
minggo c6f513bbdb Merge pull request #7911 from samuele3hu/v3_tip 
Update bindings-generator submodule
 2014-08-29 16:07:24 +08:00
Huabing.Xu 8e51377f2d fix primitive draw error 2014-08-29 16:00:04 +08:00
minggo 1dcdbca4e0 revert lua-bindings 2014-08-29 15:54:20 +08:00
minggo e4920ffdea fix conflict 2014-08-29 15:45:21 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
minggo e39e3bb836 Merge pull request #7909 from CocosRobot/update_cocosfiles_1409291025 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-29 15:27:35 +08:00
samuele3hu 6e6e7e1619 Remove careless modification 2014-08-29 15:22:51 +08:00