a46b30f8a6
use more plain API FileUtils::getStringFromFile ( #16586 )
2016-09-19 11:49:35 +08:00
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
5f4fb66f61
fix: staggered hex maps returns correct tile ( #16552 )
...
* fix: staggered hex maps returns correct tile
order was fixed in the array that contains the GIDs.
fixes Github issue #16512
* fix: add fix validation code for issue #16512
2016-09-13 21:47:36 -07:00
74fd5ae3ba
Fix mismatched memory deallocator ( #16560 )
2016-09-12 10:02:48 +08:00
16781b00e8
change EaseBounce to real class instead of typedef ( #16557 )
2016-09-12 09:51:27 +08:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
eca7b2392d
Remove unnecessary inline keywords ( #16562 )
2016-09-12 09:44:21 +08:00
86de22a008
fix crash if FontAtlas pointer is the same ( #16555 )
2016-09-09 11:39:00 +08:00
1c27c12327
updated libcocos2d dll version to 3.13.1 ( #16542 )
2016-09-08 10:38:16 +08:00
fa15ab8212
3.13.1 text color ( #16516 )
...
* fix: Label updateColor() and underline color work as expected (#16486 )
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* fix conflict
* Issue 16471 (#16489 )
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-07 09:44:58 +08:00
b48bcc9579
Ease Actions Code De-Duplication
...
* ease action class macros to reduce code duplication
- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type
* Add note and minor cleanup
* use create in clone instead of new/init as in latest EaseBezierAction
* fix reverse for EaseIn/Out to match original code
* add assert for null
* refactor to match original code flow
* fix missing CC_DLL for windows builds
* fix win build issues due to abstract methods
* remove unused overrides
2016-09-05 10:18:30 +08:00
857b2143a6
Remove deprecated attribute on Node::_setLocalZOrder() function ( #16470 )
2016-09-05 10:06:42 +08:00
0cd365dd2e
Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage ( #16482 )
2016-09-02 09:51:47 +08:00
c32000250c
Issue 16471 ( #16489 )
...
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
e57c30c83b
fix: Label updateColor() and underline color work as expected ( #16486 )
...
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
2016-08-31 20:20:13 -07:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
a9898b9875
possible memory leak when font size is 0 ( #16424 )
2016-08-24 18:27:44 -07:00
e62af99db7
Fixed Camera::_viewProjectionUpdated state ( #16405 )
...
Camera::_viewProjectionUpdated is not initialised in constructor. Should be initialised to false.
This can lead to redundant visibility checks if _viewProjectionUpdated happens to resolve true.
As Camera::visit() is never called, _viewProjectionUpdated is never actually updated, resulting in no visibility tests when the camera transform changes.
Fixes #16404
2016-08-24 18:15:19 +08:00
4d801ba1d0
#Fix use const std::string& instead a temp string ( #16392 )
...
* #Fix use const std::string& instead a temp string
* #Fix use const std::string& instead a temp string
2016-08-22 09:43:41 +08:00
7afde8c7a6
Remove unnecessary ActionInterval casts ( #16402 )
2016-08-22 09:39:58 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
b1a64ae730
new actions ResizeBy and ResizeTo ( #16275 )
...
* new actions ResizeBy and ResizeTo
* FDP-5580-ResizeBy and ResizeTo fix and Test cpp : added a scale exemple in the test cpp to compare with our new resize + fix
* FDP-5580: actions ResizeBy and ResizeTo : changed some functions visibility
2016-08-16 16:55:31 +08:00
1edaf7e122
Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. ( #16353 )
2016-08-15 14:10:13 +08:00
02de525cbd
deprecates CCProgressTimer::setReverseProgress() ( #16341 )
...
use CCProgressTimer::setReverseDirection() instead.
fixes github issue #14678
2016-08-15 14:08:42 +08:00
b837dd7a20
Avoid unnecessary allocation if targetGrid is reusable ( #16343 )
2016-08-15 14:07:37 +08:00
3bc662ea7b
fix: not resize textureatlas multiple times on Label::create() ( #16358 )
...
since we know the size before allocating it, just reserve
the needed capacity once.
fixes github issue #16293
2016-08-13 09:38:42 -07:00
0e65025bda
Revert "Match parent's camera mask when adding child." ( #16324 )
2016-08-05 17:28:05 +08:00
abb97b1b71
don't set camera the same as its parent by default ( #16325 )
2016-08-05 17:26:27 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
73f80f4c73
#Make etc1 alpha support ok for ProgressTimer ( #16296 )
...
* #Make etc1 alpha support ok for ProgressTimer
* #fix issues
* Add comment
2016-08-03 14:29:34 +08:00
ba51370e43
use correct shader ( #16295 )
2016-08-03 10:56:12 +08:00
a2adfaf7df
#Improve node sort performance for 64-bit by std::sort + long long (_localZOrder) ( #16262 )
...
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)
* Use bit field for make _localZOrder storage more clearly.
* #Comment _localZOrder members for meaningful.
* fix issues
* #use explicit bits integer of localZOrder storage
* #Fix compile error, add include <cstdint> to CCNode.h
* use the optimization for 64bit and no optimization solution for 32bit
* Use the optimization for 64bit and no optimization solution for 32bit
* #Improve node sort performance 64-bit by std::sort + long long (_localZOrder)
* fix issues
* test case
* Revert "test case"
This reverts commit 85471d07a433f2b7f0265c3b7dd483fcc28e3e2f.
* fix issues
* use lambda, and any other sort issues.
* skip sotNodes
* fix compile error
* fix compile issue
2016-07-31 22:44:24 +08:00
9cca6eb685
#bug fix etc1 alpha builtin support Sprite ( #16278 )
...
see: https://github.com/cocos2d/cocos2d-x/pull/16118
2016-07-31 22:30:03 +08:00
88eb533f9d
Revert "#improve node sort performance by std::sort + long long (_localZOrder) for 64-bit" ( #16260 )
2016-07-29 10:58:31 +08:00
66fac82f00
fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 ( #16214 )
...
* fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12
* fixed #16169 : Adds comments for why we should not use `assignment operator` of `std::u16string`.
2016-07-28 11:19:22 +08:00
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
3a14388087
#improve node sort performance by std::sort + long long (_localZOrder) ( #16126 )
...
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)
* Use bit field for make _localZOrder storage more clearly.
* #Comment _localZOrder members for meaningful.
* fix issues
* #use explicit bits integer of localZOrder storage
* #Fix compile error, add include <cstdint> to CCNode.h
* use the optimization for 64bit and no optimization solution for 32bit
2016-07-27 16:58:51 +08:00
1a1241c3fc
Merge pull request #16221 from Microsoft/winrt-v3.13
...
WinRT: update libcocos2d version to v3.13
2016-07-27 15:36:43 +08:00
4e278183ad
Merge pull request #16122 from ricardoquesada/issue_16100
...
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
b336aa3219
testcase: add test case for issue #16100
...
delays camera creation
fix issue #16100
2016-07-26 19:03:54 -07:00
d5809129c4
update libcocos2d version to v3.13
2016-07-26 12:34:36 -07:00
bf80f10dfd
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 00:55:32 +08:00
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
35cea378a9
Merge pull request #16172 from cezheng/fix/label_text_formatter_right_alignment
...
fix label text formatter right alignment
2016-07-21 15:21:12 +08:00
35b848e842
fix label text formatter right alignment
2016-07-20 18:08:15 +09:00
b3218c1e58
fix: stagger tilemaps hexa works as expected
...
Github issue #16105
2016-07-19 22:55:05 -07:00
d931c62649
Fix typos in documentation comments
2016-07-16 04:18:40 +09:00
1563d14447
Squashed commit of the following:
...
commit c8349caeca6ff5ebacf497eaa986e71d5f1c2c0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 14 11:19:50 2016 -0700
fix: works with odd sized maps
commit da4cf8bc19c9cdab148d60e03a25ee9cc4292b66
Author: zhangbin <zhangbin@cocos2d-x.org>
Date: Wed Jul 13 13:45:57 2016 +0800
Add test case.
2016-07-14 11:21:24 -07:00
261f1ef780
Merge pull request #16094 from stevetranby/patch-1
...
Match parent's camera mask when adding child.
2016-07-13 16:33:17 +08:00
cf18857206
fix crash in EaseExponentialOut::clone()
2016-07-13 14:28:04 +09:00
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
c0e0931838
fix, replace std::sort by std::stable_sort ( #16092 )
...
* fix, replace std::sort by std::stable_sort
2016-07-12 13:46:38 +08:00
f162ffe2ae
Match parent's camera mask when adding child.
2016-07-12 00:07:41 -05:00
3d5789ee77
Merge pull request #16077 from mogemimi/fix-documentation-comments
...
Fix documentation when compile with -Wdocumentation and Clang
2016-07-11 15:49:28 +08:00
9c7d44ccd7
Merge pull request #16080 from minggo/use-std_abs
...
use std::abs instead
2016-07-11 12:02:10 +08:00
2ca1760b78
Merge pull request #16079 from minggo/use-std_srand
...
use std::srand() instead
2016-07-11 12:01:38 +08:00
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
a146f3eec7
use std::srand() instead
2016-07-11 11:17:28 +08:00
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
6d5a94e569
test: add test case for Github issue #12226
...
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
2610ad77cc
#15965 : remove unused _orderOfArrival ( #16009 )
2016-07-01 10:09:25 +08:00
b1f93b2679
fix: not leak Toggle items
...
Github issue: fixes #13351
2016-06-28 20:41:47 -07:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
0c290540df
Merge pull request #9823 from ericmux/frame-independent-ms
...
Making CCMotionStreak _maxPoints framerate independent.
2016-06-28 18:29:14 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
2a853ba73e
Avoid const_cast when calling Node::setAdditionalTransform
2016-06-27 19:33:45 +09:00
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
ee7ceee007
Merge pull request #15874 from mogemimi/fix-unused-variable
...
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
a31279f8cb
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:28:58 -07:00
edafe726cc
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:22:47 -07:00
09d5fd3f90
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 16:54:57 +08:00
9d0801834e
Merge pull request #15893 from halx99/patch-1
...
Optimize, avoid unnecessary memory alloc & copy
2016-06-22 13:44:40 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
414f1d4252
fix: little menu fixes
...
does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
2016-06-21 16:46:27 -07:00
654d17d27c
Update CCFontFNT.cpp
2016-06-21 11:25:11 +08:00
51ba45ae26
Optimize, avoid unnecessary memory alloc & copy
2016-06-21 10:52:25 +08:00
ca677f2be1
fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
...
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.
Github issue #14730
2016-06-20 19:13:53 -07:00
f0028e5459
Fix unused variable warnings when compiling release mode
2016-06-20 09:23:42 +09:00
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
0db0a45fa0
Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
...
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
f0f8663fa9
fix TTF and BMFont word wrap
2016-06-16 14:15:00 +08:00
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
b0f3d43414
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
...
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
9e40fffb13
fix: remove liboculus
2016-06-15 17:53:01 -07:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07: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
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
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
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
7d6d677983
RenderTexture - set opacity modify RGB
2016-06-13 23:07:17 +03:00
4f2b4559b6
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-06 16:25:00 +08:00
bd00b2f261
Fix unused parameter warning
2016-06-02 15:30:24 +09:00
3521e605f8
Merge pull request #15723 from urokuta/issue-9367
...
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
785d02a818
#9367 blend mode does not work with animated sprite
2016-05-26 09:39:48 +09:00
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
906967c53a
fix: make it compile on iOS and Mac
2016-05-25 20:00:48 -03:00
26781ee592
fixed array overrun in triangulate()
2016-05-25 10:14:09 -07:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
5caea3a197
Merge pull request #15692 from mogemimi/prevent-c4996-warning
...
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
ad3c305172
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-22 07:05:35 +09:00
36113f507e
add comments for ps.
2016-05-18 22:25:43 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
03b38bcee2
Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522
2016-05-05 10:17:17 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
f2e5eb332a
Merge pull request #15546 from minggo/issue_15526
...
fix memory leak
2016-05-03 14:02:38 +08:00
fba4bead70
fix memory leak
2016-05-03 11:24:22 +08:00
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
d8d6e55756
Fix clipping node memory management issue
2016-04-28 15:14:03 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
c8e2dc83d1
Merge pull request #15498 from ynaoto/v3
...
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
d42cb71a27
Warn if fontDef.charID exceeds 16bits.
2016-04-25 01:02:50 +09:00
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
16c7a594c8
Merge pull request #14005 from wighawag/draw_node_shader_fix
...
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
2c75a4cf39
Merge pull request #15480 from mogemimi/remove-unary-operator
...
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
7de8f761d0
Merge pull request #14123 from jgod/patch-2
...
Check that textureAtlas isn't null before removing quads in SpriteBatchNode
2016-04-21 14:44:32 +08:00
de3dac7664
Merge pull request #14090 from SongCF/v3
...
issues #14050 ActionManager memory leak
2016-04-21 14:09:52 +08:00
eae7ec40ef
Remove incorrect unary operator to fix warnings
2016-04-21 14:39:42 +09:00
481c55adb2
Merge pull request #15466 from wefiends/spriteframe-clone
...
Copy polygonInfo when cloning SpriteFrame
2016-04-21 09:49:00 +08:00
b0ae128ec3
Merge pull request #15066 from TheCodez/patch-2
...
setPhysicsBody can be called multiple times again
2016-04-21 09:40:28 +08:00
afdd600045
Fix setPhysicsBody method
2016-04-20 11:46:10 +02:00
4c7e4671d9
Modified the layer follow action class to include a horizontal (x) and vertical (y) offset. ( #15194 )
2016-04-20 17:25:31 +08:00
20b31eb1e8
Copy polygonInfo when cloning SpriteFrame
2016-04-20 03:04:19 -04:00
f9f751834a
Add missing float suffix to avoid warning C4305
2016-04-20 03:54:47 +09:00
a8847ccf5e
Fixed crash and actions may not have been executed.
2016-04-19 16:11:54 +08:00
660002c239
Merge pull request #15446 from xpol/fixes-integer-cast-warings
...
Fixes some integer cast warnings.
2016-04-19 10:27:37 +08:00
3dbabdee05
Merge pull request #15099 from feijing566/v3
...
Add "id" for parser object
2016-04-19 10:18:04 +08:00
810e855f44
Fixes some integer cast warnings.
2016-04-18 16:01:19 +08:00
8c3137b07f
Fixes warning about unused static constants.
2016-04-18 15:38:51 +08:00
69bd994760
added missing _USRJSSTATIC preprocessor define ( #15438 )
2016-04-18 15:10:35 +08:00
cb0e768f32
Fixes warning: field 'isVertsOwner' will be initialized after field 'rect'.
2016-04-14 17:09:37 +08:00
fe84af5dbd
added zlib.dll
2016-04-12 17:18:47 -07:00
f3d824843b
Refine 'CCActionXXXX' ( #15319 )
...
add more check to be more stronger and simplify the codes
2016-04-08 13:40:36 +08:00
8587440e31
remove unneed c_str call
2016-04-01 10:01:37 +08:00
90087ae5a7
improve textfield code
2016-04-01 09:31:18 +08:00
dcb7c58216
fix textField password bug
2016-04-01 00:52:55 +08:00
5f4e8a65c4
Merge pull request #15348 from minggo/action_issue
...
some bugs fixed of Repeat
2016-03-31 14:47:54 +08:00
fcd64e081d
some bugs fixed of Repeat
...
1. action may be ran more than specified times
2. instant action will ran one frame later
2016-03-30 14:05:22 +08:00
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
392d1e858f
Merge pull request #15314 from WenhaiLin/v3-0323
...
Refine 'CCFontXXXX'
2016-03-25 21:55:00 +08:00
c3a8cabe5d
refine
2016-03-25 21:21:09 +08:00
ffdfcd4aa9
Merge pull request #15311 from MSOpenTech/v3-winrt
...
Win10 UWP and Windows 8.1 fixes for v3.11
2016-03-25 09:42:13 +08:00
a93cbe8a32
Refine 'CCFontXXXX'
2016-03-24 23:05:22 +08:00
66576f19dc
Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt
...
Fix memory leak in FontFNT
2016-03-24 19:59:14 +08:00
12e34ca9d4
updated to v3.11
2016-03-23 12:13:44 -07:00
bd72d7a6de
updated chipmunk include path
2016-03-23 12:12:44 -07:00
db00d4944c
Merge pull request #15293 from zilongshanren/fixDetachIME
...
fix systemFontDirty and lineBreakMode issue
2016-03-23 16:37:53 +08:00
de0582844e
Fix memory leak in FontFNT
2016-03-23 15:17:05 +09:00
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08:00
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +08:00
71f0537734
Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths
2016-03-22 16:07:02 +08:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
ff6b7080f5
fix systemFontDirty and lineBreakMode issue
2016-03-22 14:47:33 +08:00
a15a39095f
fix system font dirty issue
2016-03-21 22:31:23 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
7993ad93d2
fix jsb API inconsistency.
...
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
2016-03-18 16:18:40 +08:00
c54513bb13
Enumerate getChildren() instead of _children.
2016-03-16 15:03:33 -06:00
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
b3b047e9ad
Label '\b' - Next char not change x position
...
Add TextFormatter for easy use '\n', '\r', '\b'
2016-03-07 14:07:36 +03:00
e46e392ff5
Merge pull request #15175 from FrostPolaris/v3_localizeManage
...
Add language localization support for Button, Text, TextField and TextBMFont.
It's OK, merged
2016-03-04 11:43:47 +08:00
e6d2bfd014
Merge pull request #15145 from grwhitehead/fontatlas_fix
...
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-04 11:36:36 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed6bf55ed
2016-03-03 14:17:48 +08:00
dbfb4c793c
Merge pull request #15132 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types
2016-03-02 11:31:56 +08:00
1420ea2cbc
three related bug fixes in FontAtlas::prepareLetterDefinitions
2016-03-01 16:06:45 -08:00
4dcbf4c263
Merge pull request #15133 from cocos2d/walzer-patch-1
...
Fix typos in CCRenderTexture.cpp comments
2016-03-01 09:30:07 +08:00
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
1fbef195a3
Fix typos in CCRenderTexture.cpp commnets
...
Qualcomm Andreno GPU -> Adreno GPU
2016-02-29 16:22:56 +08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
c56835d743
improve the api doc for node.
...
fixes https://github.com/cocos2d/cocos2d-x/issues/15100
2016-02-25 11:43:36 +08:00
f1d8a28b96
Add FlatBuffers serialize function for language data used in Cocos Studio.
2016-02-24 14:59:37 +08:00
fda721fae2
Add "id" for parser object
...
Add "id" for parser object
2016-02-23 14:07:04 +08:00
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
9a65b0c7a1
Merge pull request #15065 from mogemimi/add-missing-reference-types
...
Add missing reference-return types
2016-02-19 10:14:07 +08:00
3a2900494f
Merge pull request #15080 from njh0602/somefix
...
fix return value
2016-02-19 10:09:55 +08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
79c69d77d6
fix return value
2016-02-18 11:23:54 +09:00
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
0cb94cc373
Merge branch 'v3_libwebsockets' of https://github.com/xiaofeng11/cocos2d-x into refactor-websocket
2016-02-17 14:56:57 +08:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
85fc074e29
libwebsockets have been compiled as static lib, remove libwebsockets.dll from win10 & win8.1 project
2016-02-14 10:07:00 +08:00
1dbac01659
Bitmap font sizes are not loaded from binary .fnt files.
...
This problem causes bitmap fonts based on .fnt files to not appear at all, and no error is thrown.
Fixes #15042 .
2016-02-12 14:21:18 -05:00
ec664bc08b
Added aliases for PixelFormat names
2016-02-12 17:25:11 +03:00
8ad49c1bbc
SpriteFrameCache: take pixelFormat into account if specified
2016-02-11 15:47:23 +03:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
4f388d769a
Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
...
Fixed TargetedAction::isDone always return false!
2016-02-03 17:44:26 +08:00
fefd05e54d
Fix Menu event get released issue
2016-02-02 16:44:32 +08:00
bae36b7a98
Label:Fixed characters are displayed incorrectly with some specific font.
2016-02-02 11:16:36 +08:00
eba594bb41
Fixed TargetedAction::isDone always return false!
2016-02-02 11:07:38 +08:00
e2568b3a6f
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
...
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
2016-01-28 01:12:49 +08:00
de9b51c0cf
Fix other GC issues
2016-01-28 01:03:50 +08:00
bd4615795e
fixed documentation for better reading clarity
2016-01-27 11:42:25 +10:00
d6cedb88ec
Remove JS::Persistent and move js object reference into JS scope
2016-01-24 19:47:26 +08:00
c4df3ccd10
please ignore just a test
2016-01-22 11:05:43 +10:00
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
4c11432781
fixed bold
2016-01-20 19:08:31 -08:00
2ed4965b6d
Merge pull request #14751 from newnon/v3_get_version_windows
...
getVersion win32 implementation
2016-01-21 10:42:19 +08:00
60d273e31b
underline and strikethrough working ok on system fonts
2016-01-20 18:41:59 -08:00
fd0ed05f18
Merge pull request #14902 from mogemimi/update-docs-to-v3
...
Update docs to reflect latest API changes
2016-01-21 10:35:27 +08:00
e1e87c0205
Merge pull request #14914 from steerlink/font_family
...
Add ability to get the font family
2016-01-21 10:34:13 +08:00
9c5eecacc7
Update docs to reflect latest API changes
2016-01-21 01:08:32 +09:00
639bf3f682
Fix warning and a bug in FontAtlasCache::unloadFontAtlasTTF()
2016-01-20 23:59:45 +09:00
86e8f7d0b3
oops... removing debugging code
2016-01-19 20:46:57 -08:00
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
535dfdac27
Fix warning.
2016-01-19 11:47:18 -07:00
41d7a27485
Implement getFontFamily().
2016-01-19 11:43:35 -07:00
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
7e0a1344ca
The fix for BMFontConfiguration::parseConfigFile reads string file.
...
'strchr' finds a char until it gets a '\0', if 'contents' self doesn't end with '\0',
'strchr' will search '\n' out of 'contents' 's buffer size, it will trigger potential and random crashes since
lineLength may bigger than 512 and 'memcpy(line, contents + parseCount, lineLength);' will cause stack buffer overflow.
2016-01-15 00:55:10 +08:00
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
0babe85947
add PlayableFrame
2016-01-12 17:21:01 +08:00
cf6fc000e7
Merge pull request #14709 from kcisoul/v3
...
Fix #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
ab0efd933a
Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
CHANGELOG
cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
2016-01-09 18:01:56 +08:00
dc785f63ea
garbage collect when transition is finished
2016-01-07 10:52:03 -08:00
b45e96f77e
fix indent issue
2016-01-05 10:20:05 +08:00
100a119181
add overFlow enum to jsb and lua.
...
1. change clamp to 1 and shrink to 2
2016-01-04 21:43:37 +08:00
69eed4b99c
Updated comment
2016-01-04 11:19:40 +01:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
434c79ae90
Merge pull request #14793 from super626/fixsprite2
...
It already been reviewed and compile by jenkins in https://github.com/cocos2d/cocos2d-x/pull/14697 .
We need merge it to V3.10 to file TMX render bug.
2015-12-24 09:40:36 +08:00
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
halx99