CocosRobot
|
d0ac64b2e8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-29 05:43:47 +00:00 |
minggo
|
ffd81d8b0f
|
[ci skip]
|
2014-08-29 13:43:42 +08:00 |
minggo
|
58dd2f4a69
|
Merge pull request #7882 from andyque/addWebView
add WebView
|
2014-08-29 13:42:14 +08:00 |
lvlong
|
496aad2fe7
|
remove 0.3 branch logic
|
2014-08-29 11:59:30 +08:00 |
lvlong
|
cbe61a4b73
|
modify log
|
2014-08-29 11:56:33 +08:00 |
andyque
|
4c046336da
|
fix linux
|
2014-08-29 11:53:39 +08:00 |
andyque
|
cf0baef7c0
|
add web view javascript support
|
2014-08-29 11:50:08 +08:00 |
andyque
|
043acb2fd4
|
rename webview to UIWebView
|
2014-08-29 11:28:28 +08:00 |
lvlong
|
15c945d89b
|
Merge branch 'newcode' into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
|
2014-08-29 11:04:15 +08:00 |
lvlong
|
5a1e0601a7
|
Code Standards
|
2014-08-29 10:43:26 +08:00 |
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 |
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 |
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 |
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 |
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 |
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 |
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 |
CocosRobot
|
27b8fd02ad
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-28 02:18:38 +00:00 |
minggo
|
45b382cb1f
|
Merge pull request #7898 from CocosRobot/update_lua_bindings_1409191992
[AUTO]: updating luabinding automatically
|
2014-08-28 10:17:26 +08:00 |
minggo
|
d3ce2acff6
|
Merge pull request #7892 from Dhilan007/v3-androidmk
Adjust android.mk for cocos2d and related module
|
2014-08-28 10:16:39 +08:00 |
CocosRobot
|
31a9997922
|
[AUTO]: updating luabinding automatically
|
2014-08-28 02:15:00 +00:00 |
minggo
|
b8447baf73
|
Merge pull request #7893 from slackmoehrle/glview_fix
Glview fix
|
2014-08-28 10:10:17 +08:00 |
minggo
|
5f20d17bc0
|
Merge pull request #7896 from ricardoquesada/std_nothrow
Adds `std::nothrow` to the `new` statements
|
2014-08-28 10:06:55 +08:00 |
Huabing.Xu
|
bdf92cfbd4
|
Renderer Only knows about Triangles Command, every command inherit from Triangles Command can be batched
|
2014-08-28 09:58:39 +08:00 |