Dale Stammen
|
50f381f070
|
added CCLOG message to describe how to handle Windows Phone back button event
|
2015-04-20 18:30:52 -07:00 |
minggo
|
3e9fd67ab2
|
Merge pull request #11520 from super626/v3
Improve Animate3D
|
2015-04-21 09:30:43 +08:00 |
Dale Stammen
|
4169ebf5c8
|
Windows Phone 8.1 back button and terminate app support
|
2015-04-20 10:43:34 -07:00 |
Dale Stammen
|
e00b0dfbd9
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-20 08:17:16 -07:00 |
yangxiao
|
7c37123dbd
|
remove fade in animation if no running animation
|
2015-04-20 19:45:31 +08:00 |
yangxiao
|
e8b21589fc
|
avoid some remap
|
2015-04-20 19:33:16 +08:00 |
htl
|
2476f2b52d
|
fixed win32 application return code
|
2015-04-20 18:27:21 +08:00 |
yangxiao
|
1a50610c00
|
Merge branch 'newcode' into v3
|
2015-04-20 18:21:07 +08:00 |
Vladimir Perminov
|
6ef1e7e3d0
|
Optimize Vec3 use constructor default.
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
|
2015-04-20 12:56:43 +03:00 |
andyque
|
484153aff7
|
remove ui shaders in windows platform
|
2015-04-20 17:54:49 +08:00 |
yangxiao
|
bc62338b36
|
map use node instead of sprite
|
2015-04-20 17:49:01 +08:00 |
minggo
|
15fe283c2e
|
Merge pull request #11515 from xiaofeng11/v3
update compatibility for upgraded node3d come with 2.2.5 version
|
2015-04-20 17:05:32 +08:00 |
andyque
|
6fb29ad1b0
|
remove uishader settings
|
2015-04-20 17:04:49 +08:00 |
andyque
|
e02dad3489
|
fix ui grayscale shader memory release issue
|
2015-04-20 17:00:40 +08:00 |
minggo
|
cdf00408a7
|
Merge pull request #11513 from andyque/fix-wp8.1-include-path
fix freetype include path on win-8.1
|
2015-04-20 16:01:55 +08:00 |
pipu
|
388e4b3a93
|
Modify that parse position for Node3DReader.
|
2015-04-20 15:56:36 +08:00 |
andyque
|
1e514f0a2b
|
fix freetype include path on win-8.1
|
2015-04-20 15:54:31 +08:00 |
minggo
|
76613fc85f
|
Merge pull request #11506 from CocosRobot/update_lua_bindings_1429508341
[AUTO]: updating luabinding automatically
|
2015-04-20 15:51:57 +08:00 |
minggo
|
8f88afa123
|
Merge pull request #11510 from xiaofeng11/v3
Bug fix
|
2015-04-20 15:50:44 +08:00 |
CocosRobot
|
87e29db218
|
[AUTO]: updating luabinding automatically
|
2015-04-20 05:40:58 +00:00 |
minggo
|
fc16bc6154
|
Merge pull request #11501 from samuele3hu/v3_studio2
Add Lua bindings for WebView and related test case
|
2015-04-20 13:36:08 +08:00 |
samuele3hu
|
9477e89723
|
Fix the compile error on the win32
|
2015-04-20 11:46:48 +08:00 |
pipu
|
4b320a1677
|
Modify that parse text shadow and outline.
|
2015-04-20 11:39:43 +08:00 |
minggo
|
bb4e749a93
|
Merge pull request #11489 from dumganhar/clean-order
[Director FIX]: Clean all schedulers and remove all eventlisteners after exiting scene
|
2015-04-20 10:47:37 +08:00 |
minggo
|
c7fe7704d4
|
Merge pull request #11499 from perminovVS/v3-dev-user-default-only-delegate
UserDefault::setDelegate
|
2015-04-20 10:36:56 +08:00 |
samuele3hu
|
4f22a1470b
|
Update the project setting
|
2015-04-20 10:11:39 +08:00 |
samuele3hu
|
067ad6ad60
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_studio2
Conflicts:
cocos/scripting/lua-bindings/proj.android/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
|
2015-04-20 10:05:02 +08:00 |
Dale Stammen
|
5f263968ae
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-19 18:55:02 -07:00 |
minggo
|
5b5d9f1337
|
Merge pull request #11498 from perminovVS/v3-dev-optimize-vec2
Optimize Vec2
|
2015-04-20 09:53:28 +08:00 |
Dale Stammen
|
ec378b612e
|
added listener if back button event not handled by app
|
2015-04-19 18:53:10 -07:00 |
Dale Stammen
|
a97d5c5370
|
added support for hardware back button on Windows Phone 8.1
|
2015-04-19 16:31:30 -07:00 |
Vladimir Perminov
|
87d0d4f677
|
UserDefault::setDelegate
UserDefault very slow, each call need read / write and parse xml file.
Delegate makes it possible to use other variants.
|
2015-04-19 22:07:48 +03:00 |
Vladimir Perminov
|
4c33050536
|
Optimize Vec2
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
|
2015-04-19 20:40:52 +03:00 |
James Chen
|
6864a4a7bb
|
[Director FIX]: Clean all scheduler and remove all eventlisteners after exiting scene
|
2015-04-18 15:06:09 +08:00 |
Dale Stammen
|
f1f0c5a653
|
start of back button support
|
2015-04-17 15:47:52 -07:00 |
Dale Stammen
|
79f312d101
|
call pause on correct thread
|
2015-04-17 09:31:02 -07:00 |
Dale Stammen
|
2ccff5671a
|
fix for encoding images with WIC
|
2015-04-17 09:20:23 -07:00 |
minggo
|
f210fadb00
|
Merge pull request #11472 from milos1290/v3
Adding Lerp for Vec3
|
2015-04-17 17:56:10 +08:00 |
minggo
|
e133f81226
|
Merge pull request #11482 from samuele3hu/v3_remove_useless
[ci skip]Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B
|
2015-04-17 17:54:53 +08:00 |
minggo
|
f38bfdf212
|
Merge pull request #11478 from WenhaiLin/v3-label-fix
Label:Fixed the shadow effect of system font might not be shown.
|
2015-04-17 17:53:52 +08:00 |
minggo
|
768d2bdb48
|
Merge pull request #11481 from andyque/remove-all-lz-in-android
remove system zlib dependency since we use our own prebuilt version
|
2015-04-17 17:49:14 +08:00 |
samuele3hu
|
9aadc2a993
|
Fix the error that the default value of `a` should be 255 when converting a color3b_table into cocos2d::Color4B,
|
2015-04-17 17:40:28 +08:00 |
andyque
|
d3a06de6d6
|
remove system zlib dependency since we use our own prebuilt version of
zlib now.
|
2015-04-17 17:24:33 +08:00 |
minggo
|
e3463d23a8
|
Merge pull request #11479 from samuele3hu/v3_remove_useless
Remove the reference of quick module
|
2015-04-17 17:13:51 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |
WenhaiLin
|
9c2e39dd49
|
Label:Fixed the shadow color of system font may be incorrect.
|
2015-04-17 15:42:41 +08:00 |
WenhaiLin
|
5a438ed9a1
|
Label:Fixed the shadow effect of system font might not be shown.
|
2015-04-17 15:26:43 +08:00 |
WenhaiLin
|
0ac99002d5
|
Label:disableEffect(LabelEffect::XXXX) support disable all effect.
|
2015-04-17 14:39:52 +08:00 |
samuele3hu
|
b72034a3f6
|
Add Lua bindings for WebView and related test case
|
2015-04-17 14:08:47 +08:00 |
lvlong
|
f55af40016
|
fix bug: label action in multiple cameras.
|
2015-04-17 10:19:20 +08:00 |
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 |