4853c753b8
fix a typo in README.md ( #18044 )
2017-07-10 10:28:33 +08:00
e7c69e253a
fix invalid dt at start on iOS release mode ( #18041 )
2017-07-10 10:06:25 +08:00
74a6fd3293
Do not define VERY_VERY_VERBOSE_LOGGING by default. ( #18036 )
2017-07-06 14:57:02 +08:00
ecea0f4951
update web engine submodule, improve editbox tests ( #18032 )
2017-07-06 10:27:52 +08:00
78e0cbfc5f
Use CurrentDirectory as defaultSearchRoot on Win32 ( #18017 )
...
Default, CurrentDirectory equals to ExeDir, but it's more flexible, and will not break compatible.
2017-07-06 10:24:18 +08:00
1ce88edd22
Merge pull request #18031 from CocosRobot/update_lua_bindings_1499218342
...
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-07-05 15:35:24 +08:00
012e9982d8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-07-05 01:32:25 +00:00
d3eb857482
horizontal alignment support in RichText ( #18027 )
...
* horizontal alignment support in RichText
* split lambda into separate function
* tweak shadow test's content size so horizontal aligment doesn't give the illusion of behaving incorrectly
* fix alignment when the last char of a line is whitespace
* fix errors from merge
* fix bug in setting of size of image elements. scaling was applied effectively twice.
* removed debugging code. whoops
2017-07-05 09:25:12 +08:00
c8fc2dc3ef
arithmetic operators for Color4F ( #18028 )
...
* arithmetic operators for Color4F
* remove template functions
2017-07-05 09:05:03 +08:00
f2e9785132
Export cocos2d::utils::findChild to lua-bindings ( #18013 )
2017-07-04 14:37:44 +08:00
bbe84f8d7a
Remove unnecessary dynamic allocation ( #18014 )
...
* don't dynamically allocate PointArray's internal vector. take advantage of move semantics where possible.
* don't dynamically allocate RichText's _elementRenders vectors
2017-07-04 14:31:29 +08:00
fec74ac549
CCImage.cpp misuse CC_USE_PNG ( #18015 )
2017-07-04 14:17:17 +08:00
6d9bd1bf65
fix stats of seconds per frame on iOS ( #18025 )
2017-07-04 13:38:03 +08:00
69a37a763e
cmake: use *-2015 libs when msvc is greater than 1900 ( #18007 )
...
This patch adds support for newer versions of visual studio
fixes : #18006
Signed-off-by: Julio Montes <imc.coder@gmail.com>
2017-07-03 17:20:25 +08:00
e7a2708812
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18021 )
2017-07-03 15:21:55 +08:00
84ccbde845
Sequence issue ( #18009 )
...
* fix SequenceWithFinalInstant test issue
* fix the issue that sequence will not finish for ever
2017-07-03 09:15:53 +08:00
795538ad9f
Fix sourcePosition bug for ParticleSystem. ( #18002 )
2017-06-30 09:20:43 +08:00
4b61ea1f1e
use travis to build iOS and mac ( #17999 )
2017-06-29 16:41:06 +08:00
41ef696019
luaoc static function return type fix ( #17956 )
...
* update remote repo
* Revert "update remote repo"
This reverts commit c92200d0ac4203c32048ea902e92535dcb4d0935.
* returnType BOOL
* luaoc return type encode
2017-06-26 14:04:55 +08:00
eb85f190bd
Add CCGLProgramStateCache header to cocos2d.h ( #17976 )
2017-06-26 13:53:17 +08:00
90af809b89
No need to get the Configuration and Director instances more than once in CCRenderer.cpp ( #17978 )
2017-06-26 13:52:49 +08:00
3208120ff9
fix warnings ( #17971 )
2017-06-23 17:47:20 +08:00
61839e7a5b
fix warnings ( #17970 )
2017-06-23 17:46:37 +08:00
0e26309602
remove bullet project ( #17961 )
2017-06-21 17:15:09 +08:00
77d8b0a52b
fix compiling issue on android ( #17960 )
2017-06-21 16:43:40 +08:00
aa89054f8e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17959 )
2017-06-21 16:35:47 +08:00
029dabc4d5
Template issue ( #17958 )
...
* add search path
* do not ignore release/debug folder
VS out put folder name is debug/release.win32
and there may have debug/release folder name in 3rd party library
* don not ignore debug folder
2017-06-21 16:18:55 +08:00
320bf97066
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17957 )
2017-06-21 14:34:55 +08:00
4ce443bac2
use prebuilt version of bullet ( #17950 )
...
* use prebuilt bullet
* prebuilt bullet work ok on linux
* update search path
* update search path
* fix compiling issue for lua/jsb projects
* prebuilt bullet work on windows
* update 3rd party lib version
* add bullet search path
* fix script bindings issue
* fix scripting binding
2017-06-21 13:39:38 +08:00
61815f57c0
Fixed Director memory leak ( #17952 )
2017-06-21 09:45:53 +08:00
0f75d3ac5a
Added missing header for NDK v15 ( #17943 )
2017-06-20 09:04:51 +08:00
567fa5b0a7
fixed #17800 : [iOS] Streaming audio (normally a background music) maybe cut and may not be looped. ( #17947 )
...
* fixed #17800 : [iOS] Streaming audio (normally a background music) may be cut and may not be looped.
* Updates including.
2017-06-20 09:04:04 +08:00
a23924c95b
Use const reference where possible. Dropped unnecessary namespace specifier ( #17941 )
2017-06-20 09:03:35 +08:00
7894c5c4a3
Setting new texture for Sprite will reset the program state that is changed ( #17938 )
...
In my project:
1.set default texture.
2.set mine shader program
3.set new texture.
then, the sprite will reset my shader program.
2017-06-20 09:02:58 +08:00
e6210874dd
Processing Lua file(UTF8+BOM) that is encrypted will crash,when free the buffer pointer that is changed pointer address. ( #17937 )
2017-06-20 09:02:40 +08:00
3e912ffee3
add a macro to stip fps related data and functions ( #17934 )
2017-06-20 09:02:13 +08:00
78d5a809c8
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17933 )
2017-06-20 09:01:57 +08:00
204a08d4fd
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17932 )
2017-06-15 14:57:33 +08:00
f9c8bd4bc1
Add padding options to ListView ( #17587 )
...
* Add options to ListView for setting padding
* Add 'setPadding' method test cases.
2017-06-15 14:56:54 +08:00
f79a138c2b
revert updating flatbuffers ( #17930 )
...
* revert updating flatbuffers
* update external version
2017-06-15 13:42:50 +08:00
48c44d6a1a
remove "system" usage ( #17921 )
...
* remove "system" usage
"system" is removed in iOS 11
* android uses old method
2017-06-15 11:07:08 +08:00
5ce38d14fe
On XCode projects, removed specific SDK versions from framework paths. ( #17929 )
2017-06-15 09:53:32 +08:00
5620e30f32
fixed #17922 : [android] AudioEngine may crash while audio's over and stop state is triggered at the same time. ( #17923 )
...
* fixed #17922 : [android] AudioEngine may crash while audio's over and stop state is triggered at the same time.
The Pull Request #17748 didn't resolve the issue since _track->getPrevState will be wrong while in scheduler callback. We need to capture it in lambda.
My Pull Request also merges PR #17716 to make filePath captured by lambda.
* Adds missing log tag in AudioEngine-inl.cpp
2017-06-13 17:44:04 +08:00
44d49d7fab
environment path variable can include blank space ( #17919 )
2017-06-12 14:13:07 +08:00
5c9ac37f50
initialize callback functions ( #17918 )
2017-06-12 10:43:45 +08:00
2b3baf4517
fix precision issue ( #17908 )
...
* fix precision issue
* fix shader error on mac
2017-06-12 08:57:40 +08:00
992ac34a2d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17913 )
2017-06-09 09:54:03 +08:00
f263a43336
Spawn issue ( #17911 )
...
* fix isDone() in spawn
* remove unneeded void keyword
2017-06-08 17:07:43 +08:00
c4173dff3e
update console to fix crash when compiling ios ( #17912 )
2017-06-08 17:07:06 +08:00
845e177885
Uses better configuration for huawei optimization and remove rapidjson dependence in EngineDataManager ( #17909 )
...
* Uses better configuration for huawei optimization (#17838 )
* Uses better configuration for huawei optimization
* Updates jar file and uncomment fps controlling code
* Sync code from 2.x
2017-06-08 17:06:46 +08:00
Weilin Shi