CocosRobot
|
27b8fd02ad
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-28 02:18:38 +00:00 |
songchengjiang
|
014ba0d12e
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
|
2014-08-28 10:17:32 +08: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 |
songchengjiang
|
5067741140
|
Deleted Plane Model
|
2014-08-28 10:16:15 +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 |
yangxiao
|
6b686ae0db
|
android light
|
2014-08-28 09:46:54 +08:00 |
Dhilan007
|
837e8665b5
|
remove redundant LOCAL_STATIC_LIBRARIES
|
2014-08-28 09:46:09 +08:00 |
samuele3hu
|
5dfbdc83b2
|
Merge branch 'v3-androidmk' of https://github.com/Dhilan007/cocos2d-x into v3_test
Conflicts:
cocos/Android.mk
cocos/editor-support/cocosbuilder/Android.mk
cocos/ui/Android.mk
|
2014-08-28 09:27:30 +08:00 |
yangxiao
|
d0943afb62
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light
|
2014-08-28 09:24:04 +08:00 |
XiaoYang
|
c9aa93214d
|
Merge pull request #117 from songchengjiang/light_new
Replaced Light Shader By optimized Shader
|
2014-08-28 09:23:51 +08:00 |
yangxiao
|
74f98b36d6
|
merge cocos
|
2014-08-28 09:22:57 +08:00 |
songchengjiang
|
4aa4c3e120
|
Merge branch 'light' of https://github.com/super626/cocos2d-x into light_new
|
2014-08-28 09:21:46 +08:00 |
Ricardo Quesada
|
781b0bc478
|
properties revert back to 10
|
2014-08-27 16:35:13 -07:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
Ricardo Quesada
|
d265cd488a
|
Merge pull request #7894 from ricardoquesada/render_texture_fix
Adds ClippingNode bug test case
|
2014-08-27 10:55:30 -07:00 |
Ricardo Quesada
|
dbdd2b3e13
|
Adds ClippingNode bug test case
|
2014-08-27 10:54:15 -07:00 |
Slack-Moehrle
|
1b5413d8b4
|
comment out [glview release]; and [eaglview release];
|
2014-08-27 10:42:27 -07:00 |
Slack-Moehrle
|
d4d2b8c83e
|
comment out [glview release]; and [eaglview release];
|
2014-08-27 10:26:09 -07:00 |
songchengjiang
|
365c57bc2b
|
replaced Light Shader by optimized Light Shader
|
2014-08-27 23:40:49 +08:00 |
samuele3hu
|
928208f480
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 23:26:08 +08:00 |
Dhilan007
|
bef774a14a
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 22:54:28 +08:00 |
samuele3hu
|
ba8bed8ed9
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 22:12:07 +08:00 |
Dhilan007
|
9135236bb0
|
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
|
2014-08-27 21:15:57 +08:00 |
songchengjiang
|
26dc7de802
|
Repaired Light Shader BUG On ios
|
2014-08-27 21:03:52 +08:00 |
samuele3hu
|
3d5f8de346
|
Adjust android.mk for cocos2d and related module
|
2014-08-27 20:58:32 +08:00 |
songchengjiang
|
72773a806c
|
decompose Light Struct
|
2014-08-27 19:12:49 +08:00 |
lvlong
|
e05f6bc874
|
modify for compress
|
2014-08-27 18:44:31 +08:00 |
Huabing.Xu
|
c627affa5e
|
add triangles command, make quad command inherit from triangles command
|
2014-08-27 18:39:49 +08:00 |
yangxiao
|
a71f42c817
|
add transparent queue
|
2014-08-27 17:53:46 +08:00 |
XiaoYang
|
648f2235dd
|
Merge pull request #116 from songchengjiang/light_new
Light Shader optimization
|
2014-08-27 17:46:35 +08:00 |
songchengjiang
|
731d1165c3
|
Spot Light Shader optimization
|
2014-08-27 17:09:20 +08:00 |
Huabing.Xu
|
91e332c253
|
dynamic update index for quad command
|
2014-08-27 16:43:14 +08:00 |
songchengjiang
|
682bcf9755
|
Tab Format
|
2014-08-27 16:28:53 +08:00 |
songchengjiang
|
53ad652463
|
Light Shader optimization
|
2014-08-27 16:26:01 +08:00 |
minggo
|
491c32b705
|
Merge pull request #7890 from minggo/compiling-optimize
Compiling optimize
|
2014-08-27 15:39:08 +08:00 |
minggo
|
17ab047b7d
|
fix compiling error on windows
|
2014-08-27 15:13:41 +08:00 |
Huabing.Xu
|
c4ecff9804
|
temp backup
|
2014-08-27 14:54:35 +08:00 |
yangxiao
|
8cb3edf91f
|
merge cocos light work
|
2014-08-27 14:53:39 +08:00 |
yangxiao
|
fdc0fad935
|
tmp work
|
2014-08-27 14:46:24 +08:00 |
minggo
|
708fa8f114
|
[ci skip]
|
2014-08-27 14:09:06 +08:00 |
andyque
|
3d97ddc739
|
Merge branch 'v3' into addWebView
Conflicts:
cocos/ui/Android.mk
|
2014-08-27 14:08:16 +08:00 |
minggo
|
dc5c42a1c9
|
Merge pull request #7889 from minggo/update-release-note
[ci skip]update release note
|
2014-08-27 14:07:55 +08:00 |
minggo
|
78c78d315c
|
update release note
|
2014-08-27 14:06:54 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
minggo
|
2efd7eef6c
|
Merge pull request #7888 from CocosRobot/update_cocosfiles_1409118024
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-27 13:45:02 +08:00 |
CocosRobot
|
f1914f3fa1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-08-27 05:40:25 +00:00 |