Milos Jakovljevic
a33d775b51
Adding linear interpolation convenient method in MathUtils.
2015-04-16 15:17:25 +02:00
Milos Jakovljevic
b3ee529a8c
Adding Lerp for Vec3
2015-04-16 14:43:12 +02:00
minggo
3c7d5afce2
Merge pull request #11465 from WenhaiLin/v3-videoplayer-iosfix
...
Fix crash when play streamed MP4 file.
2015-04-16 18:16:28 +08:00
WenhaiLin
fc75f46abb
Fix crash when play streamed MP4 file.
2015-04-16 16:27:09 +08:00
minggo
408d164fea
Merge pull request #11458 from andyque/fix-a-side-effect-of-button-memory-optimization
...
fix side effect of ui::button clone
2015-04-16 16:15:25 +08:00
andyque
8a9f420735
fix side effect of ui::button clone
2015-04-16 14:38:00 +08:00
minggo
0e7c096201
Merge pull request #11455 from xiaofeng11/v3
...
Fix won't load child bug
2015-04-16 14:37:22 +08:00
minggo
97f150a89f
Merge pull request #11452 from MSOpenTech/v3-remove-wp8
...
V3 remove WP8 project files
2015-04-16 14:32:11 +08:00
pipu
d1dcf3f620
Modify that serialize attribute "Children".
2015-04-16 13:58:01 +08:00
CocosRobot
f1bd23aa32
[AUTO]: updating luabinding automatically
2015-04-16 02:19:38 +00:00
minggo
29de9d397f
Merge pull request #11445 from andyque/improve-the-arguments
...
make scrollview time arguments more meaningful
2015-04-16 10:14:11 +08:00
minggo
c7e41e1045
Merge pull request #11451 from WenhaiLin/v3-jni-string
...
Fixed JNI illegal start byte error
2015-04-16 10:00:22 +08:00
minggo
458aa0028b
Merge pull request #11450 from jianglong0156/v3
...
uiWebView constructor add CC_CONSTRUCTOR_ACCESS
2015-04-16 09:58:23 +08:00
minggo
2b82c0c837
Merge pull request #11442 from xiaofeng11/v3
...
Fix action timeline bug
2015-04-16 09:34:45 +08:00
Dale Stammen
b1c9c34c19
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:19:38 -07:00
Dale Stammen
01135f892f
fixed typo
2015-04-15 09:19:17 -07:00
Dale Stammen
7d22e49642
only needed if _MSC_VER < 1900
2015-04-15 09:18:48 -07:00
Dale Stammen
68430ce4fa
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:18:23 -07:00
Dale Stammen
081b9ccac2
updated freetype include path
2015-04-15 08:20:03 -07:00
Dale Stammen
c9eb2790be
updated chipmunk and freetype libs
2015-04-15 08:08:18 -07:00
Dale Stammen
911f8f6f8a
removed WP8 UIEditBox project files
2015-04-15 07:16:39 -07:00
Dale Stammen
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
Wenhai Lin
2dd88e8be5
Fixed JNI illegal start byte error
2015-04-15 18:20:52 +08:00
jianglong0156
8f8599a49b
uiWebView constructor add CC_CONSTRUCTOR_ACCESS
2015-04-15 17:54:09 +08:00
andyque
96f8842ee1
make scrollview time arguments more meaningful
2015-04-15 16:37:11 +08:00
xiaofeng11
a8fcaf4f4f
Merge pull request #17 from geron-cn/xiaov3
...
fix actiontimeline step over frame when (noloop play && timespeed>1)
2015-04-15 13:41:49 +08:00
geron-cn
7b376fd384
fix action timeline step over frame when no (loop play && timespeed>1)
2015-04-15 13:32:04 +08:00
minggo
60ef01b870
Merge pull request #11394 from giginet/intersects-circle
...
Implement Rect::intersectsCircle
2015-04-14 18:10:16 +08:00
CocosRobot
66fcba02b1
[AUTO]: updating luabinding automatically
2015-04-14 09:10:16 +00:00
minggo
caf308f061
Merge pull request #11431 from CocosRobot/update_lua_bindings_1429000943
...
[AUTO]: updating luabinding automatically
2015-04-14 17:03:10 +08:00
minggo
fbb1c578a2
Merge pull request #11430 from minggo/update-spine
...
update spine runtime to v2.1.25
2015-04-14 17:01:11 +08:00
CocosRobot
0e4a209241
[AUTO]: updating luabinding automatically
2015-04-14 08:44:30 +00:00
minggo
8b98dcd06b
Merge pull request #11429 from andyque/optimize-button-memory-usage-v3
...
optimize memory usage of ui::Button
2015-04-14 16:38:47 +08:00
andyque
240bf58bfc
fix edge case crash
2015-04-14 15:34:15 +08:00
minggo
c62b34ac01
update spine runtime to v2.1.25
2015-04-14 15:23:16 +08:00
andyque
a2df0ca769
optimize memory usage of ui::Button
2015-04-14 15:00:42 +08:00
yangxiao
8c8058a9be
merge cocos resolve conflict
2015-04-14 13:56:05 +08:00
minggo
4aaa494be7
Merge pull request #11421 from CocosRobot/update_lua_bindings_1428977404
...
[AUTO]: updating luabinding automatically
2015-04-14 10:58:08 +08:00
minggo
1ebcca8d9f
Merge pull request #11417 from super626/terrain
...
Terrain
2015-04-14 10:50:21 +08:00
minggo
2b66bb7082
[ci skip] update version
2015-04-14 10:46:20 +08:00
CocosRobot
a0a6b9cda4
[AUTO]: updating luabinding automatically
2015-04-14 02:12:05 +00:00
minggo
4211b20134
Merge pull request #11414 from likexx/patch-1
...
Update CCLabel.cpp
2015-04-14 10:06:09 +08:00
minggo
7f1d48978f
Merge pull request #11416 from super626/v3
...
Sprite3D fix
2015-04-14 10:04:22 +08:00
minggo
d246c33974
Merge pull request #11413 from WenhaiLin/v3-label-sf-position
...
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-14 09:59:09 +08:00
minggo
06a2042a11
Merge pull request #11345 from IgorMats/v3
...
Add getStroke/setStroke methods for motion streak.
2015-04-14 09:36:03 +08:00
XiaoYang
37dc4c33d9
Merge pull request #300 from lvlonggame/v3
...
fix bug: create single node recursively.
2015-04-14 09:10:24 +08:00
zhukaixy
6684491249
1: update cube texture for sky box
...
2: add mouse-controled camera for test case (skybox)
2015-04-14 01:39:23 +08:00
Igor Mats
e54a51be02
Fix comment.
2015-04-13 19:24:19 +03:00
giginet
2a0524322e
Implement Rect::intersectsCircle
...
This method checks the intersect status between the rect and a circle.
2015-04-13 23:16:06 +09:00
likexx
6f341e3284
Update CCLabel.cpp
...
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
2015-04-13 20:53:34 +08:00
minggo
bc34554bd9
Merge pull request #11407 from samuele3hu/v3_studio2
...
Synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
2015-04-13 18:22:18 +08:00
WenhaiLin
d24a1243da
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-13 18:22:05 +08:00
yangxiao
284c8e5a97
add to animation cache
2015-04-13 17:14:58 +08:00
samuele3hu
24654a4847
synchronize the related ActionTimeline test cases of Lua refer to the cpp-tests
2015-04-13 16:29:44 +08:00
WenhaiLin
9ef04943a8
Label:Fixed System font can't scale.
2015-04-13 16:28:55 +08:00
CocosRobot
698a75e17f
[AUTO]: updating luabinding automatically
2015-04-13 05:44:29 +00:00
lvlong
57a44194f4
fix bug: create single node Recursively.
2015-04-13 11:35:52 +08:00
minggo
da69dbd133
Merge pull request #11388 from xiaofeng11/v3
...
Reader update
2015-04-13 11:20:53 +08:00
minggo
1d1d574a61
Merge pull request #11393 from akermen/v3_fix_macros_namespace
...
added 'cocos2d' namespace for macros
2015-04-13 11:20:36 +08:00
tangziwen
380d829548
move reset draw polygon state in corresponding position
2015-04-13 10:14:03 +08:00
minggo
952f9da2c1
Merge pull request #11385 from super626/terrain
...
Improve Terrain
2015-04-13 09:18:50 +08:00
akermen
2957263c9d
=cocos2d namespace added macros
2015-04-11 10:45:19 +03:00
akermen
1d83229956
=cocos2d namespace adder for CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES macro
2015-04-11 10:32:33 +03:00
CocosRobot
bd3b978c89
[AUTO]: updating luabinding automatically
2015-04-10 10:18:33 +00:00
minggo
9cc03407a8
Merge pull request #11383 from WenhaiLin/v3-physics-rotation
...
Physics: Fixed the rotation of PhysicsBody is wrong if the rotation of node is set before PhysicsBody attached.
2015-04-10 18:12:43 +08:00
pipu
755134ba3f
Update parse animation easing
2015-04-10 17:05:55 +08:00
Wenhai Lin
1949348124
Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached.
2015-04-10 17:01:21 +08:00
minggo
698d93a42b
Merge pull request #11379 from WenhaiLin/v3-physics-fix
...
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 16:45:45 +08:00
minggo
3d2fb6250e
Merge pull request #11378 from andyque/fix-outline-update-do-not-change-content-size
...
fix ui::Text outline don't change content size
2015-04-10 16:41:24 +08:00
Wenhai Lin
97082cb169
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 15:39:39 +08:00
andyque
10c90b06aa
fix ui::Text outline don't change content size
2015-04-10 15:33:48 +08:00
CocosRobot
15f22d936f
[AUTO]: updating luabinding automatically
2015-04-10 07:27:51 +00:00
xiaofeng11
5ec9b14a33
Merge pull request #13 from geron-cn/xiaov3
...
fix
2015-04-10 14:27:09 +08:00
geron-cn
b8083f2c99
fix
2015-04-10 14:24:48 +08:00
tangziwen
a7aed360a1
update terrain
2015-04-10 14:22:07 +08:00
andyque
c8d8a0d220
add disableEffect API for ui::Text
2015-04-10 14:18:16 +08:00
xiaofeng11
dda662a7c1
Merge pull request #12 from geron-cn/xiaov3
...
add blendfunc frame
2015-04-10 14:04:35 +08:00
geron-cn
d238f9905e
add blendfunc frame
2015-04-10 13:34:39 +08:00
xiaofeng11
ee98b40af9
Merge pull request #11 from geron-cn/xiaov3
...
add tween easing to ccframe
2015-04-10 10:46:58 +08:00
minggo
0aef6b9446
Merge pull request #11295 from Almax27/v3
...
RenderQueue command buffer optimisation
2015-04-10 09:33:43 +08:00
geron-cn
c206725be5
fix color
2015-04-09 19:13:14 +08:00
Igor Mats
f5c61b4f9a
Ooops.
2015-04-09 13:36:17 +03:00
minggo
09c50c44dc
Merge pull request #11224 from hawkwood/patch-7
...
Remove use of autorelease NSString and NSURL
2015-04-09 18:36:07 +08:00
geron-cn
56bb0a68bb
add tween easing to carfare
2015-04-09 18:10:37 +08:00
pipu
e86071e77e
Rest CCFrame.
2015-04-09 17:21:52 +08:00
Igor Mats
60759764ff
Add getStroke method.
2015-04-09 12:05:21 +03:00
pipu
80ad7bbee8
Animation easing.
2015-04-09 16:55:15 +08:00
minggo
e9c88a61da
Merge pull request #11354 from samuele3hu/v3_terrain
...
Update the Lua bindings for terrain and TerrainTest.lua
2015-04-09 14:22:19 +08:00
minggo
9891a94e87
Merge pull request #11352 from super626/v3
...
Fix Sprite3D memory leak
2015-04-09 13:57:03 +08:00
samuele3hu
9bf2a920b4
Update the Lua bindings for terrain and TerrainTest.lua
2015-04-09 13:41:52 +08:00
CocosRobot
22da4c4832
[AUTO]: updating luabinding automatically
2015-04-09 03:50:13 +00:00
minggo
69eac3b78f
Merge pull request #11337 from super626/terrain
...
Terrain fix
2015-04-09 11:44:26 +08:00
yangxiao
575d32c5ec
correct words
2015-04-09 11:31:56 +08:00
yangxiao
9cefa3a9da
weak ref to vertexdata
2015-04-09 10:52:05 +08:00
tangziwen
176532eef4
update Terrain Lua binding
2015-04-09 10:01:40 +08:00
tangziwen
4ca6b559e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
2015-04-09 09:40:22 +08:00
Igor Mats
7f24eb0cf6
Add setStroke method.
2015-04-08 21:55:24 +03:00
Dale Stammen
c88e8064c7
updated dll name to v3.6
2015-04-08 07:51:40 -07:00
Dale Stammen
272bb35246
Merge branch 'v3' into v3-wp8-fix
2015-04-08 07:29:45 -07:00
minggo
1177310550
Merge pull request #11334 from andyque/fix-windows-universal
...
update freetype2 and chipmunk on wp8 and wp8.1
2015-04-08 21:28:15 +08:00
tangziwen
2be309d841
add reload method in case of GL context Lost.
2015-04-08 19:11:46 +08:00
minggo
8a1aa78f7d
Merge pull request #11336 from xiaofeng11/v3
...
Update reader
2015-04-08 18:40:32 +08:00
minggo
3ce6602f3a
Merge pull request #11335 from super626/v3
...
Modify changelog and add getAABBRecursively
2015-04-08 18:03:48 +08:00
andyque
24c0c8d811
fix wp8 compile issue
2015-04-08 18:01:56 +08:00
pipu
ca74486f60
Update CSParseBinary_generated
2015-04-08 16:54:58 +08:00
yangxiao
a7a39d71f5
modify getAABBRecursively
2015-04-08 16:40:04 +08:00
yangxiao
0d0bad186f
resolve conflict
2015-04-08 16:23:35 +08:00
minggo
263506fb74
Merge pull request #11282 from hawkwood/patch-8
...
Fix iOS 5.1.1 crash caused by interruptionHandler
2015-04-08 16:23:12 +08:00
andyque
f52899c257
update freetype2 and chipmunk on wp8 and wp8.1
2015-04-08 16:21:19 +08:00
tangziwen
dc7cd520b2
update terrain
2015-04-08 15:17:05 +08:00
minggo
00c0e4c432
Merge pull request #10909 from babcca/webview_ios_load_data_fix
...
Webview ios load data fix
2015-04-08 14:34:42 +08:00
minggo
e4099acdc8
Merge pull request #11328 from CocosRobot/update_lua_bindings_1428464979
...
[AUTO]: updating luabinding automatically
2015-04-08 13:54:22 +08:00
CocosRobot
58ca1b7911
[AUTO]: updating luabinding automatically
2015-04-08 03:52:03 +00:00
minggo
e9cdf333f9
Merge pull request #11246 from xiaofeng11/v3
...
V3 reader fix
2015-04-08 11:46:40 +08:00
minggo
4bcfcb1d09
Merge pull request #11320 from samuele3hu/v3_terrain
...
#issue 10819:Add lua bindings for Terrain and two test cases about it.
2015-04-08 11:45:46 +08:00
minggo
21c5bc96e5
Merge pull request #11319 from CocosRobot/update_lua_bindings_1428458531
...
[AUTO]: updating luabinding automatically
2015-04-08 10:53:07 +08:00
minggo
4d9e376a18
Merge pull request #11284 from perminovVS/v3-dev-image-format-detect-log
...
Log message can't detect image format
2015-04-08 10:52:56 +08:00
minggo
dff62e329e
Merge pull request #11313 from stari4ek/v3-FileUtils-constness
...
FileUtils: replace const_cast with mutable in path getters
2015-04-08 10:50:43 +08:00
tangziwen
3ab4e75a71
update
2015-04-08 10:10:05 +08:00
CocosRobot
4bcf6b7b67
[AUTO]: updating luabinding automatically
2015-04-08 02:04:07 +00:00
samuele3hu
3a2601a1f8
Add lua bindings for Terrain and two test cases about it.
2015-04-08 10:03:50 +08:00
andyque
8a4a7344b0
fix freetype include
2015-04-08 09:24:34 +08:00
andyque
e4cf3885a5
use prebuilt zlib for android and mac
2015-04-07 23:20:02 +08:00
Michael Sotnikov
f962e14b43
replace const_cast with mutable in path getters;
...
more getters (is*/get*) became const;
2015-04-07 17:15:15 +03:00
tangziwen
a220a8f669
fix wrong attribute location bind, fix memory leak, enable back-face culling
2015-04-07 18:47:19 +08:00
minggo
ca090281a4
Merge pull request #11307 from WenhaiLin/v3-label-effect
...
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
2015-04-07 18:22:35 +08:00
minggo
50fa15c0cd
Merge pull request #11301 from samuele3hu/v3_lua_jit
...
Add luajit support for iOS 64bit devices and related test cases
2015-04-07 18:17:09 +08:00
lvlong
c9014e12b4
Merge branch 'v3' of github.com:super626/cocos2d-x into v3
...
Conflicts:
CHANGELOG
2015-04-07 16:40:57 +08:00
lvlong
99ef79f940
modify INT_NEAR
2015-04-07 16:37:51 +08:00
WenhaiLin
927cda3f0d
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
2015-04-07 15:51:57 +08:00
minggo
eb928432ce
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
...
Label: Fixed shadow color is incorrect.
2015-04-07 15:27:19 +08:00
minggo
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
WenhaiLin
c5c5d3e39d
Label: Fixed shadow color is incorrect.
2015-04-07 11:17: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
deaa6a19f0
Merge pull request #11257 from super626/terrain
...
Terrain
2015-04-07 09:32:35 +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
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
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
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
lvlong
4c6eec9ec1
add getAABBRecursively
2015-04-03 18:04:33 +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