子龙山人
cdaa994b84
Merge pull request #12711 from yangws/issue_12626
...
Fix bug taken from pr12602: scroll view can't scroll if pressed the b…
2015-07-07 13:33:24 +08:00
Vincent Yang
b4559a005b
Fix bug taken from pr12602: scroll view can't scroll if pressed the button on it.
2015-07-07 10:42:04 +08:00
andyque
6238ddebf3
Merge remote-tracking branch 'upstream/v3.7-release' into v3
2015-07-07 10:18:43 +08:00
WenhaiLin
4bd1fa7d37
Fixed crash cause by the case of file name on WIN32.
2015-07-07 10:08:47 +08:00
XiaoFeng
9a6ffd8904
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
2015-07-07 09:54:42 +08:00
子龙山人
a6b29666c9
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
...
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
CocosRobot
4c88db3fb2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-07 00:44:47 +00:00
Ricardo Quesada
ad1fc88fa8
compiles on Xcode 7
2015-07-06 16:30:29 -07:00
Ricardo Quesada
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07:00
CocosRobot
a4bce56cca
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 10:37:24 +00:00
VisualSj
3b69a1726f
Fixed a bug that action texture address error
2015-07-06 17:17:20 +08:00
jianglong0156
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
XiaoFeng
214684b3be
Fix
2015-07-06 16:45:04 +08:00
XiaoFeng
9fab1e7702
Change to use auto & for each to enum sub items
2015-07-06 16:39:00 +08:00
CocosRobot
ae860bd6ee
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-06 08:29:03 +00:00
子龙山人
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
XiaoFeng
d6fc8ecc94
Fix when use percentage size & position to a UIWidget which parent is a layout component, when change simulator screen size, layout won't effect correctly.
2015-07-06 16:02:19 +08:00
Jacky
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
Neo Kim
a01f31c75c
Change NULL to nullptr
2015-07-06 15:54:28 +09:00
Neo Kim
c4dc9b04fd
Add a guard filtering tries to set same value.
2015-07-06 14:54:28 +09:00
XiaoFeng
df2a2d253d
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3.7-release
2015-07-06 10:31:09 +08:00
Neo Kim
0ff7aaef95
Modify loop iteration codes
2015-07-06 11:30:24 +09:00
Neo Kim
43308e258a
Fix an issue of not releasing Texture instance in ScrollViewBar
2015-07-06 11:29:39 +09:00
Neo Kim
a4803c6713
Remove unnecessary commented out code.
2015-07-05 21:30:13 +09:00
Neo Kim
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
Neo Kim
6264f7fefb
Correct include-related build errors in some platforms
2015-07-04 15:03:05 +09:00
Neo Kim
ceeca575f3
Replace 'margin' of scroll bar with 'positionFromCorner'
2015-07-04 14:05:47 +09:00
Neo Kim
f667b085b8
Change not to show scroll bar when the scroll view is initiated.
2015-07-04 09:59:22 +09:00
Neo Kim
9548d85f08
Fix radio button group clear issue
2015-07-04 09:57:54 +09:00
Neo Kim
3b6cd4dffc
Modify indentation to comply with the convention
2015-07-04 09:56:53 +09:00
Neo Kim
86cbd59bfd
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
2015-07-04 09:56:53 +09:00
Neo Kim
60c32f6fb5
Refactor some codes
2015-07-04 09:56:53 +09:00
Neo Kim
ec45be699d
Add UIScrollViewBar class documentation
2015-07-04 09:56:52 +09:00
Neo Kim
c093bb18e2
Add scroll bar manipulation methods into ScrollView
2015-07-04 09:56:52 +09:00
Neo Kim
9a11cfd496
Add a way of changing scroll bar width
2015-07-04 09:56:52 +09:00
Neo Kim
2cae17b462
Add scroll bar feature into ScrollView
2015-07-04 09:56:52 +09:00
CocosRobot
fbf98adc7a
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 14:48:11 +00:00
pandamicro
38ded61568
Merge pull request #12670 from yangws/issue_8256
...
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 22:34:54 +08:00
CocosRobot
91dc2d22de
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-03 10:37:33 +00:00
WenhaiLin
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
Vincent Yang
ca02f167c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-03 15:43:58 +08:00
Vincent Yang
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
pandamicro
f126eb3267
Merge pull request #12644 from WenhaiLin/v3-38-backevent-fix
...
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-03 15:42:45 +08:00
WenhaiLin
91bc8f2e2d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
2015-07-03 14:59:12 +08:00
pandamicro
1f48beee1e
Reorganize code
2015-07-03 12:55:55 +08:00
XiaoFeng
993e420ce4
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-03 11:30:38 +08:00
pandamicro
155b9b918c
Add retain/release for XMLHTTPReqest in JSB
2015-07-03 11:01:43 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro
e7aeb335a3
Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
...
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
pandamicro
ecf7148f85
Merge pull request #12624 from WenhaiLin/v3.8
...
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-02 18:47:44 +08:00
pandamicro
e7c6ae7b13
Merge pull request #12637 from super626/skybox
...
Set Texturecube tex parameter to clamp to edge
2015-07-02 18:34:38 +08:00
子龙山人
91a8872cbd
Merge pull request #12647 from xiaofeng11/v3.7-release
...
UISlider update
2015-07-02 18:01:38 +08:00
pandamicro
dbd72d0123
Merge pull request #12646 from VisualSJ/v3.7-release
...
[ci skip] Fixed a bug that is don't analytical frame
2015-07-02 17:22:13 +08:00
子龙山人
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
XiaoFeng
668dc50e07
Fix when slider set to disable mode then clean slider ball disable texture, normal texture won't show
2015-07-02 16:45:17 +08:00
WenhaiLin
a28ad6939d
Fixed EventListenerKeyboard.onKeyPressed not firing for back button on Android.
2015-07-02 16:19:33 +08:00
pandamicro
d155d42c0e
Merge pull request #12617 from yangws/issue_8194
...
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
Sijie.Wang
7818bfcc7a
Fixed a bug that is don't analytical frame
2015-07-02 14:30:44 +08:00
Neo Kim
61df7bc827
Add class documentation
2015-07-02 15:20:06 +09:00
Neo Kim
ec589c8d6f
Correct the wrong comment for lua
2015-07-02 15:19:50 +09:00
Neo Kim
0e35ee597a
Add logic for not belonging radio button checking.
2015-07-02 15:01:24 +09:00
pandamicro
079ccbb0e2
Merge pull request #12639 from VisualSJ/v3.7-release
...
Fixed a bug that is LayoutComponent position error
2015-07-02 13:58:15 +08:00
VisualSJ
a475caf35a
Fixed a bug that is LayoutComponent position error
2015-07-02 11:52:31 +08:00
Neo Kim
c4aa5a6274
Remove the code related to becoming parent node of radio buttons. Radio button group is not a parent node of radio buttons anymore.
2015-07-02 11:50:50 +09:00
Neo Kim
6550a9ccc2
Replace all tabs to 4 spaces to comply with the convention
2015-07-02 11:30:14 +09:00
XiaoFeng
9a905ede56
Fix check box front cross texture expand to normal size when change status between normal and disable frequency
2015-07-02 10:29:53 +08:00
Neo Kim
4b2bff4674
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
2015-07-02 11:28:14 +09:00
CocosRobot
bf3c970534
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-07-01 14:12:18 +00:00
pandamicro
3b9fd5502e
Fix cc.isArray for JSB
2015-07-01 21:57:39 +08:00
zhang
48c3466774
Update LayerEx.lua
2015-07-01 20:25:45 +08:00
pandamicro
a95edbfb65
Merge pull request #12618 from super626/clippingnode2
...
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
pandamicro
6b730b5fbd
Merge pull request #12619 from WenhaiLin/v3-37-labelfix
...
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 18:55:04 +08:00
songchengjiang
da5e077b55
texture set GL_CLAMP_TO_EDGE
2015-07-01 18:06:17 +08:00
Wenhai Lin
c06b5c5570
AudioEngine:Fixed play audio may fail when switch to new scene on iOS.
2015-07-01 17:19:28 +08:00
Vincent Yang
cb0e93fc08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-01 14:58:06 +08:00
WenhaiLin
322bd30d7b
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 14:57:01 +08:00
Vincent Yang
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
pandamicro
2774d6ff1d
Merge pull request #12602 from yangws/v3_scene3dtest
...
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
Vincent Yang
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
yangxiao
52daa2234c
add setForce2DQueue
2015-07-01 14:24:22 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
pandamicro
4d95c8778b
Merge pull request #12598 from shinhirota/v3
...
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-07-01 11:34:03 +08:00
Neo Kim
a64e50688e
Add the new files into CMake and Windows project configurations.
2015-07-01 12:21:42 +09:00
Vincent Yang
96b49277cc
[ci skip] add comment for UIWidget::_hittedByCamera.
2015-07-01 11:03:09 +08:00
Alex Peak
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
Alex Peak
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
Neo Kim
3f05ad2b98
Replace all tabs to 4 spaces to comply with the convention
2015-06-30 20:31:31 +09:00
Neo Kim
f5e7184f0b
Add new cpp files into Android.mk
2015-06-30 18:50:13 +09:00
Neo Kim
bed90606d3
Add RadioButton feature and a test case for it.
2015-06-30 18:50:13 +09:00
Neo Kim
a37015d083
To create radio button feature which uses almost same logic with CheckBox, extract the common logic from CheckBox and make it as AbstractCheckButton class.
2015-06-30 18:50:13 +09:00
子龙山人
40521ad1c4
Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
...
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
Bin Zhang
d0db3aee98
Remove the plugin-x related files from the Xcode project of js-bindings .
2015-06-30 17:28:47 +08:00
子龙山人
077241eecf
Merge pull request #12599 from jianglong0156/jsbProjectMerge
...
merge the jsb project into cocos2d project
2015-06-30 17:04:12 +08:00
Bin Zhang
bb77101f0b
Solve the error when building simulator for android.
2015-06-30 16:45:13 +08:00
子龙山人
d5d68223f1
Merge pull request #12604 from WenhaiLin/v3.8-audio-iosfix
...
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 16:30:05 +08:00
子龙山人
3b4d134050
Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
...
change the file encoding,
2015-06-30 16:29:44 +08:00
Wenhai Lin
e124593a5c
AudioEngine:Fixed play audio may fail(error code:-1) on iOS
2015-06-30 15:38:24 +08:00
jianglong0156
bc341edf1f
change the file encoding,
...
It display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
Vincent Yang
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
Jacky
25bac2f6a9
Fix SpriteBatchNode sort error.
2015-06-30 14:12:18 +08:00
jianglong0156
185b4419be
merge job project into cocos2d-x project
2015-06-30 13:49:24 +08:00
Shin Hirota
221d33a431
Fixed iOS/JS-Bind callStaticMethod() with bool arg
2015-06-30 14:00:28 +09:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
子龙山人
950cb840c2
Merge pull request #12582 from super626/listview
...
fix camera mask of listview
2015-06-30 10:25:57 +08:00
pandamicro
92c869f408
Merge pull request #12594 from MSOpenTech/v3-winrt-js-keyboard
...
V3 winrt js keyboard support
2015-06-30 07:24:17 +08:00
Dale Stammen
38b687f8d8
enable support for keyboard on winrt platforms to fix back button
2015-06-29 09:13:19 -07:00
Dale Stammen
7684c208e0
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:41:44 -07:00
Dale Stammen
eb668f63ce
unsupported cocos2d-x image formats removed or updated
2015-06-29 08:39:31 -07:00
pandamicro
15c763d84a
Update engine version
2015-06-29 18:21:06 +08:00
子龙山人
c997284825
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
...
Improve ui::Slider
2015-06-29 17:01:27 +08:00
yangxiao
a56a5d24b6
fix camera mask of listview
2015-06-29 14:41:03 +08:00
andyque
60834e6f0c
Merge branch 'v3' into v3-finish-android-9-patch-image-format
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-29 12:05:52 +08:00
andyque
30d2129f0c
improve indent and getTime function
2015-06-29 11:52:53 +08:00
zhang
43ea04da3c
fix onTouch begin don't return value
...
fix only receive "begin" envent,can't receive "moved" "ended"
2015-06-28 13:18:33 +08:00
pandamicro
c055028485
Merge pull request #12566 from jianglong0156/winrtMouse
...
Winrt mouse
2015-06-26 18:43:33 +08:00
pandamicro
88aeaa36f4
Merge pull request #12534 from super626/skybox
...
Skybox improvement
2015-06-26 17:05:17 +08:00
子龙山人
260d5035bb
Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix
...
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
2015-06-26 11:05:40 +08:00
Wenhai Lin
1875829ab4
[CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x
2015-06-26 10:16:52 +08:00
pandamicro
e9ee303445
Merge pull request #12547 from MSOpenTech/v3.7-winrt-audio
...
V3.7 winrt audio fix
2015-06-26 09:47:11 +08:00
pandamicro
4b34963329
Merge pull request #12537 from andyque/fix-v3.7-scrollView-dpi
...
use inch for childFocusCancelOffset in UIScrollView
2015-06-26 08:11:00 +08:00
kompjoefriek
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
Dale Stammen
61f4e280b4
Merge branch 'v3.7-release' into v3.7-winrt-audio
2015-06-25 12:46:20 -07:00
pandamicro
1ab369a70b
Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
...
Fix v3.7 cocosStudio percent position bug
2015-06-25 21:37:12 +08:00
pandamicro
3136bef9e3
Fix convertDistanceFromPointToInch logic (add x, y)
2015-06-25 21:34:00 +08:00
pandamicro
e29284374b
Fix convertDistanceFromPointToInch logic
2015-06-25 20:57:23 +08:00
pandamicro
0275b54b63
Merge pull request #12540 from samuele3hu/v3_7_test
...
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 18:49:43 +08:00
samuele3hu
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
jianglong0156
11ac928f59
winrt use touch event replace mouse event
2015-06-25 17:44:03 +08:00
jianglong0156
c60e9dfc9e
winrt not suppot mouse
2015-06-25 17:25:27 +08:00
andyque
d83f528327
use inch for childFocusCancelOffset in UIScrollView
2015-06-25 16:57:00 +08:00
andyque
0c1ee8b26a
fix studio json reader percentage mode bug
2015-06-25 16:14:22 +08:00
yangxiao
f4a81f0e53
optimize draw
2015-06-25 15:14:44 +08:00
yangxiao
13dbd44250
remove unused variable
2015-06-25 15:05:21 +08:00
yangxiao
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
pandamicro
ac3f2f235b
Merge pull request #12523 from andyque/fix-linux-audio-engine-crash
...
add guard to audio engine pointer
2015-06-25 11:48:23 +08:00
子龙山人
f545794b56
Merge pull request #12525 from WenhaiLin/v3-37-warnfix
...
[ci skip]Fixed warns
2015-06-25 11:02:02 +08:00
WenhaiLin
3cb29bbc65
[ci skip]Fixed warns
2015-06-25 10:53:41 +08:00
andyque
2bb7b96839
add guard to audio engine pointer
2015-06-25 10:17:31 +08:00
anniruddh
e89a6c1651
fixed issue #160
2015-06-24 17:50:11 -07:00
pandamicro
19c57daf92
Merge pull request #12511 from samuele3hu/v3_7_test
...
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 21:46:38 +08:00
pandamicro
f9db471026
Merge pull request #12495 from super626/v3
...
Fix terrain getIntersectionPoint
2015-06-24 18:36:52 +08:00
samuele3hu
63eb0d34f3
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 16:11:36 +08:00
pandamicro
49e783820e
Merge pull request #12507 from dabingnn/v3_fixClearColor
...
fix clearcolor bug which has no effect
2015-06-24 15:58:53 +08:00
yangxiao
77f1af91f9
opt getIntersectionPoint
2015-06-24 15:49:09 +08:00
yangxiao
086b01321c
code simplify
2015-06-24 14:10:38 +08:00
Huabing.Xu
ecfe35489c
fix clearcolor bug which has no effect
2015-06-24 11:40:23 +08:00
yangxiao
7546bfe9af
make getChunkByIndex protected
2015-06-24 10:56:46 +08:00
yangxiao
d1baacdf8a
fix terrain ray trace
2015-06-24 10:49:18 +08:00
pandamicro
04af5dfbe3
#12494 Upgrade platform constants for WP8 & WINRT
2015-06-23 23:23:25 +08:00
pandamicro
e574c38a6b
Merge pull request #12496 from WenhaiLin/v3-tagetplatform-fix
...
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 22:26:54 +08:00
Namezero
dec49a8b11
Circle shape debug draw bug
...
Circle shape debug draw didn't draw properly when rotated
2015-06-23 15:50:42 +02:00
pandamicro
72fde7efb8
Merge pull request #12500 from jianglong0156/webviewHide
...
fix the bug:webview can not display
2015-06-23 21:11:33 +08:00
pandamicro
cc00cbedbe
Merge pull request #12482 from yangws/fixbug_20214
...
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of…
2015-06-23 21:09:59 +08:00
江龙
7ff383e4d2
add the return value
2015-06-23 20:27:30 +08:00
pandamicro
29840df88e
Fix indent of Audio.cpp
2015-06-23 20:08:00 +08:00
pandamicro
1d4a496aaa
Merge pull request #12472 from MSOpenTech/v3-winrt-audio
...
V3: WinRT Fix for issue 12448 cpp-tests[ win8.1-universal--window 8.1]:Audio - CocosDenshion:Crash
2015-06-23 20:01:18 +08:00
pandamicro
32accbf21b
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
...
Fixed Application may be created more than once on Android.
2015-06-23 19:43:39 +08:00
WenhaiLin
ed029d264f
Fixed cannot differentiate between Windows Phone Application and Windows Store Application by `Application::getTargetPlatform`
2015-06-23 18:40:39 +08:00
yangxiao
bfdb06e31b
add empty line
2015-06-23 18:31:20 +08:00
yangxiao
c3593c9d64
merge cocos
2015-06-23 18:29:39 +08:00
pandamicro
60372056ce
Merge pull request #12484 from andyque/fix-nine-patch-image-error
...
fix nine patch image parser error on Windows.
2015-06-23 18:26:16 +08:00
yangxiao
251c81d7be
Merge branch 'newcode' into v3
2015-06-23 18:25:41 +08:00
pandamicro
2a0c2b6e32
Merge pull request #12250 from hawkwood/patch-10
...
Fails if file does not exist
2015-06-23 17:32:47 +08:00
WenhaiLin
f95245312a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 17:08:25 +08:00
pandamicro
4c7f33e66f
Merge pull request #12481 from jianglong0156/restartGameBug
...
fix Restart game bug
2015-06-23 17:02:09 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
XiaoYang
59e6b6fdc2
Merge pull request #352 from tangziwen/v3
...
Using ray-triangle intersect test instead of the newton method
2015-06-23 16:30:18 +08:00
pandamicro
ac138a3287
Merge pull request #12474 from xiaofeng11/v3_xiaofeng
...
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
2015-06-23 16:27:32 +08:00
XiaoFeng
befe97a78b
Update js parser for compatible with CocosStudio 2.3.2 json format export
2015-06-23 16:24:53 +08:00
tangziwen
5b857f7d66
fix some bug
2015-06-23 16:11:00 +08:00
andyque
7fff2bd3c4
fix nine patch image parser error on Windows.
2015-06-23 15:42:58 +08:00
子龙山人
fca9b89a4c
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
...
fix rapidjson assert error
2015-06-23 15:34:47 +08:00
pandamicro
f617d6f1aa
Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix
...
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 15:27:43 +08:00
Vincent Yang
4b768c5fd8
fixbug: cpp-test -> NewRenderer (drag the layer to test the result of culling), some object will be culling before out of screen.
2015-06-23 15:22:27 +08:00
jianglong0156
90f9bf37cd
fix redmine issue #20277 RestartGameTest only used in native will crash
2015-06-23 14:41:41 +08:00
tangziwen
1e016dc6d8
Always get the minimum distance intersect point.
2015-06-23 14:41:20 +08:00
tangziwen
f71ca4f179
Using ray-triangle intersect test instead of the newton method
2015-06-23 14:27:19 +08:00
andyque
70b709f4a8
fix rapidjson assert error
2015-06-23 13:54:11 +08:00
WenhaiLin
79aa300448
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0
2015-06-23 13:42:32 +08:00
WenhaiLin
b275ce2283
Label:Fixed IllegalArgumentException on Android 2.3.x
2015-06-23 13:38:06 +08:00
pandamicro
9445aeacb7
Merge pull request #12456 from super626/camera
...
quaternion instead of euler angle
2015-06-23 13:16:39 +08:00
XiaoFeng
375e80bd70
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
...
Update easing default speed
2015-06-23 11:31:16 +08:00
子龙山人
6bd61a3a5f
Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix
...
Label should be invisible when the line height is set to zero.
2015-06-23 11:02:48 +08:00
WenhaiLin
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
Neo Kim
9757be0f81
Remove debugging logs
2015-06-22 14:49:30 +09:00
Neo Kim
71c98da2aa
Apply ease out action on inertia scroll
2015-06-22 14:30:45 +09:00
Neo Kim
c4fa99444c
Simplify the inertia scroll implementation
2015-06-22 14:30:36 +09:00
Neo Kim
c70c923674
Separate the inertia scroll from auto scroll. And implement auto scroll and bounce back as one logic. The bounce back movement is one of auto scroll feature.
2015-06-22 14:30:30 +09:00
Neo Kim
7422b20da9
Refactor some functions
2015-06-22 14:27:19 +09:00
Neo Kim
85fc5b3f89
Change to comply to Cocos2d-x convention
2015-06-22 14:27:11 +09:00
Neo Kim
6c212a7ddb
Replace the existing bounce back feature with another one like iOS bounce-back. The inner container moves smoother when bouncing back.
...
It does what the existing code did including scroll event dispatching and attenuating.
2015-06-22 14:27:00 +09:00
Neo Kim
1058ab9172
Add necessary member variables and methods
2015-06-22 14:26:51 +09:00
Neo Kim
a8f77710f5
Refactor some functions and remove redundant codes
2015-06-22 14:10:25 +09:00
Neo Kim
876c94f352
Remove the boundary of bouncing and apply half-movement when out of boundary like iOS bounce back.
2015-06-22 14:05:53 +09:00
Neo Kim
ff3f990142
Add isOutOfBoundary() functions
2015-06-22 14:05:53 +09:00
Neo Kim
c3c6eeb6c1
Refactor some functions
2015-06-22 14:05:52 +09:00
Neo Kim
a3ff9573b0
Remove duplicated logic in bounceScrollChildren()
2015-06-22 14:05:51 +09:00
Neo Kim
1971b01280
Make the event dispatch functions into one function after removing duplicated logic.
2015-06-22 14:05:50 +09:00
Neo Kim
31bf9f714d
Merge bouncing and non-bouncing logics as one.
2015-06-22 14:05:50 +09:00
Neo Kim
6a0609a687
Merge the logics for bouncing of VERTICAL, HORIZONTAL and BOTH in one function. VERTICAL and HORIZONTAL can be processed as BOTH.
2015-06-22 14:05:49 +09:00
Neo Kim
368b5e8f12
Remove duplicated logics in scrollChildrenBoth(), and extract meaningful logic into separate functions.
2015-06-22 14:05:49 +09:00
Anniruddh
4a15d57093
Fixed issue #168
2015-06-20 00:20:15 -07:00
yangxiao
d252250968
quaternion instead of euler angle
2015-06-19 18:46:14 +08:00
andyque
55b86b2e14
add more docs for samsung enhanced API
2015-06-19 18:09:42 +08:00
子龙山人
8ca0f18575
Merge pull request #12446 from pandamicro/v3
...
Add auto bindings for navmesh
2015-06-19 17:21:00 +08:00
子龙山人
869e3c5243
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
...
Label:Fixed line wrap error without space.
2015-06-19 15:08:13 +08:00
pandamicro
7b1694bfeb
Merge pull request #12443 from VisualSJ/v3-aa
...
[ci skip]Studio parser: Code for defense
2015-06-19 14:24:39 +08:00
WenhaiLin
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
VisualSJ
8fa755d0e4
Studio parser: Code for defense
2015-06-19 13:15:10 +08:00
VisualSJ
ea0ab5c738
Studio parser: Code for defense
2015-06-19 11:13:07 +08:00
pandamicro
8e9fed936c
Add auto bindings
2015-06-19 10:36:36 +08:00
pandamicro
276ce3a0a7
Update versions
2015-06-19 09:56:19 +08:00
pandamicro
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +08:00
pandamicro
f405d00336
Fix linux compilation
2015-06-19 01:14:16 +08:00
江龙
91bc19fb29
Merge branch 'v3_origin' into navmesh
...
Conflicts:
tests/js-tests/src/Physics3DTest/Physics3DTest.js
2015-06-18 23:50:19 +08:00
江龙
8fc5835dee
modify linux file
2015-06-18 23:29:04 +08:00
江龙
61db9ef103
modify cocos2d_specifics , add navmesh head file。 modify template。add navmesh head file and register code
2015-06-18 23:21:53 +08:00
江龙
8c97fec5af
add navmesh project file path
2015-06-18 23:17:49 +08:00
jianglong0156
618d8f01e8
Merge pull request #9 from pandamicro/navmesh
...
Improve bindings for navmesh
2015-06-18 23:15:05 +08:00
pandamicro
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08:00
jianglong0156
56382aae37
winphone project
2015-06-18 22:50:24 +08:00
CocosRobot
ea2ec582f0
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 14:05:05 +00:00
Bin Zhang
a4ecfdb7e2
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 22:00:57 +08:00
CocosRobot
e2268bb16f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:57 +08:00
WenhaiLin
e2f834e96b
Fixed warn
2015-06-18 22:00:56 +08:00
CocosRobot
c069da629e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 22:00:56 +08:00
Huabing.Xu
b17702e6f1
fix compile error for linux
2015-06-18 22:00:55 +08:00
pandamicro
cd7252014a
Merge pull request #12432 from pandamicro/v3
...
Change physics3d api to jsb namespace
2015-06-18 21:53:39 +08:00
pandamicro
e09ba8080f
Fix create Sprite with PolygonInfo issue
2015-06-18 21:48:57 +08:00
jianglong0156
05c40b13f9
fix the win32 head error
2015-06-18 21:30:30 +08:00
pandamicro
10a8adad53
Change physics3d api to jsb namespace
2015-06-18 20:39:40 +08:00
pandamicro
491d89baec
Merge pull request #12429 from natural-law/v3
...
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 20:28:52 +08:00
jianglong0156
e0b66707f9
add nerviest android file
2015-06-18 19:30:05 +08:00
jianglong0156
4fe1542d17
add navmesh tests
2015-06-18 19:22:27 +08:00
Bin Zhang
d288b13957
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
2015-06-18 17:22:30 +08:00
CocosRobot
6e849a158d
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 08:18:00 +00:00
pandamicro
aa566a3722
Merge pull request #12424 from pandamicro/physics3d
...
Fix Physics3D test and js bindings
2015-06-18 16:09:49 +08:00
pandamicro
4d588c7837
Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
...
Fixed warn
2015-06-18 15:09:36 +08:00
jianglong0156
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
XiaoYang
96bb244d69
Merge pull request #351 from tangziwen/v3
...
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 14:47:49 +08:00
pandamicro
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
WenhaiLin
05522afaa1
Fixed warn
2015-06-18 14:24:52 +08:00
CocosRobot
b76db94725
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-06-18 05:43:02 +00:00
tangziwen
1989de7a04
fix terraintest and Terrain::getInstersectionPoint()
2015-06-18 12:20:44 +08:00
pandamicro
7952477469
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d
2015-06-18 12:05:01 +08:00
Huabing.Xu
92824537ac
fix compile error for linux
2015-06-18 11:15:45 +08:00
Vincent Yang
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
Vincent Yang
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
pandamicro
3ffc0e6be6
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
2015-06-18 09:20:37 +08:00
Dale Stammen
fd0605416e
moved clipper files to external/clipper filter in VS solution
2015-06-17 11:48:56 -07:00