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
minggo
faf6fb2308
add Tizen support description
2016-08-04 09:20:27 +08:00
minggo
5c021ee645
update changelog
2016-08-03 17:23:10 +08:00
minggo
efc6da8439
use correct file ( #16300 )
2016-08-03 15:13:04 +08:00
halx99
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
minggo
ba51370e43
use correct shader ( #16295 )
2016-08-03 10:56:12 +08:00
Ricardo Quesada
143317871d
fixes issue #16263 correctly ( #16294 )
...
no stackoverflow when converting int to ssize_t
2016-08-03 09:23:06 +08:00
minggo
03723da032
implement bsd_sinal for compiling or Android 21+ ( #16292 )
2016-08-02 16:52:15 +08:00
Jeff Wang
f8b2d8fe0f
fixed base URL for webview on android doesn't work ( #16279 )
...
fixed base URL for webview on android doesn't work
2016-08-02 16:49:24 +08:00
minggo
a5f8ae1548
compile 3.13
2016-08-02 16:29:16 +08:00
mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
pandamicro
a674e1b8fa
Merge pull request #16287 from pandamicro/v3.13
...
[ci skip]Update web ref
2016-08-01 18:48:03 +08:00
pandamicro
5a952b559b
Update web ref
2016-08-01 18:31:07 +08:00
Dred95
d68f105da4
Fix openURL ubuntu error ( #16283 )
2016-08-01 11:51:05 +08:00
minggo
e63dc24b6d
add browser type
2016-08-01 11:05:49 +08:00
mogemimi
c03dd85c3f
Remove redundant includes ( #16285 )
2016-08-01 10:22:35 +08:00
mogemimi
269bdbed85
Fix compiler warnings caused by Spine 3.4 ( #16286 )
2016-08-01 09:34:20 +08:00
minggo
95e60d4124
update version
2016-07-31 22:56:19 +08:00
minggo
46ebae03ef
update version
2016-07-31 22:55:03 +08:00
minggo
d7b96a6498
update version
2016-07-31 22:53:33 +08:00
minggo
55d80413f2
update version
2016-07-31 22:52:59 +08:00
CocosRobot
aac49e35e1
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16284 )
2016-07-31 22:50:28 +08:00
Vladimir Perminov
c26b755175
Android import cpufeatures in cocos. ( #16233 )
...
* Android import cpufeatures in cocos.
cpufeatures imported in 3rd party libs webp.
If not use webp, android not build.
* Issues #9968
* Issues #9968
2016-07-31 22:45:30 +08:00
halx99
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
QingliWang
bbfd2d334c
Some bug-fix and quality assurance for Tizen support. ( #16281 )
...
* Support audio interruption and resume callback when change earphone status.
* Refactor keyevent callback and add makecurrent for compatible with different binary.
* Enable Tizen indicator.
* Remove the unnecessary evasobject in the window and refactor the function for glview mode.
* Fix the compatible issue between Tizen 2.3 and 2.4.
* Fix the wrong directory of script resources for HellLua template project.
* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
yanli.huang
4a2d384a6c
update cocos2d-console commit:fault-tolerant for cocos package ( #16273 )
...
* update cocos2d-console commit
* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
* update cocos2d console commit :fault-tolerant for cocos package
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
2016-07-31 22:30:44 +08:00
halx99
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
Ricardo Quesada
a82e52ffd6
Revert "#Use Data::takeBuffer replace deep copy data." ( #16277 )
2016-07-29 15:35:29 -07:00
CocosRobot
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00