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

24595 Commits

Author SHA1 Message Date
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
andyque 892c8d4455 add gin0606 as AUTHORS 2014-08-29 10:24:30 +08:00
yangxiao 18a0f34c5c Merge branch 'newcode' into billboard 2014-08-29 10:12:00 +08:00
Huabing.Xu 528f4b5c0c fix TextureAtlas drawNumberofQuads bug 2014-08-29 10:06:44 +08:00
minggo a125ed0453 Merge pull request #7906 from Teivaz/v3_WP8 
[WP8] Fixed project compilation.
 2014-08-29 10:03:25 +08:00
Huabing.Xu 7c870cfcc1 fix skew matrix bug 2014-08-29 09:50:26 +08:00
chuanweizhang2013 37b71ec0cc Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-08-29 09:35:21 +08:00
songchengjiang f5ea9a2219 tab format 2014-08-29 09:33:28 +08:00
songchengjiang 06e3eb955f repaired BillBoard Depth Test 2014-08-29 09:30:59 +08:00
songchengjiang ac8158c60b Tab Format 2014-08-29 09:14:54 +08:00
songchengjiang e16fb5977e Finished BillBorad 2014-08-29 09:14:22 +08:00
Ricardo Quesada 8e66be4cd6 Merge pull request #7907 from ricardoquesada/xcode_mark_feature 
Users new `// MARK: ` feature to mark sections
 2014-08-28 14:57:53 -07:00
Ricardo Quesada 20d22a1c8a Users new `// MARK: ` feature to mark sections 
Instead of using `#praga mark` which was not compatible with other
compilers, it uses the `// MARK:` which is compatible with all compilers
 2014-08-28 14:56:15 -07:00
songchengjiang e6f055f3fd calculated Z in View 
Transparent Render
 2014-08-28 19:22:01 +08:00
yangxiao a3dd4e101a animation transition 2014-08-28 18:53:15 +08:00
teivaz 1d08acac08 * [WP8] Fixed project compilation. Removed references to deleted source files 2014-08-28 13:47:14 +03:00
minggo 4dba23108e Merge pull request #7904 from CocosRobot/update_lua_bindings_1409216214 
[AUTO]: updating luabinding automatically
 2014-08-28 18:31:18 +08:00
minggo 50a2cb2b86 remove unneeded includes 2014-08-28 17:32:23 +08:00
minggo 7baf873bf6 remove unneeded includes 2014-08-28 17:03:29 +08:00
CocosRobot ebe75e702a [AUTO]: updating luabinding automatically 2014-08-28 08:58:52 +00:00
minggo 2189c6adea Merge pull request #7903 from natural-law/v3 
Modify the Application.mk of project android.
 2014-08-28 16:52:25 +08:00
zhangbin e24a903c88 Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1. 2014-08-28 16:13:11 +08:00
lite3 2b6bdac05d Merge branch 'v3' into customguireader 2014-08-28 15:13:10 +08:00
lite3 d5114dc460 Merge branch 'customguireader' of https://github.com/lite3/cocos2d-x into customguireader 2014-08-28 15:07:52 +08:00
minggo 1d92d911d8 [ci skip] 2014-08-28 14:54:27 +08:00
minggo 966ea72263 [ci skip] 2014-08-28 14:35:50 +08:00
minggo 56392a080c [ci skip] 2014-08-28 14:33:31 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo d3227d0726 [ci skip] 2014-08-28 14:30:01 +08:00
minggo 50bbe6c91b [ci skip] 2014-08-28 14:29:06 +08:00
minggo e4c58267eb [ci skip] 2014-08-28 14:27:20 +08:00
minggo 681c3c06f1 Merge pull request #7558 from newnon/v3_actions_by_tag_improvements 
stopAllActionsByTag && removeAllActionsByTag
 2014-08-28 14:24:37 +08:00
minggo 2fd6cf8f43 fix compiling error 2014-08-28 13:59:56 +08:00
yangxiao 16ab05a8cf sequence3d 2014-08-28 13:47:17 +08:00
songchengjiang 7751762893 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-28 13:37:37 +08:00
yangxiao c5a152708d clear transparent queue 2014-08-28 13:35:32 +08:00
yangxiao fdcef01244 remove v_normal when no lights 2014-08-28 13:04:49 +08:00
lvlong a05d50d66e Merge branch 'v3' of github.com:super626/cocos2d-x into merge-bundle 2014-08-28 12:02:33 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
minggo 8ecce427aa [ci skip] 2014-08-28 11:17:22 +08:00
minggo f0f1bf1b92 Merge pull request #7883 from giginet/set-node-name-via-ccs-scene 
Add the feature that CCSSceneReader can load name properties as node names.
 2014-08-28 11:14:15 +08:00
songchengjiang 6a2f4c635e Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-28 11:06:02 +08:00
Huabing.Xu 08006aa47a Merge branch 'v3' into v3_trianglesCommand 2014-08-28 10:56:38 +08:00
samuele3hu 7e47f68897 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-08-28 10:55:23 +08:00
chuanweizhang2013 29234a3c58 Fix an issue that the break point stops twice at the same function 2014-08-28 10:54:47 +08:00
yangxiao 52b2b1d2cb transparent render queue 2014-08-28 10:53:57 +08:00
chuanweizhang2013 688ad1b3b9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 
Conflicts:
	templates/lua-template-runtime/frameworks/runtime-src/Classes/runtime/Runtime.cpp
	templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
 2014-08-28 10:28:31 +08:00
XiaoYang 20b5b251d5 Merge pull request #118 from songchengjiang/light_new 
Deleted Plane Model
 2014-08-28 10:22:36 +08:00
minggo d143754034 [ci skip] 2014-08-28 10:21:43 +08:00
minggo 6fc2affb68 Merge pull request #7899 from CocosRobot/update_cocosfiles_1409192317 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-28 10:20:26 +08:00