Ricardo Quesada
3ecaa71944
fix: validates director before layout in iOS ( #16394 )
...
Adds Director::isValid()
removes DisplayLinkDirector()
removes virtual functions from Director()
Director is no longer an abstract class
github issue #14276
2016-08-18 18:13:15 -07:00
Ricardo Quesada
604312ac35
Revert "fix: uses correct constant for Eye in Director" ( #16385 )
2016-08-17 17:53:20 -07:00
minggo
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +08:00
minggo
fe3fb42f49
update release note & changelog ( #16376 )
2016-08-17 15:40:10 +08:00
CocosRobot
9019d7f2c4
[AUTO][ci skip]: updating cocos2dx_files.json ( #16374 )
2016-08-17 13:59:55 +08:00
minggo
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
Furkan Üzümcü
fe6c52c1b4
Use the VS 2015 libraries for MSVC 14 ( #16359 )
...
* Use the VS 2015 libraries for MSVC 14
When compiling with MSVC 14, the linker cannot find `libpng-2015.lib`, `libtiff-2015.lib`, `libjpeg-2015.lib` and `libglfw-2015.lib`. This commit fixes that problem
* Remove the -2015 suffix from the non-MSVC 14 part on libchipmunk
* Fix Linux compiler errors
Check If we are on Windows then check for VS 2015.
2016-08-16 16:57:03 +08:00
CocosRobot
7540a64fd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16370 )
2016-08-16 16:56:06 +08:00
charlesstlaurent
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
Ricardo Quesada
dcea1b65ae
fix: uses correct constant for Eye in Director ( #16369 )
...
fixes github issue #8354
2016-08-15 23:27:20 -07:00
minggo
41cb85edd4
update external version
2016-08-16 13:55:18 +08:00
CocosRobot
c03f6468fc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16368 )
2016-08-15 17:27:05 +08:00
James Chen
86b8a633f3
Android arm64-v8a also uses Luajit. ( #16352 )
...
* Android arm64-v8a also uses Luajit.
* Updates external/config.json
2016-08-15 14:57:04 +08:00
James Chen
1edaf7e122
Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. ( #16353 )
2016-08-15 14:10:13 +08:00
Ricardo Quesada
02de525cbd
deprecates CCProgressTimer::setReverseProgress() ( #16341 )
...
use CCProgressTimer::setReverseDirection() instead.
fixes github issue #14678
2016-08-15 14:08:42 +08:00
mogemimi
b837dd7a20
Avoid unnecessary allocation if targetGrid is reusable ( #16343 )
2016-08-15 14:07:37 +08:00
James Chen
020745ee2e
Disables 'permessage-deflate' extension for WebSocket temporarily. ( #16366 )
...
Currently, we couldn't find out the exact reason.
libwebsockets official said it's probably an issue of user code since 'libwebsockets' passed AutoBahn stressed Test.
2016-08-15 13:59:01 +08:00
CocosRobot
7f222c92e0
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16360 )
2016-08-15 10:53:07 +08:00
James Chen
12d022d6ea
[lua-tests] Reverts uniform after GetUniformTest. ( #16357 )
2016-08-15 09:41:18 +08:00
Ricardo Quesada
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
Ricardo Quesada
3d75750728
resets bindBuffer after using it ( #16342 )
...
fixes github issue #14711
2016-08-11 08:32:09 -07:00
Ricardo Quesada
87f6dd3c97
v3.13 branch: spine updates ( #16340 )
...
related to:
* Github issue #16263
* Github issue #16294
2016-08-11 23:30:15 +08:00
Dale Stammen
a124213777
disabled /ZW option for .c files for all platforms/configurations ( #16338 )
2016-08-11 23:03:58 +08:00
James Chen
8af275c4a6
Fixes potential crash in AudioEngine::uncache(filePath). ( #16345 )
2016-08-11 16:06:59 +08:00
James Chen
89baddceda
fixes compile error for win32 ( #16351 )
2016-08-11 15:54:51 +08:00
Ricardo Quesada
d41124a5b1
check for correct GL extension ( #16346 )
...
uses `GL_IMG_texture_format_BGRA8888` instead of `GL_IMG_texture_format_BGRA888`
fixes issue #16336
2016-08-10 03:24:41 -07:00
Greg Rynkowski
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
JaryGuo
f9abbf02f6
fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp ( #16314 )
...
* fix the return value when return null in java
fix the return value when return null in java
* fix getStringUTFCharsJNI
fix getStringUTFCharsJNI when srcjStr is null
* remove a word
remove a word added by mistake
* make a indention
line 233 utf8Str
2016-08-08 10:43:14 +08:00
vlad-tkachenko
c3130caf27
Fix Desktop App crash upon exit when NotificationNode exists. ( #11274 )
2016-08-08 10:20:15 +08:00
Ricardo Quesada
e5b14733c8
from spine source code ( #16330 )
...
Related to:
* Github issue #16263
* Github issue #16294
2016-08-08 09:47:05 +08:00
Ricardo Quesada
f7464f8de5
fix: TriangleCommands with custom uniforms can be batched ( #16329 )
...
* fix: TriangleCommands with custom uniforms can be batched
TriangleCommands with custom uniforms can be batched together.
This improves the performance when using custom uniforms without
adding any penalties when not using them
Github issue #16224
* better tests
2016-08-07 14:51:02 -07:00
minggo
0e65025bda
Revert "Match parent's camera mask when adding child." ( #16324 )
2016-08-05 17:28:05 +08:00
minggo
abb97b1b71
don't set camera the same as its parent by default ( #16325 )
2016-08-05 17:26:27 +08:00
James Chen
f44f253179
[Android] Notify waitup only while preloadEffect(info, cb) is invoked in play2d. ( #16320 )
...
Currently, if a audio isn't preloaded, then play2d will wait the preload operation to finish.
2016-08-05 14:07:19 +08:00
minggo
2bd325ab92
Revert "fixes issue #16263 correctly" ( #16321 )
2016-08-05 14:06:03 +08:00
子龙山人
0d836b2cea
Fix pageview click turning event ( #16318 )
...
* fix pageView click turning event
* fix current PageIndx issue
2016-08-05 14:04:57 +08:00
Ricardo Quesada
a58323a388
Adds more info regarding bug 15776 ( #16315 )
...
Related to github issue #15776
2016-08-05 14:04:39 +08:00
Ricardo Quesada
59a646341c
adds more info for bug #15776 ( #16316 )
...
related to github issue #15776
This is a PR for v3.13 branch
2016-08-05 14:04:26 +08:00
minggo
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
mogemimi
a5f36e70a5
Add explicit type casts to suppress -Wformat warnings ( #16306 )
2016-08-05 09:46:50 +08:00
子龙山人
08515f46e3
fix pageView click turning event ( #16310 )
2016-08-05 09:43:15 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
子龙山人
5f9c2aa141
add tizen guide into readme ( #16313 )
2016-08-04 16:51:19 +08:00
minggo
b091c58ee7
update requirements for iOS and Mac OS version
...
because Downloader uses `NSURLSession` which is available on iOS 7+ and Mac OS X 10.9+.
2016-08-04 14:02:40 +08:00
mogemimi
3175316131
Fix format string warning when compiling for iOS armv7 ( #16298 )
2016-08-04 09:54:27 +08:00
James Chen
cc9871b71d
fixed #10482 : New AudioEngine class can't play large ogg file on Win32. ( #16303 )
...
* fixed #10482 : New AudioEngine class can't play large ogg file on Win32.
* [win32] Small logic fix in AudioPlayer::readPcmData.
2016-08-04 09:53:30 +08:00
子龙山人
6eaf15a2c2
fix pageview turning event ( #16299 )
2016-08-04 09:51:54 +08:00
minggo
ad721ec3a4
Merge pull request #16305 from minggo/update-doc
...
[ci skip]Update doc
2016-08-04 09:50:57 +08:00
minggo
7a463b41a5
update readme
2016-08-04 09:49:23 +08:00
minggo
6a5bf06848
moidfy release note
2016-08-04 09:48:55 +08:00