Neo Kim
|
a4e5f7c0a8
|
ScrollView - Refactor the logic about getting out of boundary amount.
|
2015-09-09 10:28:47 +09:00 |
Neo Kim
|
90891f9efb
|
ScrollView - Add a utility function 'flattenVectorByDirection()'
|
2015-09-09 10:28:46 +09:00 |
Neo Kim
|
ea79d92aa1
|
ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back.
|
2015-09-09 10:28:46 +09:00 |
Neo Kim
|
7394b3f467
|
ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'.
|
2015-09-09 10:28:46 +09:00 |
Neo Kim
|
c037769e62
|
ScrollView - Correct auto scroll direction
|
2015-09-09 10:28:45 +09:00 |
Neo Kim
|
2dec85e175
|
ScrollView - Fix that the last touch when release was not considered for inertia scroll
|
2015-09-09 10:28:45 +09:00 |
Neo Kim
|
5f469264fc
|
ScrollView - Refactor auto scroll for simpler implementation
- Remove auto scroll callback
|
2015-09-09 10:28:45 +09:00 |
Neo Kim
|
ad01bc7699
|
ScrollView - Add startAttenuatingAutoScroll()
|
2015-09-09 10:28:44 +09:00 |
Neo Kim
|
3cff03e8ed
|
ScrollView - Remove movement callback from auto scroll.
|
2015-09-09 10:28:44 +09:00 |
Neo Kim
|
0c4414625a
|
ScrollView - Rectify wrong indentations
|
2015-09-09 10:28:44 +09:00 |
pandamicro
|
d60eb21d59
|
Merge pull request #13710 from minggo/implement-function-in-cpp
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
|
2015-09-08 13:28:19 +08:00 |
pandamicro
|
eab6dbe6fd
|
Merge pull request #13711 from minggo/crash-in-dynamic-library
don't define static variable in header file or each dynamic lib will have a copy
|
2015-09-08 11:45:12 +08:00 |
minggo
|
d86b256396
|
don't define static variable in header file or each dynamic lib will have a copy
|
2015-09-08 11:04:51 +08:00 |
minggo
|
3510990a23
|
Merge pull request #13709 from minggo/physics-component-squash
add physics component
|
2015-09-08 10:45:54 +08:00 |
minggo
|
bbe5861367
|
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
|
2015-09-08 10:26:37 +08:00 |
minggo
|
8326ed6535
|
add physics component
|
2015-09-08 09:54:01 +08:00 |
子龙山人
|
75882e64a0
|
Merge pull request #13646 from neokim/refactor_scrollview_inertia_scroll
Refactor scroll view's inertia scroll
|
2015-09-07 22:38:20 +08:00 |
子龙山人
|
aec82b97a3
|
Merge pull request #13708 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2015-09-07 17:39:09 +08:00 |
zhangbin
|
d145416e1f
|
Update the reference of submodule cocos2d-console.
|
2015-09-07 17:36:54 +08:00 |
pandamicro
|
00abec6c2c
|
Merge pull request #13707 from pandamicro/fix_layerrgba
[ci skip] Fix compile error in __LayerRGBA
|
2015-09-07 17:27:46 +08:00 |
TheCodez
|
d77045818c
|
Fix compile error in __LayerRGBA
|
2015-09-07 17:25:56 +08:00 |
pandamicro
|
0eee625788
|
Merge pull request #13697 from pabitrapadhy/patch-1
Updated spelling and grammar mistakes
|
2015-09-07 15:02:27 +08:00 |
pandamicro
|
4fb34ba190
|
Merge pull request #13703 from cocos2d/v3.8
Sync v3.8 to v3
|
2015-09-07 14:56:37 +08:00 |
子龙山人
|
0da3d83a6a
|
Merge pull request #13698 from WenhaiLin/v3-rename-AVAudioPlayer
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework.
|
2015-09-07 13:40:16 +08:00 |
pandamicro
|
12ff8cd2dd
|
Merge pull request #13702 from pandamicro/v3.8
[ci skip] Update COCOS2D_VERSION
|
2015-09-07 11:45:46 +08:00 |
pandamicro
|
2739be06bb
|
Update COCOS2D_VERSION
|
2015-09-07 11:45:04 +08:00 |
WenhaiLin
|
42b24a9c5b
|
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework
|
2015-09-07 11:12:13 +08:00 |
Pabitra Padhy
|
d4c60144f0
|
Updated spelling and grammar mistakes
|
2015-09-06 15:29:36 +05:30 |
pandamicro
|
b31b9213ea
|
Merge pull request #13693 from pandamicro/v3.8
[ci skip] Update release docs for v3.8 final
|
2015-09-06 16:29:19 +08:00 |
pandamicro
|
08fc2dd36b
|
Update release docs for v3.8 final
|
2015-09-06 16:28:44 +08:00 |
子龙山人
|
68b2689a4d
|
Merge pull request #13691 from CocosRobot/update_cocosfiles_1441505141
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-06 10:22:59 +08:00 |
CocosRobot
|
f427ae2f06
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-09-06 02:05:42 +00:00 |
子龙山人
|
f9eef5ceed
|
Merge pull request #13636 from zilongshanren/refactorEditBox
refactor EditBox iOS&Android implementation
|
2015-09-06 10:03:54 +08:00 |
pandamicro
|
2dfd22dfef
|
Merge pull request #13690 from pandamicro/v3.8
[ci skip][JS] Add common APIs for compatibility with web engine
|
2015-09-06 08:59:27 +08:00 |
pandamicro
|
86fb0fc3bc
|
[JS] Add common APIs for compatibility with web engine
|
2015-09-06 08:57:43 +08:00 |
pandamicro
|
70d551a932
|
Merge pull request #13683 from MSOpenTech/v3-winrt
update libcococs2d name to v3.9 for WinRT platforms
|
2015-09-06 08:14:05 +08:00 |
Dale Stammen
|
030157ded0
|
update libcococs2d name to v3.9 for WinRT platforms
|
2015-09-04 08:46:08 -07:00 |
pandamicro
|
f9c20caa67
|
Merge pull request #13603 from perminovVS/correct-key-code
Desktop and WinRT use correct keyboard codes
|
2015-09-04 14:39:44 +08:00 |
子龙山人
|
7fb36b4c9c
|
Update Jenkins build status icon link
|
2015-09-04 09:43:45 +08:00 |
pandamicro
|
ab5b634976
|
Merge pull request #13625 from frranck/patch-4
Update CCImage.cpp
|
2015-09-03 00:10:16 +08:00 |
andyque
|
c0f40ad4a5
|
fix Android EditBox font size issue
|
2015-09-02 18:25:30 +08:00 |
pandamicro
|
0f2a528129
|
Merge pull request #13663 from linguofeng/patch-1
lua add UPDATE_FAILED ERROR_DECOMPRESS
|
2015-09-02 18:24:51 +08:00 |
子龙山人
|
c92a308b68
|
Merge pull request #13665 from WenhaiLin/v3-link-resource-fix
[ci skip]js-template-default:Fixed the path of link resources.
|
2015-09-02 13:55:12 +08:00 |
WenhaiLin
|
be60f7f65c
|
[ci skip]js-template-default:Fixed the path of link resources.
|
2015-09-02 13:48:57 +08:00 |
linguofeng
|
7fc382055b
|
lua add UPDATE_FAILED ERROR_DECOMPRESS
add
cc.EventAssetsManagerEx.EventCode.UPDATE_FAILED
cc.EventAssetsManagerEx.EventCode.ERROR_DECOMPRESS
|
2015-09-02 11:27:47 +08:00 |
pandamicro
|
150db941da
|
Merge pull request #13650 from ZhangMenghe/v3-testcases
[ci skip] Remove clickAndMove testcase
|
2015-09-02 09:08:16 +08:00 |
子龙山人
|
4530043d9b
|
Merge pull request #13649 from WenhaiLin/v3-string-empty-check
Use string::empty() to check whether string is empty.
|
2015-09-01 18:04:41 +08:00 |
pandamicro
|
d1845efdb2
|
Merge pull request #13653 from natural-law/v3.8
[ci skip] Update the version displayed in about dialog of windows simulator.
|
2015-09-01 18:03:12 +08:00 |
zhangbin
|
2c6c35cb76
|
Update the version displayed in about dialog of windows simulator.
|
2015-09-01 18:00:50 +08:00 |
ZhangMenghe
|
f3190206e0
|
Remove clickAndMove testcase
|
2015-09-01 14:21:08 +08:00 |