ab0e461b00
Merge pull request #15852 from MSOpenTech/v3-winrt-x64
...
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
d8bd0ff8c8
Merge pull request #15855 from mogemimi/fix-possible-leak
...
Fix possible memory leak when pass initialization fails
2016-06-16 11:04:03 +08:00
1df89de065
Merge pull request #15856 from CocosRobot/update_lua_bindings_1466045768
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 11:02:18 +08:00
cc2b887dbb
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 02:58:46 +00:00
b0f3d43414
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
...
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
4f329d8aac
Fix possible memory leak when pass initialization fails
2016-06-16 04:52:38 +09:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
fc44d0deed
Merge pull request #15850 from minggo/hide-virtual-button
...
[ci skip]hide virtual button correctly
2016-06-15 18:38:59 +08:00
7bf13f34cd
hide virtual button correctly
2016-06-15 18:33:52 +08:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
8c9019b128
Merge pull request #15848 from minggo/hide-virtual-button
...
[ci skip]hide virtual button if has focus
2016-06-15 18:20:53 +08:00
d94dc7edc0
hide virtual button if has focus
2016-06-15 18:19:06 +08:00
3807a2f678
Merge pull request #15847 from minggo/hide-virtual-button
...
[ci skip]hide virtual button by default
2016-06-15 18:08:00 +08:00
a8c6011f66
use android sdk 19
2016-06-15 18:06:53 +08:00
8634773be3
hide virtual button by default
2016-06-15 17:55:26 +08:00
d7b495c3d1
Merge pull request #15838 from MagicXrEv/rename-end-functions
...
lua binding : Rename end() to endToLua().
2016-06-15 16:24:34 +08:00
a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
dd6fed7928
Fixed ClippingNode not cleaning up _stencil correctly ( #15814 )
...
* Fixed ClippingNode not cleaning up _stencil correctly
_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.
* Added onEnterXXX to ClippingNode::setStencil()
ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
2016-06-15 14:55:29 +08:00
925e938724
Merge pull request #15839 from Shulepov/refactor_and_cleanup_RootViewController
...
Cleanup and refactor RootViewController
2016-06-15 14:17:05 +08:00
4f49f4e8ee
Merge pull request #15843 from CocosRobot/update_lua_bindings_1465958826
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-15 11:19:57 +08:00
26dde1ef23
Merge pull request #15842 from CocosRobot/update_cocosfiles_1465958734
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-15 11:19:47 +08:00
7c4b7e1bf1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-15 02:49:50 +00:00
77e71fa638
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-15 02:45:36 +00:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
2cd7850427
Cleanup and refactor RootViewController
2016-06-14 19:55:31 +03:00
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
fd3b6d4706
Merge pull request #15832 from mogemimi/remove-dup-includes
...
Remove duplicate header includes in cocos2d.h
2016-06-14 16:10:14 +08:00
7d6d677983
RenderTexture - set opacity modify RGB
2016-06-13 23:07:17 +03:00
10418676ca
Remove duplicate header includes in cocos2d.h
2016-06-13 19:11:05 +09:00
da2ea7e08b
Merge pull request #15794 from TheCodez/cachetexture
...
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
2016-06-13 17:31:12 +08:00
109f572bf6
Merge pull request #15807 from mogemimi/add-switch-default-case
...
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-12 10:37:05 +08:00
84de5b0cf0
Merge pull request #15811 from mogemimi/fix-method-name
...
Fix typo in method name: 'destory' -> 'destroy'
2016-06-12 10:35:55 +08:00
cf2bfdfc4c
Merge pull request #15822 from mogemimi/fix-test-case
...
Fix assertion failure when running Sprite Test
2016-06-12 10:29:09 +08:00
72dfa63294
Fix assertion failure when running Sprite Test
2016-06-12 03:45:38 +09:00
07e0c1cbf9
Fix typo in method name: 'destory' -> 'destroy'
2016-06-09 09:25:06 +09:00
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
98bee7e12a
remove unneeded test case and fix resource missing ( #15804 )
...
* remove unneeded test case and fix resource missing
* remove unneeded test case
2016-06-08 13:36:36 +08:00
363beb436d
Merge pull request #15790 from dumganhar/profiling-fix
...
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-08 10:55:54 +08:00
70000bcc84
Refine cpp template for iOS ( #15792 )
...
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.
* Added offsetX and offsetY parameters in Follow::clone() method.
* Added test case for follow action with offset.
* Made changes to the test case on follow action with offset.
* Added new createWithOffset function to create a follow action with offset.
* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.
* Refined the code for creating follow action with offsets.
* Modified test case for follow with offset as per updated create method.
* Code refined in createWithOffset method of follow action.
* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
2016-06-08 10:55:02 +08:00
376d21d253
Avoid shadow warning when building with Xcode 7.3 ( #15795 )
2016-06-08 10:25:34 +08:00
3b8aec6656
Merge pull request #15797 from minggo/issue-15709
...
edit box support LOWERCASE_ALL_CHARACTERS
2016-06-08 10:03:39 +08:00
93d87ad19e
android supports LOWERCASE_ALL_CHARACTERS
2016-06-07 12:41:22 +08:00
7e1da2188c
ios supports LOWERCASE_ALL_CHARACTERS
2016-06-07 10:31:16 +08:00
7885f55ce5
Cache bas64 images
2016-06-06 16:32:50 +02:00
4f2b4559b6
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-06 16:25:00 +08:00
3b4f2c38dd
Merge pull request #15788 from minggo/editbox-capital-issue
...
[ci skip]not use capital letters by default
2016-06-06 14:00:32 +08:00
7e2f79ce8f
not use capital letters by default
2016-06-06 13:55:20 +08:00
21ab86b5fe
iOS: ARC support #12518 ( #13937 )
...
* iOS: ARC support #12518
* Use @autoreleasepool with and without ARC
* Missed release for _viewController
2016-06-06 13:48:02 +08:00
264bf87c87
Merge pull request #15784 from mogemimi/fix-unused-param
...
Fix unused parameter warning when compiling CCArray
2016-06-06 10:13:28 +08:00
097eebdb50
Testcase for CCS 1.6 animations with only one frame ( #15714 )
...
* Testcase for CCS 1.6 animations with only one frame
* Removed extra comma
* Removed conflict garbage
* Removed old code
* Create new Test section Cocos Studio > Issues
* update ccs-res submodule
* Fixed Back button visibility
2016-06-06 09:32:33 +08:00
minggo