tangziwen
|
086bca399f
|
add three samples -- toonshader fakeshadow lightmap
|
2014-12-18 16:09:29 +08:00 |
tangziwen
|
73014e8be3
|
asdasd
|
2014-12-17 13:31:35 +08:00 |
yangxiao
|
32395f8e90
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-12-12 15:09:11 +08:00 |
yangxiao
|
34b21dad6d
|
invalid texture parameter on release mode fix #9465
|
2014-12-12 15:05:55 +08:00 |
XiaoYang
|
b106b2f7ce
|
Merge pull request #175 from lvlonggame/v3
fix bug: same model in mirror state cullFace problem.
|
2014-12-12 09:52:01 +07:00 |
lvlong
|
d0ce99413d
|
fix bug: same model in mirror state cullFace problem.
|
2014-12-11 14:24:26 +08:00 |
XiaoYang
|
a59d4ab2a3
|
Merge pull request #171 from tangziwen/v3
let billboard can rotate in the Z axis
|
2014-12-08 09:34:58 +07:00 |
yangxiao
|
a1ec27d0b1
|
calculate aabb if not exist
|
2014-12-08 10:30:06 +08:00 |
Huabing.Xu
|
a76e2e430d
|
Merge pull request #9392 from dabingnn/v3_releaseNotes
V3 release notes
|
2014-12-05 21:54:11 +08:00 |
Huabing.Xu
|
4c1b5bdfc6
|
update ReleaseNotes
|
2014-12-05 21:49:54 +08:00 |
Huabing.Xu
|
5e74418839
|
update ReleaseNots
|
2014-12-05 21:06:10 +08:00 |
Huabing.Xu
|
ba689fc5ab
|
update ReleaseNotes
|
2014-12-05 20:47:15 +08:00 |
minggo
|
8f51afe483
|
Merge pull request #9388 from cocoscodeide/v3
update runtime version to 1.6
|
2014-12-05 16:28:13 +08:00 |
honghui
|
61e13bf2a1
|
update runtime version to 1.6
|
2014-12-05 16:09:43 +08:00 |
minggo
|
959f04cb20
|
Merge pull request #9378 from lite3/patch-1
print more info
|
2014-12-05 09:30:10 +08:00 |
minggo
|
95302e18cc
|
Merge pull request #9354 from huangshiwu/v3_clippingnode
modify Clipping to RenderTexture Test to get correct behavior
|
2014-12-05 09:28:36 +08:00 |
minggo
|
68370ca229
|
Merge pull request #9381 from pipu/modify_bugs_for_flatbuffers
Modify bugs for flatbuffers
|
2014-12-05 09:28:19 +08:00 |
Huabing.Xu
|
697e1fd75e
|
Merge pull request #9377 from dabingnn/v3.3Perf
performance improvement
|
2014-12-04 21:08:24 +08:00 |
pipu
|
56f7895e27
|
Modify bugs for flatbuffers
|
2014-12-04 20:38:46 +08:00 |
lite3
|
8df8ee36db
|
print more info
|
2014-12-04 19:18:54 +08:00 |
Huabing.Xu
|
27ff06b1d2
|
performance improvement
|
2014-12-04 18:37:57 +08:00 |
minggo
|
eb83e25603
|
[ci skip]
|
2014-12-04 15:47:05 +08:00 |
minggo
|
5129db3fc3
|
[ci skip]
|
2014-12-04 15:46:36 +08:00 |
minggo
|
c19638131c
|
[ci skip]
|
2014-12-04 15:46:04 +08:00 |
minggo
|
191e84f531
|
[ci skip] Update CHANGELOG
|
2014-12-04 15:39:44 +08:00 |
minggo
|
fcfd33947f
|
[ci skip]
|
2014-12-04 15:36:09 +08:00 |
minggo
|
10aa9ade99
|
Merge pull request #9371 from samuele3hu/v3_cocostudio
[ci skip]Update CocoStudioActionTimelineTest for Lua
|
2014-12-04 15:24:17 +08:00 |
minggo
|
dbf299bec7
|
[ci skip] Update CHANGELOG
|
2014-12-04 15:23:38 +08:00 |
tangziwen
|
8605595a5b
|
let billboard can rotate in the Z axis
|
2014-12-04 15:19:41 +08:00 |
minggo
|
0d89b9b742
|
Merge pull request #9368 from huangshiwu/v3_wincpu
fix win32 high cpu occupancy rate
|
2014-12-04 15:17:26 +08:00 |
samuele3hu
|
9bf706aef5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio
|
2014-12-04 15:16:20 +08:00 |
samuele3hu
|
781afbec3f
|
Update CocoStudioActionTimelineTest
|
2014-12-04 15:14:19 +08:00 |
minggo
|
c217040f61
|
Merge pull request #9326 from samuele3hu/v3_fi_bindings
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
|
2014-12-04 15:14:02 +08:00 |
minggo
|
71d91e787b
|
Merge pull request #9370 from CocosRobot/update_cocosfiles_1417677182
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 15:13:40 +08:00 |
minggo
|
c1866adf4e
|
[ci skip] Update CHANGELOG
|
2014-12-04 15:13:07 +08:00 |
CocosRobot
|
b7d553f5db
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 07:13:03 +00:00 |
minggo
|
0badda268a
|
Merge pull request #9366 from Dhilan007/v3-33rc1
Fixed label may show nothing when using system font on Mac
|
2014-12-04 15:11:50 +08:00 |
minggo
|
8cd8a6d7b9
|
Merge pull request #9365 from andyque/updateExternalConfig
update external config to v3-deps-28.zip
|
2014-12-04 15:09:02 +08:00 |
huangshiwu
|
1212b4a6e9
|
fix win32 high cpu occupancy rate
|
2014-12-04 14:33:17 +08:00 |
andyque
|
8a5c78b213
|
update external config to v3-deps-28.zip and update cocos2d-x version to rc2
|
2014-12-04 14:23:44 +08:00 |
minggo
|
3faeee66e3
|
Merge pull request #9358 from cocoscodeide/v3
merge runtime to v3
|
2014-12-04 14:00:17 +08:00 |
honghui
|
2aa05bff39
|
revert file commit by mistake
|
2014-12-04 13:53:55 +08:00 |
minggo
|
7fd037c416
|
Merge pull request #9359 from super626/v3
Initialize variable when defined
|
2014-12-04 13:40:21 +08:00 |
minggo
|
de07aafbb6
|
Merge pull request #9361 from CocosRobot/update_lua_bindings_1417659000
[AUTO]: updating luabinding automatically
|
2014-12-04 13:35:14 +08:00 |
minggo
|
b319f87c79
|
Merge pull request #9360 from CocosRobot/update_cocosfiles_1417658898
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 13:34:59 +08:00 |
CocosRobot
|
0c54f8f7a0
|
[AUTO]: updating luabinding automatically
|
2014-12-04 02:11:58 +00:00 |
minggo
|
d179ced1b4
|
[ci skip] Update CHANGELOG
|
2014-12-04 10:08:43 +08:00 |
CocosRobot
|
918372556b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 02:08:20 +00:00 |
minggo
|
a86bfbf6b0
|
Merge pull request #9330 from pipu/v3_flatbuffers
newest V3 flatbuffers
|
2014-12-04 10:06:42 +08:00 |
XiaoYang
|
71077e6f65
|
Merge pull request #170 from tangziwen/v3
avoid the case that "hasAmbient" use before assign
|
2014-12-04 09:51:22 +08:00 |