minggo
|
bacc487128
|
Merge pull request #9975 from CocosRobot/update_cocosfiles_1421206777
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 11:45:16 +08:00 |
minggo
|
8a3cab41ab
|
Merge pull request #9976 from CocosRobot/update_lua_bindings_1421206884
[AUTO]: updating luabinding automatically
|
2015-01-14 11:45:00 +08:00 |
minggo
|
13085c3841
|
[ci skip] Update CHANGELOG
|
2015-01-14 11:43:50 +08:00 |
CocosRobot
|
b134f74db4
|
[AUTO]: updating luabinding automatically
|
2015-01-14 03:43:27 +00:00 |
CocosRobot
|
5faeb6919a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-14 03:39:38 +00:00 |
minggo
|
5459149279
|
Merge pull request #9969 from huangshiwu/pointSize
DrawNode enable draw different size points
|
2015-01-14 11:38:31 +08:00 |
yusheng.lu
|
eb106d57a6
|
layout component test
|
2015-01-14 11:34:43 +08:00 |
Huabing.Xu
|
610d31d601
|
adjust CC_USE_CULLING macro definition
|
2015-01-14 11:29:02 +08:00 |
huangshiwu
|
9fd000895c
|
modify file copyright information
|
2015-01-14 11:20:33 +08:00 |
Huabing.Xu
|
861b608327
|
[ci skip] update changelog
|
2015-01-14 11:09:38 +08:00 |
minggo
|
d73b5f45ec
|
Merge pull request #9971 from pipu/parse_particlesystemquad
Modify that parses position type of ParticleSystemQuad.
|
2015-01-14 11:09:19 +08:00 |
minggo
|
0207c22cb6
|
Merge pull request #9953 from darkdukey/renderFix
Render fix
|
2015-01-14 11:06:33 +08:00 |
minggo
|
4fdc21e81a
|
Merge pull request #9956 from samuele3hu/v3_4_fix_bug
Update the plugin submodule
|
2015-01-14 11:06:12 +08:00 |
minggo
|
4f34e228eb
|
[ci skip] Update CHANGELOG
|
2015-01-14 11:04:29 +08:00 |
minggo
|
d320941ca1
|
Merge pull request #9963 from Dhilan007/v3-issue9898-fix
Fixed crash if dispatch event after remove event listener in callback
|
2015-01-14 10:59:42 +08:00 |
Huabing.Xu
|
f3d8798d39
|
add macro to enable to disable culling
|
2015-01-14 10:56:51 +08:00 |
lvlong
|
9abc5b7e82
|
fix bug: sequence action speed
|
2015-01-14 10:40:47 +08:00 |
pipu
|
e31fe9565a
|
Modify that parses position type of ParticleSystemQuad.
|
2015-01-14 10:24:44 +08:00 |
yinjimmy
|
bdf4393be0
|
Fix runtime output directory for Windows release mode
|
2015-01-14 10:18:00 +08:00 |
yangxiao
|
772813e810
|
modify wrong word
|
2015-01-14 09:36:22 +08:00 |
XiaoYang
|
ab7eb694c0
|
Merge pull request #209 from lvlonggame/v3
wrong words
|
2015-01-14 09:17:47 +08:00 |
Nite Luo
|
4335328e3d
|
Add support for creating empty sprite3D
|
2015-01-13 16:41:24 -08:00 |
Dale Stammen
|
5a4c6d75d8
|
clean up CC_USE_WEBP disabled for WP8 and WINRT
|
2015-01-13 14:37:22 -08:00 |
Dale Stammen
|
f07999e1be
|
enabled all sprites3d tests for winrt universal apps
|
2015-01-13 14:33:16 -08:00 |
Dale Stammen
|
a2a257133a
|
enabled fogtestdemo for winrt universal apps
|
2015-01-13 14:32:30 -08:00 |
huangshiwu
|
f4ac7c4e44
|
modify WP8 project and update precompileshader
|
2015-01-14 02:15:04 +08:00 |
huangshiwu
|
fea492ab4f
|
DrawNode enable draw different size points
|
2015-01-13 22:30:50 +08:00 |
yinjimmy
|
49b265d147
|
cleanup
|
2015-01-13 19:44:46 +08:00 |
yinjimmy
|
532be9fb20
|
Fix compile error on windows
|
2015-01-13 19:22:11 +08:00 |
yinjimmy
|
54443a7a9b
|
add missing runtime/config.json
|
2015-01-13 18:41:05 +08:00 |
WenhaiLin
|
13481ea5c2
|
Add test case for issue#9898
|
2015-01-13 18:37:45 +08:00 |
WenhaiLin
|
de645a7c9c
|
Fixed crash if dispatch event after remove event listener in callback
|
2015-01-13 18:35:32 +08:00 |
yinjimmy
|
dc019defc1
|
Merge branch 'v3' into combine
|
2015-01-13 18:32:32 +08:00 |
yinjimmy
|
c3a536bcf0
|
add lua-template-runtime
|
2015-01-13 18:28:33 +08:00 |
lvlong
|
8f16728514
|
wrong words
|
2015-01-13 18:00:20 +08:00 |
Wenhai Lin
|
58c45ca144
|
Integrate CocosPlayClient
|
2015-01-13 17:30:07 +08:00 |
minggo
|
78e6d2f7ab
|
Merge pull request #9951 from pipu/update_inneractionframe
Update InnerActionFrame
|
2015-01-13 17:10:39 +08:00 |
andyque
|
9f0557b079
|
put box2d cmakelist to external
|
2015-01-13 17:10:21 +08:00 |
minggo
|
0709d9f2e9
|
[ci skip]update version
|
2015-01-13 16:35:45 +08:00 |
minggo
|
e9dbe4adc6
|
[ci skip]update version
|
2015-01-13 16:34:59 +08:00 |
samuele3hu
|
6f0f8e9f89
|
Update the plugin submodule
|
2015-01-13 16:04:29 +08:00 |
Nite Luo
|
45562f3203
|
optimize based on review commends
|
2015-01-12 22:52:20 -08:00 |
minggo
|
bb742c30ad
|
Merge pull request #9950 from dabingnn/v3_perf
cache director pointer to improve rendering performance
|
2015-01-13 14:31:03 +08:00 |
minggo
|
1bb4c12b1d
|
Merge pull request #9948 from samuele3hu/v3_4_fix_bug
issue #9886: fix the number conversion error when passing 0x80000000
|
2015-01-13 14:11:49 +08:00 |
minggo
|
fd0ce5edcb
|
Merge pull request #9940 from CocosRobot/update_lua_bindings_1421064276
[AUTO]: updating luabinding automatically
|
2015-01-13 14:04:49 +08:00 |
Nite Luo
|
1c10ae43bc
|
Merge branch 'v3' into renderFix
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2015-01-12 20:43:55 -08:00 |
Nite Luo
|
a84f521e64
|
Clean up the debug functions in Billboard
|
2015-01-12 20:17:00 -08:00 |
Nite Luo
|
8591609128
|
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
|
2015-01-12 20:06:50 -08:00 |
minggo
|
1a11905242
|
Merge pull request #9952 from natural-law/v3
[ci skip] Update the reference of submodule cocos2d-console.
|
2015-01-13 11:18:43 +08:00 |
zhangbin
|
9766e9f748
|
Update the reference of submodule cocos2d-console.
|
2015-01-13 11:16:54 +08:00 |