b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
143317871d
fixes issue #16263 correctly ( #16294 )
...
no stackoverflow when converting int to ssize_t
2016-08-03 09:23:06 +08:00
269bdbed85
Fix compiler warnings caused by Spine 3.4 ( #16286 )
2016-08-01 09:34:20 +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
a82e52ffd6
Revert "#Use Data::takeBuffer replace deep copy data." ( #16277 )
2016-07-29 15:35:29 -07:00
3a3f6bd385
#Use Data::takeBuffer replace deep copy data. ( #16263 )
...
see: https://github.com/EsotericSoftware/spine-runtimes/pull/650
2016-07-29 15:27:16 +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
2945968614
Upgrades to Spine v3.4 ( #16242 )
...
* Upgrades to Spine v3.4
Github issue #16115
* compiles and works on windows
tested on:
* win32
* win10
* win8.1
* include-linter: don't test spine files
we need them unmodified
* spine bindings fixes
also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07: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
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
ef21e44d9c
Fixed to use cocosstudio LoadingBarReader with TexturePacker.
2016-07-17 16:30:17 +09:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
35968a6fc1
Slidebar can load TextureCache on cocosstudio.
2016-07-02 18:45:20 +09:00
c675675de5
Fixed to use TexturePacker with cocosstudio.
2016-07-02 17:31:32 +09:00
c5648db10a
cocosstudio can manage TexturePacker Image.
2016-06-30 18:10:08 +09:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53: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
8e6ca57f4f
lua binding : Rename end() to endToLua().
2016-06-14 23:35:17 +08:00
dac9be5016
Various CMake improvements
...
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04: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
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
2476722137
fix default value of studio version
2016-05-26 17:33:44 +08:00
b317588e6e
fix include path
2016-05-26 17:25:03 +08:00
3e941be0ce
fix actionNode studio 1.6 parser error
2016-05-26 17:20:51 +08:00
8692ee176c
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/network/HttpAsynConnection-apple.m
cocos/network/HttpClient-android.cpp
cocos/network/HttpClient.cpp
cocos/network/HttpCookie.h
cocos/network/HttpRequest.h
cocos/network/HttpResponse.h
cocos/network/SocketIO.cpp
cocos/network/WebSocket.h
2016-05-25 19:19:27 +08:00
896aeb2d0c
Fix android compilation issue with thumb mode
2016-05-25 18:35:38 +08:00
16878a53b1
Suppress MSVC warning C4800
2016-05-13 11:44:17 +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
6433172fae
Fix shadow variable warning in GameNode3DReader
2016-05-02 10:57:03 +09: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
43a94c0693
Add FileUtils::getContents(). ( #15479 )
...
* Add FileUtils::getContents().
* skip FileUtils::getContents() in binding generator config.
* use FileUtils::getContents in CCDataReaderHelper.
* obey the cocos2d-x coding style.
* Explicit constructor.
* More docs.
* More tests.
* Move FileError to FileUtils::Error.
* Fixes wrong buffer size for reading into string and vector.
* Update tests.
* Add note on padding for output buffers.
* FileUtils: implements old methods by using `getContents()`.
methods are:
* FileUtils::getDataFromFile()
* FileUtils::getStringFromFile()
* FileUtils::getFileData()
and follow Android methods are now just calls FileUtils' ones.
* FileUtilsAndroid::getDataFromFile()
* FileUtilsAndroid::getStringFromFile()
* FileUtilsAndroid::getFileData()
* Fixes build error.
* FileUtils::getFileData: Return the size of data.
* Remove old methods form FileUtilsAndroid they are now done in FileUtils.
* Fixes for win32 code.
* Fixes build error in test and add more test.
* Better error message.
* Make template type name more readable.
* Update comments.
* Move internal functions to anonymous namespace.
* Refactor FileUtils test.
* Fix warning about compare signed and unsigned.
* Win32 and WinRT does not use text mode.
That is we don't need simulate convert CRLF to LF.
* Fixes for Win32 and WinRT.
* Update for Win32 and WinRT.
* Win32: return FileUtils:Error::TooLarge when file is large than 2^32-1.
* Win32: remove checkFileName() which has no effect at all.
* WinRT: add FileUtilsWinRT::getContents() using ::CreateFile2.
* WinRT: add override keyword for FileUtilsWinRT::getFileSize().
* Update for coding styles.
* More error strings.
* check read and malloc return codes.
* rename FileUtils::Error to FileUtils::Status.
* Fixes for WinRT, use GetFileInformationByHandleEx to get file size.
* Fixes build error for winrt and cleanup FileUtils::Status.
* Try to fix the build error on Linux.
Status must defined in some header, so move FileUtils.h up.
* Remove support of text mode on WinRT (it is the last platform support text mode).
2016-04-26 13:37:22 +08:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
df9a9292a2
Merge pull request #15453 from mogemimi/add-missing-dllexport
...
Add missing dllexport to avoid warning C4275
2016-04-19 10:26:58 +08:00
24a09a5ae7
Add missing dllexport to avoid warning C4275
2016-04-19 04:01:13 +09:00
bd263d6be4
Fixes deprecated warnings
...
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
8c3137b07f
Fixes warning about unused static constants.
2016-04-18 15:38:51 +08:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
7ec409c3bb
Fix memory leak in DataReaderHelper
2016-04-07 02:22:06 +09:00
6b167a1aa1
Merge pull request #15335 from mogemimi/fix-typos
...
Fix typos in comments and strings
2016-04-06 11:32:46 +08:00
a184c88e9d
Add missing virtual destructor in ILocalizationManager
2016-04-06 01:40:41 +09:00
44331137d8
Fix in cpp-test bugs test scene 13 crash
2016-03-29 16:45:16 +08:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +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
0a657cd219
Remove cocos2dx.h reference from all cocos studio related files
2016-03-16 14:02:08 +08:00
b7779180b1
fix annoying "callBackName cannot be found" log
2016-03-14 12:11:23 +02:00
b3ee96ebd2
fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084
2016-03-11 12:56:58 +08:00
7824acc34e
fix scrollview bugs:
...
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
2016-03-10 18:06:20 +08:00
8f9233be00
Fix the bug that TextField may be set with a multi-line localized text.
2016-03-09 09:31:34 +08:00
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08:00
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +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
4e4558e509
Modify the interface of localization manager.
2016-03-01 14:27:12 +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
fe917e00fc
Add language localization support for Button, Text, TextField and TextBMFont.
2016-02-29 18:00:14 +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
f1d8a28b96
Add FlatBuffers serialize function for language data used in Cocos Studio.
2016-02-24 14:59:37 +08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +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
be7c8c7553
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
...
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
7b405b29bc
fix code indent
2016-01-21 11:33:13 +08:00
be6fd6a2ee
format code indent
2016-01-21 10:27:37 +08:00
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08: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
e7ed79f655
const Data -> const Data& for function argument, performance improvement.
2016-01-15 00:55:10 +08:00
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
9c86d1f0f1
Merge pull request #14880 from mogemimi/fix-minor-typo
...
Fix typos in comments and documentation
2016-01-14 09:58:29 +08:00
eab1de0f1e
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
2016-01-13 16:34:04 +08:00
e3c50caf11
add test case for PlayableFrame
2016-01-13 15:25:31 +08:00
0babe85947
add PlayableFrame
2016-01-12 17:21:01 +08:00
18a793792e
Fix typos in comments and documentation
2016-01-12 13:27:06 +09:00
34c7331b99
Issue fixes for new memory model
2015-12-21 00:16:17 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
07673f71cd
Fix inconsistent header include guards
2015-12-12 21:05:22 +09:00
462796d2dd
Bug fix for ActionNode in CocosStudio, please don't use weak reference.
2015-12-07 15:06:50 +08:00
745f54b421
Replace 'ResouceData' with 'ResourceData'
2015-12-05 18:59:54 +09:00
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
d0ce2473a1
Merge pull request #14499 from xiaofeng11/v3_combine_safety
...
Change ASSERT to safety mode
2015-12-04 00:04:36 +08:00
d4233dd63a
Fix deprecation warning in SkeletonRenderer
2015-12-03 00:09:47 +09:00
d6ddb365b6
Remove boring logs in cocos studio supporting module.
...
They are helpless for debugging, we should use break points for debugging.
2015-11-27 14:43:25 +08:00
f5f09133e6
Change ASSERT to safety mode
2015-11-26 16:49:01 +08:00
097f7a34e0
Merge pull request #14379 from mogemimi/fix-deprecated-warnings
...
Fix deprecated warnings
2015-11-17 11:19:07 +08:00
e313f7be8b
Combine Studio change for ActionTimeline
2015-11-16 15:56:23 +08:00
9ec1e2069a
Fix deprecated warnings
2015-11-13 14:38:48 +09:00
1f0c498bcb
Fixed actionNode position error bug
2015-11-09 19:45:17 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
872141d547
update for light3d reader
2015-11-03 13:34:21 +08:00
917edbcf62
update for light3d reader
2015-10-29 09:53:54 +08:00
036585ef95
Fix ActionManagerEx some times crash when reload action frames.
2015-10-26 10:38:17 +08:00
5065a542f7
fix the issue #14113
2015-10-23 00:00:18 +08:00
0a6360eee0
Merge pull request #14196 from geron-cn/v3
...
AnchorPointFrame animation performance diffrent
2015-10-22 14:37:26 +08:00
James Chen