tangziwen
176f7dd879
slightly modified the camera's default position & terrain's Lod distance in the terrain test
2015-04-07 11:50:09 +08:00
WenhaiLin
a6699058a0
Add missing test
2015-04-07 11:43:02 +08:00
lvlong
70048788ea
modify change log.
2015-04-07 11:19:48 +08:00
WenhaiLin
c5c5d3e39d
Label: Fixed shadow color is incorrect.
2015-04-07 11:17:01 +08:00
minggo
3a1a7c0122
[ci skip] update version
2015-04-07 10:38:01 +08:00
minggo
1646278be2
[ci skip] update version
2015-04-07 10:36:38 +08:00
minggo
295b6d7044
[ci skip] update version
2015-04-07 10:35:49 +08:00
minggo
9fb39284c1
[ci skip]update CHANGELOG
2015-04-07 10:35:09 +08:00
samuele3hu
af46ec5b57
Update config.son for the version of external dependence
2015-04-07 10:00:37 +08:00
minggo
4bd304da80
Merge pull request #11300 from CocosRobot/update_cocosfiles_1428370461
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-07 09:56:35 +08:00
minggo
98682eefe6
[ci skip]update CHANGELOG
2015-04-07 09:52:45 +08:00
CocosRobot
738d03d2db
[AUTO][ci skip]: updating cocos2dx_files.json
2015-04-07 01:34:23 +00:00
minggo
3736d1a6b5
[ci skip]update CHANGELOG
2015-04-07 09:33:32 +08:00
minggo
deaa6a19f0
Merge pull request #11257 from super626/terrain
...
Terrain
2015-04-07 09:32:35 +08:00
samuele3hu
fd554c07da
Rename the file names
2015-04-07 09:31:04 +08:00
XiaoFeng
16aa704ffd
Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3
2015-04-07 09:11:14 +08:00
XiaoFeng
4929d8102a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-07 09:06:06 +08:00
Ricardo Quesada
98866f5f6b
Merge pull request #11297 from ricardoquesada/fix_warnings_on_xcode_63
...
fixes warnings on Xcode 6.3
2015-04-06 13:03:15 -07:00
Ricardo Quesada
a782eb022d
fixes warnings on Xcode 6.3
...
instead of using `abs()` it uses `std::abs()`
2015-04-06 12:08:30 -07:00
samuele3hu
a64e90d469
Update the related project setting for Luajit and related test cases
2015-04-06 22:41:34 +08:00
Aaron Baumbach
9edfa5bb29
RenderQueue command buffer optimisation
...
Made _commands an array of vectors that is no longer reallocated every frame
Provided method to reallocate queues manually and reserve memory in order to minimise std::vector dynamic reallocation
2015-04-06 14:45:19 +01:00
Ricardo Quesada
af2b29b478
Merge pull request #11292 from ricardoquesada/cmake_fix
...
cmake fix
2015-04-06 00:15:37 -07:00
Ricardo Quesada
4646e49d15
cmake fix
...
policy CMP0054 only works with cmake 3.1+, not cmake 3.0
2015-04-05 23:23:28 -07:00
Vladimir Perminov
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
Vladimir Perminov
3931273a58
Log message can't detect image format
...
Wrong log message DDS and KTX check image format(other format no log
message).
isS3TC and isATITC protected, no use dev code.
Log message if format unknown
2015-04-04 13:19:47 +03:00
minggo
0f09fd8956
Merge pull request #11278 from CocosRobot/update_lua_bindings_1428047459
...
[AUTO]: updating luabinding automatically
2015-04-04 07:18:39 +08:00
minggo
a01aed6431
Merge pull request #11277 from daiki1003/fix/return_language_type
...
remove interlevel argument of "Application" class.
2015-04-04 07:18:04 +08:00
minggo
7a369abeb5
[ci skip]update CHANGELOG
2015-04-04 07:13:59 +08:00
minggo
1aa95a21c5
Merge pull request #11273 from super626/v3
...
PU Particle bug
2015-04-04 07:12:36 +08:00
Justin Hawkwood
84fd73630a
Fix iOS 5.1.1 crash caused by interruptionHandler
...
checks OS version and sets handling based on what is available.
2015-04-03 15:57:47 -07:00
XiaoYang
d1adffb722
Merge pull request #288 from tangziwen/terrain
...
Terrain
2015-04-03 18:06:23 +08:00
lvlong
4c6eec9ec1
add getAABBRecursively
2015-04-03 18:04:33 +08:00
XiaoYang
dd95f9fbb9
Merge pull request #287 from zhukaixy/terrain
...
add for wp8 support --ziwen.tang
2015-04-03 18:04:25 +08:00
tangziwen
14b94a6aac
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
...
Resolve Conflicts:
tests/cpp-tests/Classes/controller.cpp
2015-04-03 17:50:08 +08:00
zhukaixy
6eb86f736c
add for wp8 support --ziwen.tang
2015-04-03 17:12:44 +08:00
tangziwen
72f5121959
Merge branch 'terrain' of https://github.com/super626/cocos2d-x into terrain
2015-04-03 16:58:27 +08:00
tangziwen
d79c38e17a
add WP8 support
2015-04-03 16:50:09 +08:00
yangxiao
7ea1c1ac1f
reset
2015-04-03 16:15:09 +08:00
XiaoYang
bdce345b51
Merge pull request #286 from tangziwen/terrain
...
Terrain
2015-04-03 15:59:17 +08:00
CocosRobot
e20a747138
[AUTO]: updating luabinding automatically
2015-04-03 07:53:06 +00:00
Huabing.Xu
42cc17621f
Merge pull request #11272 from WenhaiLin/v3-autotests
...
Test automation support
2015-04-03 15:47:45 +08:00
tangziwen
0193420dfc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
...
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-04-03 15:45:51 +08:00
Daiki Asahi
fc92acf587
remove interlevel argument.
2015-04-03 16:43:39 +09:00
Daiki Asahi
b9d294f542
Fix container view's anchor point problem.
2015-04-03 16:37:48 +09:00
XiaoYang
7fd56d2afd
Merge pull request #285 from tangziwen/terrain
...
Terrain
2015-04-03 14:57:13 +08:00
tangziwen
ee41c9b3f1
add win rt support
2015-04-03 14:36:29 +08:00
WenhaiLin
0d51c13743
Make all test cases work fine with new test framework.
2015-04-03 14:31:03 +08:00
tangziwen
8a7b318c1a
Add some helper function to detect the heightMap size,refact Terrain::Create, fix typo ,add doxygen comment
2015-04-03 13:49:07 +08:00
XiaoYang
930ea8cd9c
Merge pull request #284 from songchengjiang/v3
...
fix the bug of Particle3DModelRender
2015-04-03 13:47:14 +08:00
songchengjiang
e4a58d5c35
fix the bug of Particle3DModelRender
2015-04-03 12:43:14 +08:00