CocosRobot
c3693b8948
[AUTO][ci skip]: updating cocos2dx_files.json
2015-07-01 09:22:38 +00:00
子龙山人
1f90b87fa4
Merge pull request #12623 from andyque/fix-mac-32bit-tiff-include
...
[ci skip]fix tiff 32bit include error in mac
2015-07-01 17:20:05 +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
andyque
df421f7734
fix tiff 32bit include error in mac
2015-07-01 17:18:19 +08:00
pandamicro
012b0b7083
Merge pull request #12612 from jianglong0156/callStaticMethodWithBool
...
Call static method with bool add testcase
2015-07-01 17:10:23 +08:00
pandamicro
48cc900198
Merge pull request #12622 from natural-law/framework
...
Add link libs config in simulator project for framework.
2015-07-01 17:03:46 +08:00
Bin Zhang
d0fc1e9d34
Add link libs config in simulator project for framework.
2015-07-01 15:31:03 +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
dc6e966501
[ci skip] remove a unnecessary CCLOG info.
2015-07-01 14:55:31 +08:00
yangxiao
d35bf2305f
add clipping test
2015-07-01 14:48:37 +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
Neo Kim
00e360f438
Add the missing file into CMake and Windows project configurations.
2015-07-01 15:36:53 +09: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
168d56ff98
Merge pull request #12610 from natural-law/v3.7-release
...
Remove the plugin-x related files from the Xcode project of js-bindings.
2015-07-01 12:48:30 +08:00
jianglong0156
b05b481b1c
Merge branch 'v3' into callStaticMethodWithBool
2015-07-01 11:46:26 +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
andyque
53817618b7
finish template daily build.
...
1. daily build doesn't clean when build finished.
2. add options to template daily build
2015-07-01 11:24:46 +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
jianglong0156
9e9625feca
add bool parm in android
2015-07-01 10:57:43 +08:00
jianglong0156
2ef2016c39
add call reflection with bool test case
2015-07-01 10:41:24 +08:00
jianglong0156
d6c039f528
Merge branch 'v3' of https://github.com/shinhirota/cocos2d-x into callStaticMethodWithBool
2015-07-01 10:30:13 +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
子龙山人
d65900ea3d
Merge pull request #12606 from natural-law/v3.7-release
...
Optimize the implementation of framework-compile tools & simulator project.
2015-07-01 09:32:43 +08: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
0726b2be9c
Generate prebuilt Android.mk when compiling prebuilt libs for android.
2015-06-30 16:53:11 +08:00
Bin Zhang
78c5f2e77e
Build simulator project when generating prebuilt libs for android.
2015-06-30 16:45:55 +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
jianglong0156
1f4e65e401
Merge pull request #10 from andyque/testMergeJSB
...
update daily build and pr build
2015-06-30 16:26:57 +08:00
andyque
a6451c6c5e
update daily build and pr build
2015-06-30 16:24:03 +08:00
Bin Zhang
9b45a9ee6f
Add preprocessor CC_ENABLE_BULLET_INTEGRATION=1 in simulator.
2015-06-30 16:14:25 +08:00
Bin Zhang
a6a1cbdfbe
Solve the error config of js runtime template.
2015-06-30 16:03:39 +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
329aab4a7a
delete invalid project file
2015-06-30 13:52:00 +08:00