a124213777
disabled /ZW option for .c files for all platforms/configurations ( #16338 )
2016-08-11 23:03:58 +08:00
8af275c4a6
Fixes potential crash in AudioEngine::uncache(filePath). ( #16345 )
2016-08-11 16:06:59 +08:00
89baddceda
fixes compile error for win32 ( #16351 )
2016-08-11 15:54:51 +08:00
abb97b1b71
don't set camera the same as its parent by default ( #16325 )
2016-08-05 17:26:27 +08:00
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
0d836b2cea
Fix pageview click turning event ( #16318 )
...
* fix pageView click turning event
* fix current PageIndx issue
2016-08-05 14:04:57 +08:00
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
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
08515f46e3
fix pageView click turning event ( #16310 )
2016-08-05 09:43:15 +08:00
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
ad721ec3a4
Merge pull request #16305 from minggo/update-doc
...
[ci skip]Update doc
2016-08-04 09:50:57 +08:00
7a463b41a5
update readme
2016-08-04 09:49:23 +08:00
6a5bf06848
moidfy release note
2016-08-04 09:48:55 +08:00
5c021ee645
update changelog
2016-08-03 17:23:10 +08:00
efc6da8439
use correct file ( #16300 )
2016-08-03 15:13:04 +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
03723da032
implement bsd_sinal for compiling or Android 21+ ( #16292 )
2016-08-02 16:52:15 +08:00
a5f8ae1548
compile 3.13
2016-08-02 16:29:16 +08:00
a674e1b8fa
Merge pull request #16287 from pandamicro/v3.13
...
[ci skip]Update web ref
2016-08-01 18:48:03 +08:00
5a952b559b
Update web ref
2016-08-01 18:31:07 +08:00
269bdbed85
Fix compiler warnings caused by Spine 3.4 ( #16286 )
2016-08-01 09:34:20 +08:00
95e60d4124
update version
2016-07-31 22:56:19 +08:00
46ebae03ef
update version
2016-07-31 22:55:03 +08:00
d7b96a6498
update version
2016-07-31 22:53:33 +08:00
55d80413f2
update version
2016-07-31 22:52:59 +08:00
aac49e35e1
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16284 )
2016-07-31 22:50:28 +08:00
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
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
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
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
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
a82e52ffd6
Revert "#Use Data::takeBuffer replace deep copy data." ( #16277 )
2016-07-29 15:35:29 -07:00
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00
04868dc489
update deps ( #16266 )
...
* update deps
* update to deps-107
2016-07-29 17:36:44 +08:00
9a8f577095
fix some typos ( #16269 )
2016-07-29 17:20:42 +08: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
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
c5923e00ca
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16261 )
2016-07-29 13:40:46 +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
adf9e80bd7
Merge pull request #16258 from CocosRobot/update_cocosfiles_1469756321
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 10:06:26 +08:00
7b5535fc3d
Merge pull request #16259 from CocosRobot/update_lua_bindings_1469756435
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-29 10:05:59 +08:00
af1783364b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-29 01:43:11 +00:00
fbf74a49d5
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 01:38:42 +00:00
817ab329f2
Win32 MessageBox correct show utf8 and LuaLog convert utf8 by common unicode api. ( #16249 )
...
* Win32 MessageBox correct show utf8
Support MessageBox utf8 string
based on pr #16234
* LuaLog convert utf8 by common unicode api.
* Add CCStdC.h
2016-07-29 09:36:39 +08:00
a8ce513f6c
Merge pull request #16228 from dumganhar/fix/iss14148-ios-no-sound
...
fixed #14148 : Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will be mute.
2016-07-29 09:28:37 +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
ddc5a90686
Merge pull request #16247 from minggo/js-template
...
[ci skip]fix JS template
2016-07-28 15:55:03 +08:00
57e4963502
Merge pull request #15963 from Drakon-Cocos/PageViewIndicator
...
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
Dale Stammen