b3976cdd63
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 06:08:45 +00:00
34be2065e4
Refine ComponentContainer to improve performance
2015-09-09 11:53:55 +08:00
e592a1a02d
fix typos
2015-09-09 11:37:41 +08:00
153bdb7170
add comment
2015-09-09 11:11:17 +08:00
f7f8a42ecf
Merge pull request #13722 from NatWeiss/patch-17
...
Fix crash in FrameBuffer if no DepthStencil
2015-09-09 10:46:58 +08:00
ae7b45a569
Merge pull request #13732 from CocosRobot/update_lua_bindings_1441765845
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 10:42:04 +08:00
2423f05024
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 02:37:17 +00:00
20531061a2
Merge pull request #13728 from CocosRobot/update_lua_bindings_1441765050
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 10:36:54 +08:00
9814851355
Merge pull request #13659 from seivan/patch-2
...
EventListenerMouse will dispatch EventMouse events
2015-09-09 10:34:12 +08:00
dc607a1784
Merge pull request #13726 from jianglong0156/actionExtendSquash
...
support custom action, and rewrite update function
2015-09-09 10:25:56 +08:00
a78f5e3dcc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-09-09 02:23:01 +00:00
badd80bf3a
support custom action, and rewrite update function
...
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
2015-09-09 10:08:07 +08:00
586af44fe6
ListView - Add getter / setter for magnetic out of boundary flag.
2015-09-09 10:29:19 +09:00
b28b8146e7
ListView - Add the logic for magnetic bounce back.
2015-09-09 10:29:19 +09:00
3085e1385c
ListView - Add 'startMagnetScroll()' for non-inertia scroll.
2015-09-09 10:29:18 +09:00
e58c073186
ListView - Apply magnetic to inertia scroll.
2015-09-09 10:29:18 +09:00
ca3ea53ffd
ListView - Add enum for magnetic type and test cases for magnetic scroll.
2015-09-09 10:29:18 +09:00
d8fc04d109
ListView - Add 'scrollToItem' method and its test cases.
2015-09-09 10:29:18 +09:00
2599271410
ListView - Add APIs which return the closest item in specific position in current view.
2015-09-09 10:29:17 +09:00
a4e5f7c0a8
ScrollView - Refactor the logic about getting out of boundary amount.
2015-09-09 10:28:47 +09:00
90891f9efb
ScrollView - Add a utility function 'flattenVectorByDirection()'
2015-09-09 10:28:46 +09:00
ea79d92aa1
ScrollView - Fix an issue which occurs when auto scroll is started during already bouncing back.
2015-09-09 10:28:46 +09:00
7394b3f467
ScrollView - Rename 'startAutoScrollChildrenWithDestination()' to 'startAutoScrollToDestination' and 'duration' to 'time'.
2015-09-09 10:28:46 +09:00
c037769e62
ScrollView - Correct auto scroll direction
2015-09-09 10:28:45 +09:00
2dec85e175
ScrollView - Fix that the last touch when release was not considered for inertia scroll
2015-09-09 10:28:45 +09:00
5f469264fc
ScrollView - Refactor auto scroll for simpler implementation
...
- Remove auto scroll callback
2015-09-09 10:28:45 +09:00
ad01bc7699
ScrollView - Add startAttenuatingAutoScroll()
2015-09-09 10:28:44 +09:00
3cff03e8ed
ScrollView - Remove movement callback from auto scroll.
2015-09-09 10:28:44 +09:00
0c4414625a
ScrollView - Rectify wrong indentations
2015-09-09 10:28:44 +09:00
14b9c2e75c
Fix crash in FrameBuffer if no DepthStencil
...
This fixes a debug-config crash if a FrameBuffer has no `RenderTargetDepthStencil`.
2015-09-08 13:13:38 -07:00
d6934cfc4b
rename var resumeDownloaded to resumeDownloaded.
2015-09-08 16:38:02 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
f944750627
add material cache
2015-09-08 15:29:54 +08:00
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
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
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
bbe5861367
fix crash on xiaomi2 if cocos2d-x is built as a dynamic library
2015-09-08 10:26:37 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
2f02690394
EventListenerMouse will dispatch EventMouse events
2015-09-07 20:05:51 +02: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
00abec6c2c
Merge pull request #13707 from pandamicro/fix_layerrgba
...
[ci skip] Fix compile error in __LayerRGBA
2015-09-07 17:27:46 +08:00
d77045818c
Fix compile error in __LayerRGBA
2015-09-07 17:25:56 +08:00
e500b960f3
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
2015-09-07 16:29:57 +08:00
0eee625788
Merge pull request #13697 from pabitrapadhy/patch-1
...
Updated spelling and grammar mistakes
2015-09-07 15:02:27 +08:00
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
97c59c87ac
built in material for sprite3d
2015-09-07 13:59:38 +08:00
137d180dc9
fix material clone
2015-09-07 13:59:08 +08:00
9b4fe5b5a1
Add CCDownloader-android class frame to android project.
2015-09-07 11:55:00 +08:00
2739be06bb
Update COCOS2D_VERSION
2015-09-07 11:45:04 +08:00
42b24a9c5b
Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework
2015-09-07 11:12:13 +08:00
3a078540a0
Modify CCDownloader-apple.mm support continuly download.
2015-09-07 10:08:28 +08:00
d4c60144f0
Updated spelling and grammar mistakes
2015-09-06 15:29:36 +05:30
0afa2bdfc6
Modify CCDownloader-curl.cpp to support continue download.
2015-09-06 15:57:51 +08:00
f9eef5ceed
Merge pull request #13636 from zilongshanren/refactorEditBox
...
refactor EditBox iOS&Android implementation
2015-09-06 10:03:54 +08:00
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
86fb0fc3bc
[JS] Add common APIs for compatibility with web engine
2015-09-06 08:57:43 +08:00
030157ded0
update libcococs2d name to v3.9 for WinRT platforms
2015-09-04 08:46:08 -07:00
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
59fab25804
Removed innerContainer pointer copy when cloning
...
Copied pointer becomes invalid when model widget destructs. Instead we simply copy the position.
2015-09-03 11:29:58 +01:00
ab5b634976
Merge pull request #13625 from frranck/patch-4
...
Update CCImage.cpp
2015-09-03 00:10:16 +08:00
527e254617
Remove glfwError
2015-09-02 18:41:23 +03:00
c1ac27fffb
glfwError no static member
2015-09-02 15:02:23 +03:00
ea580ed2ee
Restructure CCDownload Interface and implements with curl.
2015-09-02 18:26:42 +08:00
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
addce6c565
add CC_DLL
2015-09-02 15:55:58 +08:00
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
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
3656ce99bd
Fix an issue regarding non-bouncing scroll view
2015-09-01 15:13:18 +09:00
5cabc592e0
add motionstreak3d to cocos2d header
2015-09-01 11:34:35 +08:00
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
c23805889f
add motionstreak3d
2015-09-01 11:02:22 +08:00
129f4b3186
Implement the inertia scroll using auto scroll feature. Consolidate them into one.
2015-09-01 11:52:05 +09:00
ecd947d9f4
Change auto scroll feature to receive callbacks to remove dependencies.
2015-09-01 11:45:42 +09:00
137a05a2aa
Rectify the wrong indentations in switch statements
2015-09-01 11:45:42 +09:00
69d23eb00c
Extract the touch move speed calculation logic from inertia concept.
2015-09-01 11:45:42 +09:00
81795f6d73
Add a guard statement in setInnerContainerPosition().
2015-09-01 11:45:42 +09:00
96a78f687c
Remove redundant codes
2015-09-01 11:45:42 +09:00
2e9e660cbb
Merge pull request #13220 from zilongshanren/testEditBoxWin32
...
Improved EditBox implement for platform win32
2015-09-01 10:40:11 +08:00
b6c4f4cf50
add comment
2015-09-01 10:39:14 +08:00
7f04a191c7
Merge pull request #13635 from super626/v3.8
...
Enable depth write for transparent object
2015-09-01 10:30:50 +08:00
59c1b21d0b
Merge pull request #13634 from WenhaiLin/v3.8-textreader-refine
...
This is a small optimization about TextReader.
2015-09-01 09:40:52 +08:00
b8105349c7
revert to the original state when user cancel input
2015-09-01 00:06:18 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
367a105a48
refactor EditBox iOS&Android implementation
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/13616#issuecomment-135742727
2015-08-31 18:36:27 +08:00
030ab8858d
enable depth write for transparent object
2015-08-31 18:34:09 +08:00
df383de894
This is a small optimization about TextReader.
2015-08-31 17:06:11 +08:00
e7c7b248d6
fix bug: bone can be see by other cameras
2015-08-31 16:04:17 +08:00
8f6f5c1191
Update engine versions
2015-08-31 13:52:15 +08:00
8e195723e6
Update CCImage.cpp
...
When you're creating a sprite (e.g. with Sprite* Sprite::create(filename))
There's no way to test the file before, without getting "a unsupport image format!" thrown.
2015-08-30 09:40:15 +02:00
bc07d7954a
fix render state
2015-08-28 23:00:45 +08:00
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
6fa6f1f0da
enable depth write
2015-08-28 11:46:11 +08:00
bc2e66d03b
add motionstreak3d
2015-08-28 11:40:12 +08:00
4fe9517ec7
Merge pull request #13592 from neokim/fix_13591
...
Fix #13591
2015-08-28 10:19:20 +08:00
1264863b2f
Merge pull request #13598 from zilongshanren/fixSliderConstructor
...
fix Slider create missing res type.
2015-08-28 09:28:19 +08:00
69da65d7a4
update for jsb_opengl_constants
2015-08-28 08:42:55 +08:00
b5688f504c
Desktop and WinRT use correct keyboard codes
...
Desktop:
GLFW_KEY_ENTER equals KEY_ENTER ( GLFW_KEY_KP_ENTER = KEY_KP_ENTER)
WinRT:
VK_PRIOR equals KEY_PG_UP ( not KEY_KP_PG_UP )
2015-08-27 23:46:24 +03:00
104013aebe
commit v3.8 overwrite this unused code
...
From commit #13397
2015-08-27 23:19:30 +03:00
bf40c1acd1
WinRT support mouse event
...
Mouse event implemented similar Desktop version.
Left button send mouse event and touch.
Support other mouse button and scroll wheel.
2015-08-27 21:34:25 +03:00
b5c289c622
WinRT support Show/Hide mouse cursor
2015-08-27 21:19:59 +03:00
40492e6169
fix Slider create missing res type.
...
fixed https://github.com/cocos2d/cocos2d-x/issues/13575
2015-08-27 23:34:39 +08:00
ed49250b9b
update for reader
...
1.update for sprite3d cullface
2.sync js code
2015-08-27 18:29:45 +08:00
032bc590b7
Merge pull request #13593 from jianglong0156/fixActionParamError
...
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:44:46 +08:00
a060a82d88
fix Action:Place, RotateTo param wrong number error
2015-08-27 17:35:09 +08:00
30d52d1394
Fix #13591
2015-08-27 17:12:07 +09:00
30d6c82da6
Merge pull request #13585 from WenhaiLin/v3.8-scheduleOnce-hotfix
...
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay parameter equal zero.
2015-08-27 10:54:04 +08:00
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
d5d1be93cc
make it compile on win32
2015-08-26 10:16:50 -07:00
09a1211c96
use isWindowsPhone() to check for Windows Phone platform
2015-08-26 09:47:59 -07:00
161954da87
fixed pdb file output location
2015-08-26 09:41:23 -07:00
4cb3d88232
added isWindowsPhone() to correctly detect Windows 10 phone
2015-08-26 09:19:28 -07:00
fcae139857
removed old WP8_SHADER_COMPILER defines
2015-08-26 08:50:11 -07:00
393af19237
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay equal zero.
2015-08-26 23:41:48 +08:00
405e6c24c8
Merge pull request #13578 from geron-cn/v3.8
...
bone's color and opacity cannot cascade to bone
2015-08-26 22:33:31 +08:00
8459978dfa
Merge pull request #13572 from zilongshanren/fixIssue13564
...
fix Scale9Sprite draw extra pixels in spritesheet
2015-08-26 21:35:00 +08:00
d49edbb4f5
Merge pull request #13574 from super626/v3.8
...
Skybox brush set depth test function to always
2015-08-26 21:31:19 +08:00
9d1cf6eab3
Merge pull request #13579 from CocosRobot/update_lua_bindings_1440593794
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-26 21:29:56 +08:00
ee5c541cd1
Merge pull request #13573 from songchengjiang/v3.8
...
add annotations
2015-08-26 21:12:43 +08:00
3d6866279a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-26 13:01:17 +00:00
8a5fb709ad
Merge pull request #13566 from liamcindy/V3.8
...
update reader with skybox valid
2015-08-26 20:52:05 +08:00
7d01b16f62
bone's color and opacity cannot cascade to bone, also bone can not cascade from its parent.
2015-08-26 20:24:20 +08:00
5f527bfc1d
Fixed sprite debug draw.
2015-08-26 18:18:58 +08:00
f9e9871bcc
supplement annotations
2015-08-26 17:24:36 +08:00
2f72a88a20
depth test always
2015-08-26 16:37:48 +08:00
d17c04cf0e
tmp
2015-08-26 16:35:42 +08:00
2239b624a8
add annotations
2015-08-26 16:19:30 +08:00
7f73415189
fix Scale9Sprite draw extra pixels in spritesheet
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
2015-08-26 16:15:00 +08:00
5a997cec1c
update reader with skybox valid
2015-08-26 10:22:20 +08:00
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
6cea66f932
fixed Scale9Sprite default capInset bug.
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
2015-08-25 23:31:34 +08:00
8165775a3d
Merge pull request #13554 from super626/v3.8
...
disable blend when drawing skybox
2015-08-25 16:50:52 +08:00
734388d2bd
Merge pull request #13556 from zilongshanren/fix-listview-intial-position
...
fix ListView innerContainer initial position error
2015-08-25 16:50:02 +08:00
68444bc3b1
Merge pull request #13553 from liamcindy/V3.8
...
update reader with new skybox
2015-08-25 16:34:28 +08:00
c998639c30
update interface for gamenode3d
2015-08-25 15:18:09 +08:00
65b78d4a49
fix ListView innerContainer initial position error
2015-08-25 15:15:18 +08:00
7884138dcc
disable blend when drawing skybox
2015-08-25 14:32:25 +08:00
650a5c2318
update reader with new skybox
2015-08-25 13:20:19 +08:00
ab85406bc8
Added version comments
2015-08-25 11:21:26 +09:00
d2fb1bda7d
Add getters for the internal renderer instances
2015-08-25 11:21:02 +09:00
b0561749bd
Merge pull request #13537 from neokim/fix_issue_13516
...
Fix issue 13516
2015-08-25 10:01:03 +08:00
43687bf7a0
moved CCTextureCube from 3D to renderer
2015-08-24 03:45:55 -07:00
7117fa24be
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-24 10:13:27 +00:00
edd9fecf39
Update scroll bar when the inner container's size changes
2015-08-24 18:47:12 +09:00
9f693ef8f3
Enhance readability
2015-08-24 18:46:43 +09:00
e1ed3ecb09
Add a method to change selected radio button without event dispatch.
2015-08-24 17:39:49 +09:00
887efdca1b
Add 'removeAllRadioButtons()'
2015-08-24 17:39:48 +09:00
202b549073
Add getters for the internal renderer instances
2015-08-24 17:39:47 +09:00
da85b16292
Change not to dispatch event when add radio buttons
2015-08-24 17:39:46 +09:00
31a09c9f23
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-24 06:13:37 +00:00
0c5b377f00
Merge pull request #13531 from pandamicro/texturecube
...
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:06:08 +08:00
7dcc3dd982
Move CCTextureCube From 3d to renderer to solve compilation issue
2015-08-24 14:01:50 +08:00
24282e6e55
Merge pull request #13397 from perminovVS/v3-dev-winrt-correct-unicode
...
Correct use and convert unicode from utf8. WinRT
2015-08-24 11:36:30 +08:00
585990071d
Merge pull request #13528 from songchengjiang/v3.8
...
fix crash of CameraBackgroundColorBrush
2015-08-24 11:08:01 +08:00
be24586f4b
fix crash of CameraBackgroundColorBrush
2015-08-24 10:23:59 +08:00
11113c85da
Improved logic of skybox reader fix
2015-08-24 10:02:38 +08:00
110de9ee3e
fix skybox crash with error data
2015-08-24 10:02:37 +08:00
055ef23931
Fix AssetsManager crash by protecting Downloader with shared_ptr
2015-08-22 22:13:53 +08:00
5c4b67d04e
Merge pull request #13518 from MSOpenTech/v3.8-win10
...
V3.8: Win10 UWP add missing CCCameraBackgroundBrush files
2015-08-22 12:01:28 +08:00
6ee33499b4
Update changelog and versions for v3.8 rc0
2015-08-22 11:56:25 +08:00
fc1a2b2f99
fixed for winrt audio issue 13254
2015-08-21 09:59:46 -07:00
b4f2fb0928
added missing CCCameraBackgroundBrush files
2015-08-21 09:23:01 -07:00
486af79a47
Merge pull request #13511 from fusijie/fix_13509
...
fixed renderTexture crash bug.
2015-08-21 18:24:27 +08:00
cbd7eed9c4
fixed renderTexture crash bug.
2015-08-21 17:38:56 +08:00
6b6c6b242c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-21 06:44:25 +00:00
66fbc33ccb
Merge pull request #13501 from pandamicro/camera
...
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 14:35:15 +08:00
369d7474b8
Merge pull request #13499 from zilongshanren/fix-scrollview-initil-posotion
...
fix scrollview innerContainer initial position.
2015-08-21 13:51:04 +08:00
006f300ac9
Add JS and Lua bindings for CCCameraBackgroundBrush
2015-08-21 12:42:36 +08:00
306a0e4df7
Merge pull request #13471 from super626/v3.8
...
skybox should not be transparent
2015-08-21 12:22:48 +08:00
9a6c779580
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-21 03:59:12 +00:00
29f97d63ed
fix scrollview innerContainer initial position.
2015-08-21 11:56:19 +08:00
350182c1aa
Refactor BackGround to Background
2015-08-21 10:43:59 +08:00
3e2001bdb1
Add CCCameraBackgroundBrush
...
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
2015-08-21 10:43:59 +08:00
1bcc2dec37
Notification effect enhancement
2015-08-21 10:20:59 +08:00
f377a9bff1
Merge pull request #13491 from zilongshanren/v3.8
...
add RadioButton and RadioButtonGroup event type
2015-08-21 09:17:46 +08:00
c47de9d04f
make new render surface current after device lost
2015-08-20 13:26:03 -07:00
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
15156a015a
add RadioButton and RadioButtonGroup event type
2015-08-20 22:49:42 +08:00
c6c1b429c6
Merge pull request #13489 from jianglong0156/fixwin32textureCacheTest
...
fix texturecache didn't show correctly in win32
2015-08-20 22:39:01 +08:00
895c29efe4
fix texturecache didn't show correctly in win32
2015-08-20 18:11:05 +08:00
81ca089d27
Merge pull request #13479 from liamcindy/V3.8_reader
...
fix object size error while data is error
2015-08-20 18:09:28 +08:00
7bd5cc4e34
Merge pull request #13486 from fusijie/fix_11677
...
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 18:06:38 +08:00
788be3016a
update annotation
2015-08-20 18:04:49 +08:00
a54f01ce2b
Merge pull request #13485 from VisualSJ/v3.8-webIndex
...
Update Studio js parser
2015-08-20 18:02:55 +08:00
5ef4f3159e
Merge pull request #13487 from jianglong0156/fixopenglErrorSquash
...
fix opengl test error
2015-08-20 17:47:08 +08:00
10d5b73c7e
fix opengl test error
...
fix opengl test error, add the condition, when the data type is samewith long, it will reset data
relate pr:#13449
fix open gl show error
2015-08-20 17:42:26 +08:00
f133e5a754
Fixed SpriteProgressToRadialMidpointChanged bug.
2015-08-20 17:07:53 +08:00
a4fec3a5e0
Update Studio js parser
2015-08-20 17:02:41 +08:00
5b0dcd8a10
Merge pull request #13484 from CocosRobot/update_lua_bindings_1440055948
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-20 15:42:06 +08:00
a3b8423977
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-20 07:39:25 +00:00
f79d2c8a0a
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
...
[ci skip]add missing ui test in Lua
2015-08-20 15:28:25 +08:00
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
13a271d96d
Merge pull request #13478 from xiaofeng11/v3.8
...
Fix Cocos Studio Bugs
2015-08-20 14:42:36 +08:00
6bdb5431f1
Update code, using condition macro to determine studio or user project
2015-08-20 13:33:48 +08:00
b4f585732e
Add CCDownloader-apple for mac and ios.
2015-08-20 11:35:40 +08:00
aa6f2ec4b6
fix object size error while data is error
2015-08-20 11:27:01 +08:00
93f026f8e6
Fix https://github.com/cocos2d/cocos2d-x/issues/9488
2015-08-20 11:18:59 +08:00
935b0f006b
Fix https://github.com/cocos2d/cocos2d-x/issues/10205
2015-08-20 10:55:30 +08:00
8f81267960
skybox is not transparent
2015-08-19 18:25:34 +08:00
2605865ca6
Fixed #12570 : Correct `cc.pIsSegmentIntersect` for lua
2015-08-19 16:21:31 +08:00
f26509efe4
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
2015-08-19 14:02:12 +08:00
bf723eab91
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-19 05:55:16 +00:00
4f9a81198b
Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder
...
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
2015-08-19 13:46:00 +08:00
31bc04a301
Merge pull request #13455 from MSOpenTech/v3-win10
...
Windows 10 UWP and WP8.1 app certification fixes
2015-08-19 13:36:29 +08:00
1f735b4f0e
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
...
Fixed setVertexAttribPointer luabinding and Test case.
2015-08-19 11:43:18 +08:00
da9971f04f
Merge pull request #13449 from fusijie/fix_JSB_glGetUniformfv
...
fixed JSB_glGetUniformfv uniform location is different from index.
2015-08-19 11:42:36 +08:00
827f05c5e1
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
2015-08-19 10:22:48 +08:00
2dbb4ad50e
fixed JSB_glGetUniformfv uniform location is different from index.
2015-08-19 09:53:52 +08:00
47b72ba30e
Merge branch 'v3' into v3-win10
2015-08-18 11:07:38 -07:00
8493365be7
updates to pass Windows App Certification tests
2015-08-18 11:06:47 -07:00
593eb0737f
Merge pull request #13440 from WenhaiLin/v3.8-rc0
...
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 17:06:37 +08:00
6bf15885b8
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
2015-08-18 15:42:05 +08:00
223d5a7a5c
fix copy construct & assignment operator memory leakage.
2015-08-18 14:48:16 +08:00
a799c99b1a
fix setVertexAttribPointer luabinding
2015-08-18 11:46:45 +08:00
d2bc03f80f
Merge pull request #13424 from WenhaiLin/v3.8-rc0
...
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-18 10:00:36 +08:00
ee7b9377de
removed old wp8 code that breaks Win10 WACK tests
2015-08-17 18:40:07 -07:00
24d06bb1c9
More use StringUtf8ToWideChar and PlatformStringFromString
2015-08-17 23:04:05 +03:00
24a63e12ec
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-17 15:08:00 +00:00
81d5a8377f
Merge pull request #13418 from jianglong0156/fixTMXTileFlagsError
...
Remove duplicate function definition, Add function adaptation
2015-08-17 22:56:59 +08:00
990a25f759
Label:Fixed display not as expected(Redmine issue:22133).
2015-08-17 22:46:19 +08:00
0473b08dbb
Fix gamenode3d parse failed error
...
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
2015-08-17 22:42:21 +08:00
be165ef900
Permit webp image loading
2015-08-17 18:55:53 +08:00
b19e02bdf6
Remove duplicate function definition, Add function adaptation
2015-08-17 18:18:38 +08:00
f2edb1c8f9
Merge pull request #13410 from ZhangMenghe/v3-retinaEffect
...
[ci skip] Fix invisiable testcase of effects
2015-08-17 17:51:04 +08:00
e380b0cffa
Merge pull request #13415 from VisualSJ/v3-13359
...
[ci skip] Update JS parser
2015-08-17 17:29:12 +08:00
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
c52a81a2c2
Update JS parser
2015-08-17 17:25:17 +08:00
f1cbd00b30
Merge pull request #13414 from liamcindy/V3.8_reader
...
fix code informal
2015-08-17 17:21:01 +08:00
b40ef51337
fix code informal
2015-08-17 17:16:26 +08:00
d0580f09e8
Merge pull request #13383 from geron-cn/3.7.1
...
add blendfunc cascade to its skin in BoneNode
2015-08-17 17:12:04 +08:00
096410a31a
Merge pull request #13406 from xiaofeng11/v3_reader_update
...
Add BlendFrame supporting to Skeleton Animation
2015-08-17 17:09:25 +08:00
66d99d392c
Merge pull request #13409 from liamcindy/V3.8_reader
...
fix userCamera flag error with old version files
2015-08-17 17:01:59 +08:00
9db78b2bb7
Merge pull request #13407 from liamcindy/v3.8
...
fix the skybox display error from editor files
2015-08-17 16:57:32 +08:00
442669d6f1
Remove unused easing data processing in blend frame parsing
2015-08-17 16:19:29 +08:00
e3ac9414f4
fix userCamera flag error with olg version files
2015-08-17 14:37:28 +08:00
008b06c01c
set blendfunc cascade to its skin in BoneNode
2015-08-17 13:44:00 +08:00
72d21ff810
Update reader, add BlendFrame supporting to Skeleton Animation
...
Update json parser to prepare compatible for both current version output json description file and future optimized version json description file.
2015-08-17 13:05:29 +08:00
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
8e01326cfa
Merge pull request #13387 from WenhaiLin/v3-replace-tab-withSpaces
...
Replace tab with spaces
2015-08-17 11:29:03 +08:00
a16d04fb53
CCUtf8ToUnicode and CCUnicodeToUtf8 deprecated
2015-08-16 13:08:00 +03:00
d70a21aa25
Correct use and convert unicode from utf8
...
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
2015-08-16 12:51:41 +03:00
487c99e632
Merge pull request #13378 from jianglong0156/fixNodeGrid
...
[ci skip]add NodeGrid bind
2015-08-15 21:43:00 +08:00
6d630152c8
Merge pull request #13381 from zilongshanren/fix-radiobutton-disallowselection
...
fix RadioButton disallow selection issue.
2015-08-15 19:20:18 +08:00
06ab98b0ac
improve the comment
2015-08-15 17:04:32 +08:00
a0c270234b
Replace tab with spaces
2015-08-14 21:17:51 +08:00
d45897ec53
fix RadioButton disallow selection issue.
2015-08-14 18:07:13 +08:00
ae8332eb85
add NodeGrid bind
2015-08-14 17:46:34 +08:00
83de0e798e
Merge pull request #13365 from WenhaiLin/v3-label-ignore-r
...
Label:ignore '\r' character.
2015-08-14 17:22:33 +08:00
1e415a0b5b
Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix
...
Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.
2015-08-14 15:11:09 +08:00
d855722c20
Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero.
2015-08-14 15:05:25 +08:00
ac5f8d0f4c
Merge pull request #13367 from CocosRobot/update_lua_bindings_1439522923
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-14 11:54:38 +08:00
f36d6a5c8c
Merge pull request #13363 from GammaEspeon/v3
...
[bugfix] SimpleAudioEngine misreporting whether music is playing when paused/resumed
2015-08-14 11:54:12 +08:00
9b003c9cfc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-14 03:34:30 +00:00
d25decb414
Label:ignore '\r' character.
2015-08-14 11:07:34 +08:00
5baa90c79e
libcurl.h not included in the header to avoid...
...
too many dependencies
2015-08-13 19:28:38 -07:00
fa02751e45
fixed whitespace
2015-08-13 19:24:41 -04:00
61a2e0d2ad
Added _playing flag switching on pause and resume
...
Issue # 13254
2015-08-13 18:52:32 -04:00
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07:00
c4af7b8c45
Merge pull request #13360 from CocosRobot/update_lua_bindings_1439456784
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 17:25:26 +08:00
2de6b4ed4c
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 09:11:00 +00:00
aa7b96bb40
Merge pull request #13352 from zilongshanren/fixIssue12519
...
fix iOS EditBox Chinese input maxLength issue.
2015-08-13 17:04:19 +08:00
20729e16ae
Merge pull request #13349 from yangws/v3
...
Fix bug: timer dt time error when interval = 0.
2015-08-13 17:02:55 +08:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8#5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a#4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
082caaf3e0
Merge pull request #13342 from WenhaiLin/v3-label-miss-letter
...
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
2015-08-13 15:09:54 +08:00
f9385d1604
fix iOS EditBox Chinese input maxLength issue.
...
https://github.com/cocos2d/cocos2d-x/issues/12519
2015-08-13 15:01:14 +08:00
d333d24177
Fix bug: timer dt time error when interval = 0.
2015-08-13 12:55:07 +08:00
9fd18f987e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-13 02:53:50 +00:00
c06994de34
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
2015-08-13 10:29:58 +08:00
bc964e8314
Merge pull request #13335 from pandamicro/v3
...
Upgrade Spine runtime
2015-08-12 18:46:59 +08:00
da9b894494
Merge pull request #13336 from zilongshanren/v3
...
[ci skip]merge v3.7.1 back to v3.
2015-08-12 18:12:25 +08:00
68a90743c7
Sync PR: https://github.com/cocos2d/cocos2d-x/pull/13303
2015-08-12 18:09:32 +08:00
cb143963ce
Upgrade Spine runtime
2015-08-12 18:07:28 +08:00
a84553ae17
Merge pull request #13311 from WenhaiLin/v3-audio-crashfix
...
AudioEngine:Fixed possible crash on iOS/Mac.
2015-08-12 18:02:00 +08:00
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
86d674030e
Merge pull request #13307 from fusijie/fix_cocostudio_skin_flip
...
fix cocostudio skin setfliped.
2015-08-12 14:34:46 +08:00
be1d3ccc67
Merge pull request #13324 from zilongshanren/fix-editbox-soft-keyboard-backissue
...
fix ui::TextField status error.
2015-08-12 13:57:10 +08:00
763976d50c
fix ui::TextField status error.
...
1. Refactoring Cocos2dxEditText to reuse Cocos2dxEditBox.
2. Reorder the event handling in ui::TextField.
2015-08-12 11:05:07 +08:00
dbd0b6dd86
Merge pull request #13272 from yangws/bug_21800
...
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
b46000287e
AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac]
2015-08-11 18:11:59 +08:00
ef41cb27ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 08:02:58 +00:00
f3f67a10f9
Merge pull request #13232 from perminovVS/v3-dev-get-file-extension
...
Add getFileExtension to FileUtils
2015-08-11 15:54:55 +08:00
65c4261cc6
Merge pull request #13301 from yangws/bug_21906
...
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 15:54:02 +08:00
bb0a7a8533
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 14:28:52 +08:00
47ecb246b8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906
2015-08-11 14:24:02 +08:00
b2bf8469f0
Fix EditBox turning black when soft keyboard hide.
...
I disable a optimization when users start to type, the resize layout's
doLayout event should be stoped.
But it has bugs. If we could find reliable soft keyboard show/hide
event detection method, we could enable this optimization again.
2015-08-11 11:42:37 +08:00
271ab08b59
Merge pull request #13306 from WenhaiLin/v3.8-label-letter-flipped
...
Label:Fixed letter can be flipped.
2015-08-11 11:05:12 +08:00
f1c252a1a8
Merge pull request #13302 from WenhaiLin/v3.8-CocosBuilderTest-crash
...
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
2015-08-11 11:04:54 +08:00
aa1b1831e9
fix cocostudio skin setfliped.
2015-08-11 10:34:22 +08:00
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
aa6ac72405
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-11 01:58:29 +00:00
2deeee70d2
CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x.
2015-08-10 22:41:18 +08:00
6bcea5baee
Fix issue described in #13284 by reorder state setting and event dispatching
...
The real reason of #13284 is that the `_selected` state is set after touch events dispatching.
So I decided to override `onTouchEnded` function to set the `_selected` state.
2015-08-10 22:27:59 +08:00
d0a5c02399
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-10 17:58:49 +08:00
2983aed0a9
Label:Fixed crash cause by access an invalid address
2015-08-10 16:50:59 +08:00
1471936c2f
Merge pull request #13249 from pandamicro/v3
...
Made SocketIO events correctly fired when compile in release mode
2015-08-10 13:32:09 +08:00
3cc06d3f9b
Merge pull request #13267 from yangws/bug_21796
...
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-10 12:40:32 +08:00
f4440f5613
Merge pull request #13229 from fusijie/fix_13228
...
Fixed SpriteBatchNode setFlipped bug.
2015-08-10 11:53:30 +08:00
c54a204bad
Synchronize enable state and bright state for Widget
...
Fix issue: https://github.com/cocos2d/cocos2d-x/issues/8137
2015-08-10 07:42:35 +08:00
1f52f0971a
Fix CheckBox cross renderer state not updated correctly
...
Issue description: When checkbox checked, its renderer adaptation may not be updated.
Reported http://punchbox.info:3000/issues/21630
2015-08-09 20:57:37 +08:00
CocosRobot