Dale Stammen
|
86567afa5f
|
added kShaderType_PositionColor_noMVP_GrayScale for WP8 to support UIScale9Sprite
|
2015-01-16 15:02:05 -08:00 |
Dale Stammen
|
5988cb520d
|
added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite"
|
2015-01-16 14:59:08 -08:00 |
Dale Stammen
|
096fc13c47
|
added ui shader
|
2015-01-16 14:57:41 -08:00 |
Dale Stammen
|
7b3154a7ee
|
updated precompiled shaders for WP8
|
2015-01-16 11:19:32 -08:00 |
Dale Stammen
|
2c6ec3eebe
|
added ccShader_PositionColorPointsize-no-gl_PointSize.vert for WP8.1
|
2015-01-16 11:19:00 -08:00 |
Huabing.Xu
|
2c5d82d772
|
Merge pull request #10051 from CocosRobot/update_cocosfiles_1421424819
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-17 00:25:42 +08:00 |
CocosRobot
|
f9192835c9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-16 16:13:41 +00:00 |
Huabing.Xu
|
1e0baaa219
|
Merge pull request #10050 from dualface/v3-origin
update template/runtime version
|
2015-01-16 23:34:08 +08:00 |
dualface
|
bc75849ac7
|
update template/runtime version
|
2015-01-16 23:22:03 +08:00 |
dualface
|
63fba4f86f
|
fix compile win32
|
2015-01-16 23:19:00 +08:00 |
Huabing.Xu
|
05b59d0ef3
|
Merge pull request #10048 from dabingnn/v3_updateReleaseNotes
V3 update release notes
|
2015-01-16 23:16:41 +08:00 |
Huabing.Xu
|
f59a50a2f6
|
[ci skip] update releasenotes
|
2015-01-16 23:16:00 +08:00 |
Huabing.Xu
|
9e073f5445
|
[ci skip] update releasenotes
|
2015-01-16 23:13:59 +08:00 |
Huabing.Xu
|
7ee3133b52
|
[ci skip] update releasenotes
|
2015-01-16 23:12:34 +08:00 |
Huabing.Xu
|
45405c2380
|
[ci skip]Update CHANGELOG
|
2015-01-16 23:01:00 +08:00 |
minggo
|
9ad8533fac
|
Merge pull request #10045 from andyque/fixWebSockerDeadLock
fix websocket dead lock
|
2015-01-16 18:45:48 +08:00 |
andyque
|
fcfcb4fd71
|
fix websocket dead lock
|
2015-01-16 18:43:57 +08:00 |
minggo
|
b556f970b0
|
Merge pull request #10043 from dualface/v3-origin
fix ResolutionPolicy support
|
2015-01-16 18:09:40 +08:00 |
dualface
|
d39b1b7e58
|
fix ResolutionPolicy support
|
2015-01-16 18:04:13 +08:00 |
Huabing.Xu
|
8dc7299d9d
|
Merge pull request #10040 from dabingnn/v3_fixGL502bug
fix opengl 502 by using glGetBooleanv
|
2015-01-16 16:02:34 +08:00 |
Huabing.Xu
|
19bb6a0c68
|
fix opengl 502 by using glGetBooleanv
|
2015-01-16 15:21:23 +08:00 |
minggo
|
7e12d08ae1
|
Merge pull request #10038 from natural-law/v3
[ci skip] Rename the Xcode target of libsimulator.
|
2015-01-16 14:40:22 +08:00 |
zhangbin
|
b1f9fb4b8e
|
Rename the Xcode target of libsimulator.
|
2015-01-16 14:29:48 +08:00 |
minggo
|
1ac5811bd8
|
Merge pull request #10037 from Dhilan007/v3-34rc0
Fixed fail to query the shapes which add to PhysicsWorld in the current frame.
|
2015-01-16 14:28:36 +08:00 |
WenhaiLin
|
05e25601fc
|
Fixed fail to query the shapes which add to PhysicsWorld in the current frame
|
2015-01-16 14:22:16 +08:00 |
minggo
|
9db2e54dc3
|
Merge pull request #10036 from samuele3hu/v3_4_rc1
Update the luaval_to_int32 conversional function to get correct value
|
2015-01-16 10:41:46 +08:00 |
minggo
|
53cfd8229b
|
Merge pull request #10029 from Dhilan007/v3-34rc0
[ci skip]Fixed log level within the CocosPlayClient
|
2015-01-16 10:27:10 +08:00 |
samuele3hu
|
4601331dee
|
Update the luaval_to_int32 conversional function to get correct value
|
2015-01-16 09:50:22 +08:00 |
Ricardo Quesada
|
bec21d8e7f
|
Merge pull request #10035 from darkdukey/fixDepth
Fix setDepthTest() in Director
|
2015-01-15 17:46:03 -08:00 |
Nite Luo
|
d43a8cf9ca
|
Move setDepthTest to renderer
|
2015-01-15 16:54:27 -08:00 |
Nite Luo
|
e6d0251b55
|
Merge branch 'drawRefactor' into fixDepth
|
2015-01-15 16:42:38 -08:00 |
Nite Luo
|
9848a8133b
|
Fix Vertex Z issue
|
2015-01-15 16:41:07 -08:00 |
Ricardo Quesada
|
04eadefcee
|
Merge pull request #10034 from darkdukey/drawRefactor
Draw refactor
|
2015-01-15 16:28:06 -08:00 |
Nite Luo
|
9d7604cab7
|
undeprecate init for custom command
|
2015-01-15 15:56:44 -08:00 |
Nite Luo
|
0bddeb88c8
|
Disable 3D rendering support for commands that needs to execute in order
|
2015-01-15 14:57:51 -08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
minggo
|
8f8194fbc8
|
Merge pull request #10026 from andyque/fixWidgetNavigationNullptr
fix crash when navigation controller is null
|
2015-01-15 18:27:56 +08:00 |
WenhaiLin
|
6a2ac7aaf8
|
[ci skip]Fixed log level within the CocosPlayClient
|
2015-01-15 18:21:03 +08:00 |
minggo
|
a94533329d
|
Merge pull request #10024 from yinjimmy/bugfix_runtime
Optimize output directory for libsimulator
|
2015-01-15 15:33:05 +08:00 |
andyque
|
3f99f3d454
|
fix crash when navigation controller is null
|
2015-01-15 15:18:14 +08:00 |
yinjimmy
|
ccdf723d20
|
Optimize OutDir and IntDir for libsimulator
|
2015-01-15 14:39:56 +08:00 |
minggo
|
107022f745
|
Merge pull request #10023 from yinjimmy/bugfix_runtime
Fix compile error with lua-tempate-default / lua-template-runtime on Mac and iOS platform
|
2015-01-15 14:18:23 +08:00 |
yinjimmy
|
6e8188d4ff
|
Fix lang file path for vs project
|
2015-01-15 14:04:15 +08:00 |
yinjimmy
|
9f60e82cc7
|
Fix compile error with lua-tempate-default / lua-template-runtime
|
2015-01-15 13:34:23 +08:00 |
minggo
|
473f04624a
|
Merge pull request #10019 from huangshiwu/drawnodeinit
fix DrawNode init error
|
2015-01-15 13:33:58 +08:00 |
minggo
|
8aaf859235
|
Merge pull request #10021 from dualface/v3-origin
add SHOW_ALL support for Lua framework
|
2015-01-15 12:44:10 +08:00 |
dualface
|
3edd78d6c3
|
add SHOW_ALL support for Lua framework
|
2015-01-15 12:01:27 +08:00 |
huangshiwu
|
65e97450d0
|
fix DrawNode init error
|
2015-01-15 11:51:21 +08:00 |
minggo
|
748e7abba6
|
Merge pull request #10018 from yinjimmy/bugfix_runtime
Support vs2012
|
2015-01-15 11:35:13 +08:00 |
yinjimmy
|
f652e1359a
|
1. Compatible vs2012 for libsimulator
2. Adjust output directory for simulator
|
2015-01-15 11:10:32 +08:00 |