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
8c76a194fa
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-09 02:32:59 +00:00
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
99e1e00a5b
Merge pull request #13268 from dabingnn/v3_fixCrashOnAndroid
...
fix engine crash because of wrong initialisation on some android device
2015-08-08 19:43:10 +08:00
eb9d1ea205
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-07 22:55:48 +00:00
789da4edd8
compiles on xcode7
2015-08-07 14:00:18 -07:00
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
a8c729fb42
Merge pull request #13270 from jianglong0156/fixlabelColordisplay
...
[ci skip]fix the node color property can not use
2015-08-07 17:50:27 +08:00
354f64ec51
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.
2015-08-07 17:36:35 +08:00
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
2c3b9009cb
fix the node color property can not use
...
code example:
````
node.color = xxxx // fix it
````
2015-08-07 17:26:35 +08:00
ba02d9df1d
fix engine crash because of wrong initialisation on some android device
2015-08-07 16:37:41 +08:00
56204dbef9
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
2015-08-07 16:30:22 +08:00
e1108c594c
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
2015-08-07 15:48:33 +08:00
c7bc84e19b
fix crash when BoneNode destruct after skeleton destructed.
2015-08-07 15:41:31 +08:00
c6bc81d420
add destruct
2015-08-07 13:13:48 +08:00
c569e70aea
fix BoneNode::visit for visit other node that is not a BoneNode or SkinNode
2015-08-07 11:44:06 +08:00
7b572bed9d
Fix crash when call removeChild from a bone which is already removed.
2015-08-07 09:37:18 +08:00
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
934764af83
Merge pull request #13250 from xiaofeng11/v3.7.1
...
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 22:23:40 +08:00
3ae3020d61
fix crash when fore call remove child bone from a bone which already removed from a skeleton.
2015-08-06 19:43:11 +08:00
91c88ec535
Synchronize js parser with https://github.com/cocos2d/cocos2d-x/pull/13247
2015-08-06 18:12:08 +08:00
0d778386f4
Merge pull request #13208 from dabingnn/v3_fixViewportCompile
...
Make viewport constructor more compile friendly
2015-08-06 17:45:23 +08:00
a170b1caf1
Made SocketIO events correctly fired when compile in release mode
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13248
Reason: `ScriptingCore::executeJSFunctionWithThisObj` is somehow broken in release mode.
Solution: Use `JSFunctionWrapper` to manage callbacks instead of managing JS values manually.
I also did the following in this commit:
- Correct the coding style in jsb_socketio.cpp
- Remove android.mk in the Xcode project
2015-08-06 17:20:04 +08:00
34000f4bde
fix particle3d crash with error file
2015-08-06 15:13:54 +08:00
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
9b148b08cd
Fixed SpriteBatchNode setFlipped bug.
2015-08-06 10:53:22 +08:00
7cacdaeaf1
Add getFileExtension to FileUtils
...
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.
More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )
And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
2015-08-05 22:21:16 +03:00
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
ee6253319a
delete useless code
2015-08-05 23:07:42 +08:00
881adf6f36
Merge pull request #13217 from jianglong0156/fixTextFieldBug
...
fix textfield and editbox can not input emoticon
2015-08-05 17:41:19 +08:00
bbf7e994e7
Improved EditBox implement for platform win32
2015-08-05 17:33:54 +08:00
47fe470647
Merge pull request #13213 from jianglong0156/improUtfFunction
...
add api getStringUTFCharsJNI newStringUTFJNI
2015-08-05 17:26:52 +08:00
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
dae4385b61
Merge pull request #13214 from pandamicro/skeleton-fix
...
Make BoneNodes ordered in Skeleton
2015-08-05 16:36:18 +08:00
9980397081
Make BoneNodes ordered in Skeleton
...
1. Order skins differently than bones and draw them with unified local z order
2. Check children has been remove when its ansester remove
3. Checkout cocos2d::map exists iter before remove
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13191
2015-08-05 16:33:32 +08:00
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
5f9a3b97fb
fix viewport constructor error in old compiler to make it more compatible.
2015-08-05 10:57:27 +08:00
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
b9edd6fc29
Fixed transform
2015-08-05 00:21:06 +08:00
2363622a67
Label:support auto batch with bitmap font or char map.
2015-08-04 21:49:14 +08:00
3230ca154d
improve the code. fix network error
2015-08-04 16:42:16 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
b9b565e64a
Update JSON parser
2015-08-04 16:04:35 +08:00
744fa0b565
Merge pull request #13194 from VisualSJ/v3-boneTest
...
[ci skip] Update JSON parser
2015-08-04 15:35:27 +08:00
04465ac4f4
Update JSON parser
2015-08-04 15:15:46 +08:00
b9602127a4
Merge pull request #13187 from xiaofeng11/v3.7.1
...
Remove file error notice label from TextBMFontReader
2015-08-04 13:38:17 +08:00
0f90999419
Remove file error notice label from TextBMFontReader to keep consistency with other components
2015-08-04 11:45:29 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
d20052cc22
Fix line wrapper in CCDevice
2015-08-04 11:07:04 +08:00
f9249f0e49
Merge pull request #13180 from sridher/mac_dpi_fix
...
getDPI for Mac Implemented
2015-08-04 10:49:14 +08:00
8d2da20e5f
fix spelling mistake.
2015-08-04 09:36:33 +08:00
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
6d3a00ad67
Merge pull request #13173 from geron-cn/3.7.1
...
fix bug: crash when use bone after erase it form Vector.
2015-08-03 19:45:54 +08:00
f48a9fb9f0
getDPI for Mac Implemented
2015-08-03 17:12:52 +05:30
3e71ce33c8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 10:09:10 +00:00
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
e4c47c811f
remove EMSCRIPTEN draw
2015-08-03 16:53:08 +08:00
cfc8da579f
fix bug: crash when use bone after erase it form Vector. move the operation after erase, make sure bone ref* is not realeaed
2015-08-03 16:47:54 +08:00
f10994c20b
Merge pull request #12467 from MagicTavern/v3_fix_websocket
...
fix a problem where WebSocket messages may pile up
2015-08-03 16:25:56 +08:00
dbb8792630
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 07:46:25 +00:00
b13fddb18e
Merge pull request #13162 from super626/v3
...
Terrain: Add light map support
2015-08-03 15:37:42 +08:00
fc4c25c51e
add comment
2015-08-03 13:30:30 +08:00
167f9adca8
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 05:09:11 +00:00
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
2427c15b60
modify vertical scroll direction
2015-08-03 11:38:23 +08:00
330eaf5239
Merge pull request #13161 from xiaofeng11/v3.7.1
...
Fix 3d particle can not show in simulator
2015-08-03 11:11:39 +08:00
aaa5793b86
add IF-CASE to fix debug draw under SpriteBatchNode.
2015-08-03 10:47:58 +08:00
b6774a5f44
fix warning
2015-08-03 10:27:57 +08:00
929cd4fbfe
set default value for _lightDir
2015-08-03 10:12:04 +08:00
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00
17a5d07183
Fix 3d particle can not show in simulator
2015-08-03 09:53:16 +08:00
c281630fa6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-03 00:13:29 +00:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
63822566d2
refactor PageView implementation
2015-08-01 23:33:25 +08:00
29208156d9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-08-01 13:23:21 +00:00
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
5d281d45ef
recover the physics3DShape initHeightfield api
2015-08-01 18:29:48 +08:00
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
Ricardo Quesada