a6c398ec95
Fixes jsval_to_std_string could not convert number to string. ( #16504 ) ( #16515 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 17:42:34 +08:00
8947ff722e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16514 )
2016-09-05 13:48:58 +08:00
6f4551cdad
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16513 )
2016-09-05 10:19:41 +08:00
b48bcc9579
Ease Actions Code De-Duplication
...
* ease action class macros to reduce code duplication
- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type
* Add note and minor cleanup
* use create in clone instead of new/init as in latest EaseBezierAction
* fix reverse for EaseIn/Out to match original code
* add assert for null
* refactor to match original code flow
* fix missing CC_DLL for windows builds
* fix win build issues due to abstract methods
* remove unused overrides
2016-09-05 10:18:30 +08:00
857b2143a6
Remove deprecated attribute on Node::_setLocalZOrder() function ( #16470 )
2016-09-05 10:06:42 +08:00
5bfd110424
Fixes jsval_to_std_string could not convert number to string. ( #16504 )
...
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
0cd365dd2e
Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage ( #16482 )
2016-09-02 09:51:47 +08:00
c32000250c
Issue 16471 ( #16489 )
...
* fix: Label updateColor() and underline color work as expected
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
* docs: added more internal doc for issue_16471
2016-09-01 16:59:40 +08:00
db21e5f349
[ci skip]Travis enable pull request ( #16494 )
...
* refactor travis and build pull request
* delete unneeded file
2016-09-01 16:25:47 +08:00
1c40d5e16d
Fix MessageBox inverted params on Android ( #16484 )
2016-09-01 16:10:02 +08:00
64c62d37c2
fixed #16490 : [android, audio] AudioEngine::stop() triggers 'finished' callback ( #16491 )
2016-09-01 16:06:29 +08:00
6d27868918
fixed #16473 : OpenSLES error while play background music in writable path or sdcard. ( #16475 )
2016-09-01 11:47:33 +08:00
01e67f6203
fixed #16477 : [android, audio] Deadlock if preload the same file more than 3 times in preload callback. ( #16478 )
...
And added test case.
2016-09-01 11:46:27 +08:00
35f937cd40
AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up. ( #16476 )
...
* Warning fixes in AudioDecoder.cpp
* AudioPauseResumeAfterPlay test case should start in onEnter.
And add a loop to pause & resume many times.
* AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up.
2016-09-01 11:43:37 +08:00
e57c30c83b
fix: Label updateColor() and underline color work as expected ( #16486 )
...
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior
fixes Github issue #16471
2016-08-31 20:20:13 -07:00
58ede40ed9
Add missing definition of PhysicsBody::getFirstShape (Revert part of #13923 ) ( #16458 )
2016-08-29 19:23:14 -07:00
91efab2ba7
Fix memory leak caused by packetOut in SocketIO.cpp ( #16451 )
2016-08-29 19:22:38 -07:00
feb48aea9c
Improving CCRef LEAK_DETECTION tools by making them thread safe. It is possible that ref's can be created and mutated off thread, and with leak detection on. This can cause ungaurded writes from two or more threads to a non-protected structure. Fixing a crash on iOS when using std::list instead of std::vector. ( #16415 )
2016-08-30 09:36:45 +08:00
9dea92b2e0
feat: add support for Game Controllers on Mac ( #16461 )
...
it shares 100% the same code with iOS.
it only adds a few #ifdefs.
github issue #16460
2016-08-29 16:58:44 -07:00
0b1f61b8ce
fix possible crash of label shrinked ( #16456 )
2016-08-29 15:23:01 +08:00
df3b33cd59
Merge pull request #16457 from minggo/merge-v3.13
...
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
7665d83db2
Merge pull request #16452 from mogemimi/add-missing-override
...
Add missing override keywords
2016-08-29 00:33:30 -05:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
ee4d59cf76
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16454 )
2016-08-29 11:48:21 +08:00
6c3f5e6d6b
Fix variable shadowing warnings caused by Spine 3.4 ( #16445 )
2016-08-29 09:42:34 +08:00
86563af08a
Add missing override keywords
2016-08-28 23:45:15 +09:00
6c9a05f831
PageView with custom 'scrollToPage' time ( #16390 )
...
* PageView with custom scrollToPage time
* fix compiler error
2016-08-25 15:48:01 +08:00
a9898b9875
possible memory leak when font size is 0 ( #16424 )
2016-08-24 18:27:44 -07:00
5bc3659a33
#Improve XML parse performance with rapidxml pure SAX parser ( #16419 )
...
* Update CCSAXParser.cpp
* #Improve XML parse performance with rapidxml pure SAX parser without compatible break.
* put rapidxml to external
* Update deps
2016-08-24 16:37:03 -07:00
e62af99db7
Fixed Camera::_viewProjectionUpdated state ( #16405 )
...
Camera::_viewProjectionUpdated is not initialised in constructor. Should be initialised to false.
This can lead to redundant visibility checks if _viewProjectionUpdated happens to resolve true.
As Camera::visit() is never called, _viewProjectionUpdated is never actually updated, resulting in no visibility tests when the camera transform changes.
Fixes #16404
2016-08-24 18:15:19 +08:00
a9a8add717
Add missing class declaration and remove duplicate declaration ( #16423 )
2016-08-24 18:09:29 +08:00
c339266556
[UserDefault-android] Return defaultValue parameter instead of some default value ( #16416 )
...
* Return defaultValue parameter instead of some default value
* Remove unnecessary semicolon
2016-08-24 18:07:17 +08:00
20a0798007
avoid to use __system_get_property__ ( #16433 )
...
* avoid to use __system_get_property__
* add utils
* revert console
2016-08-24 17:11:41 +08:00
e124fe4fc5
Update CCBProxy.cpp ( #16421 )
...
fixed bug
2016-08-23 14:48:06 +08:00
3c60398c09
Fix size/position calculations for Linux system fonts. ( #16328 )
2016-08-23 12:01:43 +08:00
1b3ff00cef
fix compiling error ( #16420 )
2016-08-23 11:05:01 +08:00
5b83fa1ac0
Fix LNK4098 and LNK2001 warnings ( #16372 )
...
* Fix LNK4098 warnings
Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```
* Fix LNK2001 error
The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```
This commit fixes that problem
2016-08-22 15:50:17 +08:00
56cfd76b4c
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16411 )
2016-08-22 15:49:43 +08:00
ec52cf4aa4
[ci skip] Remove LayerRGBA in scripts to avoid issues and update web ref ( #16412 )
...
* Remove LayerRGBA in scripts to avoid issues and update web ref
* Doctoc docs
2016-08-22 10:55:21 +08:00
4d801ba1d0
#Fix use const std::string& instead a temp string ( #16392 )
...
* #Fix use const std::string& instead a temp string
* #Fix use const std::string& instead a temp string
2016-08-22 09:43:41 +08:00
727c501285
Fixes crash while invoking pause&resume right after play2d. ( #16406 )
2016-08-22 09:43:06 +08:00
7afde8c7a6
Remove unnecessary ActionInterval casts ( #16402 )
2016-08-22 09:39:58 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
016e7b0dfc
fix: release texture in RenderState ( #16396 )
...
memory leak fixed in RenderState
fixes github issue #16155
2016-08-19 00:22:57 -07:00
92ed162cbe
replace replace __system_property_get() since it is deprecated in 64 bit android NDK ( #16398 )
2016-08-19 11:49:33 +08:00
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +08:00
d09ee83c5a
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16395 )
2016-08-19 09:36:50 +08:00
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
604312ac35
Revert "fix: uses correct constant for Eye in Director" ( #16385 )
2016-08-17 17:53:20 -07:00
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
7540a64fd8
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16370 )
2016-08-16 16:56:06 +08:00
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
dcea1b65ae
fix: uses correct constant for Eye in Director ( #16369 )
...
fixes github issue #8354
2016-08-15 23:27:20 -07:00
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
1edaf7e122
Initializes member variable for TMXMapInfo and updates hexa-test.tmx to the latest format. ( #16353 )
2016-08-15 14:10:13 +08:00
02de525cbd
deprecates CCProgressTimer::setReverseProgress() ( #16341 )
...
use CCProgressTimer::setReverseDirection() instead.
fixes github issue #14678
2016-08-15 14:08:42 +08:00
b837dd7a20
Avoid unnecessary allocation if targetGrid is reusable ( #16343 )
2016-08-15 14:07:37 +08:00
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
7f222c92e0
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16360 )
2016-08-15 10:53:07 +08:00
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
3d75750728
resets bindBuffer after using it ( #16342 )
...
fixes github issue #14711
2016-08-11 08:32:09 -07:00
87f6dd3c97
v3.13 branch: spine updates ( #16340 )
...
related to:
* Github issue #16263
* Github issue #16294
2016-08-11 23:30:15 +08:00
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
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
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
c3130caf27
Fix Desktop App crash upon exit when NotificationNode exists. ( #11274 )
2016-08-08 10:20:15 +08:00
e5b14733c8
from spine source code ( #16330 )
...
Related to:
* Github issue #16263
* Github issue #16294
2016-08-08 09:47:05 +08:00
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
0e65025bda
Revert "Match parent's camera mask when adding child." ( #16324 )
2016-08-05 17:28:05 +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
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
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
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
3175316131
Fix format string warning when compiling for iOS armv7 ( #16298 )
2016-08-04 09:54:27 +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
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
143317871d
fixes issue #16263 correctly ( #16294 )
...
no stackoverflow when converting int to ssize_t
2016-08-03 09:23:06 +08:00
03723da032
implement bsd_sinal for compiling or Android 21+ ( #16292 )
2016-08-02 16:52:15 +08:00
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
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
d68f105da4
Fix openURL ubuntu error ( #16283 )
2016-08-01 11:51:05 +08:00
c03dd85c3f
Remove redundant includes ( #16285 )
2016-08-01 10:22:35 +08:00
269bdbed85
Fix compiler warnings caused by Spine 3.4 ( #16286 )
2016-08-01 09:34:20 +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
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
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
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
af1783364b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-29 01:43:11 +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
57e4963502
Merge pull request #15963 from Drakon-Cocos/PageViewIndicator
...
Fix PageViewIndicator opacity for 'inactive' pages
2016-07-28 14:44:35 +08:00
66fac82f00
fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12 ( #16214 )
...
* fixed #16169 : new android project crash in android 5.0.2 device (Nexus 7) when use 3.12
* fixed #16169 : Adds comments for why we should not use `assignment operator` of `std::u16string`.
2016-07-28 11:19:22 +08:00
cac05fefd1
Merge pull request #16241 from mogemimi/avoid-casting-overhead
...
Avoid overhead of casting between float and double
2016-07-28 10:04:34 +08:00
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
bf35e0f6b5
Avoid overhead of casting between float and double
2016-07-28 06:49:41 +09:00
6b3454e9c6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-27 20:38:57 +00:00
47e6b0cf3d
Merge pull request #16237 from ricardoquesada/issue_16220
...
Compile on macOS 10.10 and lower
2016-07-27 13:30:59 -07:00
5498bdb32b
Add ricardoquesada info
2016-07-27 18:48:10 +03:00
9dcc1f8193
Compile on macOS 10.10 and lower
2016-07-27 07:44:00 -07:00
3734668d17
GLProgram::link always check link status
...
Fix issues #16231
2016-07-27 15:31:32 +03: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
30118aff6b
Merge pull request #16226 from dumganhar/fix/iss16192-smallaudio-crash
...
fixed #16192 : Crash while decoding small MP3 file on Android.
2016-07-27 15:39:57 +08:00
e6b42d486b
Merge pull request #16218 from cezheng/fix/etc_premultiplied_alpha_value
...
fix CCImage premultipliedAlpha for ETC format
2016-07-27 15:38:48 +08:00
1a1241c3fc
Merge pull request #16221 from Microsoft/winrt-v3.13
...
WinRT: update libcocos2d version to v3.13
2016-07-27 15:36:43 +08:00
6efcf87b93
fixed #14148 : Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will not be mute.
...
The error is: ERROR: [0x19e5fa000] >aurioc> 807: failed: '!pla' (enable 2, outf< 2 ch, 44100 Hz, Float32, non-inter> inf< 2 ch, 0 Hz, Float32, non-inter>)
2016-07-27 15:33:02 +08:00
4e278183ad
Merge pull request #16122 from ricardoquesada/issue_16100
...
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
bd1d630f93
fixed #16192 : Crash while decoding small MP3 file on Android.
2016-07-27 13:54:39 +08:00
b336aa3219
testcase: add test case for issue #16100
...
delays camera creation
fix issue #16100
2016-07-26 19:03:54 -07:00
d5809129c4
update libcocos2d version to v3.13
2016-07-26 12:34:36 -07:00
9903d31031
fix CCImage premultipliedAlpha for ETC format
...
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
2016-07-26 19:17:10 +09:00
6109ca6e4b
Merge pull request #16216 from mogemimi/remove-unnecessary-extern
...
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 15:19:11 +08:00
6fb4410232
Merge pull request #16213 from CocosRobot/update_lua_bindings_1469498667
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 15:12:48 +08:00
0894662eff
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 12:42:43 +09:00
9566a0cb24
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 02:06:58 +00:00
e1204c6138
Merge pull request #16210 from dumganhar/fix/std-bind
...
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 09:58:01 +08:00
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
bf80f10dfd
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 00:55:32 +08:00
662a1636c3
replace __system_property_get ( #16205 )
...
* replace __system_property_get
* fix comment
2016-07-25 18:30:47 +08:00
e0abb981d5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 09:39:34 +00: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
cc14a06800
Issue 14206 ( #16201 )
...
* don't trigger applicationWillEnterForeground at first time to be the same as iOS
* rename first to firstTime
2016-07-25 14:25:48 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
4c2234fe20
get correct control code
2016-07-22 14:30:06 +08:00
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
391d97d1dd
improve log info
2016-07-22 11:56:41 +08:00
8419cc2662
Merge pull request #16183 from SaxonDruce/android-willplaymusic
...
Implement willPlayBackgroundMusic() on Android
2016-07-22 10:57:26 +08:00
fcd02f109e
Merge pull request #16189 from mogemimi/fix-docs-typo
...
Fix typos in documentation and comments
2016-07-22 10:55:05 +08:00
1a834ebdbf
fix: FPS appears again
...
Sets default glviewport() when the GLView::updateDesignResolutionSize()
is called
github issue #16139
2016-07-21 15:12:57 -07:00
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
bbedddbf08
Fix bugs with music not resuming when iOS app is reactivated ( #16178 )
...
* Pause instead of stopping music on resign
The [audioSource stop] causes the music to be stopped, and therefore it fails to resume later on a call to [audioSource resume], due to the addition of the if (!stopped) check in resume added in 26a04b38f2https://github.com/cocos2d/cocos2d-x/pull/16178
* Fix typo in previous fix.
2016-07-21 17:41:24 +08:00
233f2111b9
fixed #16170 : Random crash in alGenBuffers(AudioCache::readDataTask) at startup. ( #16182 )
...
* fixed #16170 : Random crash in alGenBuffers(AudioCache::readDataTask) at startup.
* Minor fix: should -> may
* Minor fix: updates comments.
* Update comment.
* Comment fix again.
2016-07-21 16:51:04 +08:00
bb25bed6f2
Merge pull request #16164 from dumganhar/fix/iss16046-fps-clock
...
Uses std::chrono::steay_clock for calculating dt.
2016-07-21 16:01:58 +08:00
35cea378a9
Merge pull request #16172 from cezheng/fix/label_text_formatter_right_alignment
...
fix label text formatter right alignment
2016-07-21 15:21:12 +08:00
bb004c5e22
[audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform. ( #16147 )
...
* [audio] Fixes some issues while stop/uncache right after play/preload on OSX/iOS platform.
* Better state control in AudioCache.
* Adds State enum class which contains INITIAL, LOADING, READY, FAILED states.
* AudioPlayer::destroy should check AudioCache::_isAudioLoaded flag, otherwise, app will freeze in cpp-tests/NewAudioEngineTest/6:Test invalid audio file.
* Should check whether state is INITIAL in the destructor of AudioCache.
* Adds test case for switching play state frequently.
* Skips invoking reading data callback if cache's state is INITIAL.
* Variables initialization for AudioCache class and fixes protential missing delete AL buffers.
2016-07-21 14:57:59 +08:00
b8f8ff0d25
Merge pull request #16177 from mogemimi/fix-constant-spelling
...
Fix typo in constant name
2016-07-21 14:41:35 +08:00
de091cd3d9
Implement willPlayBackgroundMusic() on Android, to return false if there is other music already playing in another app.
2016-07-21 14:29:13 +08:00
26dd7b2698
remove curl link for Android
2016-07-21 11:56:56 +08:00
708dab448d
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16175 )
2016-07-21 10:11:14 +08:00
17dfd03fa7
Fix typo in constant name
2016-07-21 00:49:19 +09:00
62f1762ea9
Merge pull request #16165 from ricardoquesada/issue_16105_bis
...
fix: stagger tilemaps hexa works as expected
2016-07-20 05:06:31 -07:00
35b848e842
fix label text formatter right alignment
2016-07-20 18:08:15 +09:00
2e5626236b
Remove unused code in cocos/audio/openal
2016-07-20 14:49:39 +08:00
e19393fa23
Merge pull request #16123 from ricardoquesada/issue_15805
...
Fix: not cransh on android when mapBuffer() is not present
2016-07-20 14:10:04 +08:00
b3218c1e58
fix: stagger tilemaps hexa works as expected
...
Github issue #16105
2016-07-19 22:55:05 -07:00
ddb25ca563
Uses std::chrono::steay_clock for calculating dt.
2016-07-20 12:43:40 +08:00
cd495f68ba
Fix: not cransh on android when mapBuffer() is not present
...
more info:
https://www.khronos.org/registry/gles/extensions/OES/OES_mapbuffer.txt
add methods to check whether or not glMapBuffer exists
2016-07-19 21:00:50 -07:00
cc947737dd
Merge pull request #16160 from ricardoquesada/issue_16139
...
fix: display FPS again on GLFW platforms
2016-07-19 19:19:31 -07:00
66e29ba82d
Merge pull request #16151 from mogemimi/fix-function-spelling
...
Fix spelling for `getPolygonCenter` function
2016-07-20 09:56:51 +08:00
5f0c0163b3
fix: display FPS again on GLFW platforms
...
Apparently GLFW stop emitting some events that creation time.
2016-07-19 18:26:14 -07:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
60dbbde3eb
Fix misspelled enum: POLYGEN -> POLYGON
2016-07-18 19:10:07 +09:00
cbcbeb96b3
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-18 06:20:59 +00:00
04ebd952a0
Merge pull request #16137 from yalab/cocosstudio_with_texturepacker
...
Fixed to use cocosstudio LoadingBarReader with TexturePacker.
2016-07-18 14:14:49 +08:00
15ef80e27d
[big refactoring] Audio latency fix for Android. Support to preload effects on Android now. ( #15875 )
...
* Audio latency fix for Android. Support preload effects on Android now.
Squashed commits:
[b6d80fe] log fix
[a0a918e] Fixes assetFd didn't be released while PcmData is returned from cache.
[4b956ba] Potential crash fix for PcmAudioPlayer while pause / resume.
[398ab8c] Updates LOG_TAG position in AudioEngine-inl.cpp
[e3634e7] include stdlib.h for posix_memalign
[9004074] fixes setVolume logical error.
[c96df46] Don't use another thread for mixing, enqueue is in a seperated thread, therefore doing mixing in another thread will waste more time.
[0a4c1a8] Adds setLoop, setVolume, setPostion support for Track
[c35fb20] Fixed include.
[cdd9d32] Do mixing by ourself. (TO BE POLISHED)
[6447025] µ -> u since µ could not be shown on some android devices.
[97be0c6] Don't send a silence clip.
[c1607ed] Make linter.py happy.
[0898b54] Puts enqueue & SetPlayState in PcmAudioPlayer::play to thread pool.
[b79fc01] Adds getDuration, getPosition support for PcmAudioPlayer
[80fa2ab] minor fix of the code position of resetting state to State::INITIALIZED
[d9c62f1] underrun fix for PcmAudioPlayer.
[9c2212a] UrlAudioPlayer, playOverMutex should be static, and should be used in update method.
[1519d2e] static variables
[19da936] _pcmAudioPlayer Null pointer check in AudioPlayerProvider.
[e6b0d14] Updates audio performance test.
[fc01dd4] Registers foreground & background event in AudioEngine-inl.cpp(android), the callback should invoke `provider`'s pause & resume method.
[e00a886] TBD: Pause & resume support for PcmAudioPlayerPool.
Since OpenSLES audio resources are expensive and device shared, we should delete all unused PcmAudioPlayers in pool while pause and re-create them while resume.
But this commit isn't finished yet, I don't find a better way to register pause&resume event in AudioEngine module.
[9e42ea3] Interleave mono audio to stereo audio. PcmAudioPlayerPool only contains PcmAudioPlayers with 2 channels.
[3f18d05] Adds a strategy for checking small size of different file formats.
[753ff49] Adds performance test for AudioEngine.
[09d3045] Releases an extra PcmAudioPlayer for UrlAudioPlayer while allocating PcmAudioPlayer fails.
[9dd4477] Using std::move for PcmData move constructor & move assignment.
[6ca3bcb] some fixes:
1) new -> new (std::nothrow)
2) break if allocate PcmAudioPlayer fails
3) renames 'initForPlayPcmData' to 'init'
4) PcmAudioPlayer destructor deadlock if 'init' failed
[54675b6] include path fix.
[a1903ca] More refactorings.
[19b9498] Makes linter.py happy. :)
[923c530] Fixes:
1) Avoid getFileInfo to be invoked twice
2) A critical bug fix for UrlAudioPlayer and adds detailed comments
3) __clang__ compiler option fix for AudioResamplerSinc.cpp.
[5ec4faf] minor fix.
[faaa0f3] output a log in the destructor of UrlAudioPlayer.
[9c20355] NewAudioEngineTest,TestControll crash fix.
[f114464] fixes an unused import.
[1dc5dab] Better algorithm for allocating PcmAudioPlayer.
[331a213] minor fix.
[e54084a] null -> nullptr
[f9a0389] Support uncache.
[89a364f] Removes unused update, and TODO uncache functionality.
[1732bf9] Supports AudioEngineImpl::setFinishCallback for android.
[43d1596] UrlAudioPlayer::stop fix.
[e2ee941] Test case fix in NewAudioEngineTest/AudioIssue11143Test
[5c5ba01] More fixes for making cpp-tests/New Audio Engine Test happy.
[8b554a3] Adds log while remove player from map.
[ed71322] If original file is larger than 30k bytes, consider it's a large audio file.
[fb1845a] Updates project.properties
[6f3839f] minor log output fix in AudioEngine-inl.cpp
[c68bc6c] Don't resample if the sample rate of the decoded pcm data matchs the device's.
[43ca45f] PcmAudioPlayers also need to be removed while they play over, but should not be deleted since their lifecycle is managed by PcmAudioPlayerPool.
[f5e63c9] Audio latency fix for Android. Support preload effects on Android now.
* Supports to loading audio files asynchronously.
* Crash fix for stop audio right after play2d.
* Minor fix for logic in AudioMixerController.cpp
* Adds missing files (CCThreadPool.h/.cpp).
* Minor fix for including.
* Minor fix for missing include <functional> in Track.h
* update license information in audio.h
* Don't use std::future/std::promise anymore since ndk counldn't support it well in armeabi arch.
* isSmallFile postion updated, fixes large audio file goto the checking logic of cache.
* std::atomic<int> isn't supported by ndk-r10e while compiling with `armeabi` arch, using a int with a mutex instead.
* fixes __isnanf & posix_memalign doesn't exist on low api (<=16) devices.
* namespace updated: cocos2d -> cocos2d::experimental
* Removes commented code in AudioMixerController.h/.cpp
* Removes unused code again, and fixes a memory leak of `Track` instance.
* Oops, namespace changed.
* Only outputs log in debug mode.
* Uses ALOGV for outputing logs in AudioEngine-inl.cpp
* const PcmData& -> PcmData for Track
* Fixes a protential crash in NewAudioEngineTest
* Adds `COCOS` prefix in header #ifndef COCOS_BALABALA #define COCOS_BALABALA
* Uses _ prefix for cocos code style instead of `m` prefix.
* Deletes AudioResamplerSinc related files.
* Bug fix from @minggo's reply on github.
* Don't need to invoke pause after in UrlAudioPlayer::prepare.
* Updates ThreadPool class, uses enum class and adds const keyword.
2016-07-18 10:22:40 +08:00
ef21e44d9c
Fixed to use cocosstudio LoadingBarReader with TexturePacker.
2016-07-17 16:30:17 +09:00
d931c62649
Fix typos in documentation comments
2016-07-16 04:18:40 +09:00
1544b8eed0
Merge pull request #16127 from mogemimi/add-missing-fclose
...
Add missing fclose() to fix a possible bug caused by PR #16114
2016-07-15 18:32:33 +08:00
8b289d2385
fix bug that virtual button is not hidden after keyboard dismissed
...
* fix compiling error with --android-studio
* hide virtual button after keyboard dismiss
* remove unneeded log
2016-07-15 18:25:48 +08:00
07d0b4412f
Add missing fclose() to fix a possible bug caused by PR #16114
2016-07-15 17:04:14 +09:00
38b3ab6853
Merge pull request #16114 from mogemimi/use-fstat-instead
...
Use fstat instead of fseek and ftell for performance and portability
2016-07-15 15:39:22 +08:00
9166c28e75
Merge pull request #16101 from mtak-/glprogram_buffer_overflow_fix
...
fix buffer over-read in CCGLProgram.cpp in memcmp call (Address Sanitizer...
2016-07-14 17:12:17 -07:00
1563d14447
Squashed commit of the following:
...
commit c8349caeca6ff5ebacf497eaa986e71d5f1c2c0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 14 11:19:50 2016 -0700
fix: works with odd sized maps
commit da4cf8bc19c9cdab148d60e03a25ee9cc4292b66
Author: zhangbin <zhangbin@cocos2d-x.org>
Date: Wed Jul 13 13:45:57 2016 +0800
Add test case.
2016-07-14 11:21:24 -07:00
9e80526251
#Use std::string reference instead of char* for utils::findChild ( #16117 )
...
* #Optimize, Use std::string reference instead of char* for utils::findChild
* Check Node::INVALID_TAG
* revert submodules
2016-07-14 13:52:30 +08:00
125b0601c3
Merge pull request #16091 from mtak-/data_clear_on_move
...
fix leak in Data on move assignment
2016-07-14 11:40:19 +08:00
8b05476d45
Use fstat instead of fseek and ftell for performance and portability
2016-07-14 01:18:44 +09:00
261f1ef780
Merge pull request #16094 from stevetranby/patch-1
...
Match parent's camera mask when adding child.
2016-07-13 16:33:17 +08:00
c5c846f6e1
Merge pull request #16107 from cezheng/fix/EaseExponentialOut_clone_crash
...
fix crash in EaseExponentialOut::clone()
2016-07-13 16:32:48 +08:00
98cc48bc62
Add missing override keyword
2016-07-13 15:03:53 +09:00
cf18857206
fix crash in EaseExponentialOut::clone()
2016-07-13 14:28:04 +09:00
1824b21cb7
Merge pull request #16090 from ricardoquesada/issue_15566
...
fixes issue #15566
2016-07-12 21:36:52 -07:00
8561e5f868
Merge pull request #16089 from mogemimi/avoid-double-promotion
...
Use std::abs to avoid overhead of casting float to double
2016-07-13 12:01:20 +08:00
05a772115e
fixes issue #15566
...
lua and javascript for arm64 is not compiled
version 103
uses JPEG 9b for android
using armeabi
uses Lua, and not LuaJIT for Android ARM64
2016-07-12 19:03:53 -07:00
15c6788783
fix buffer overflow in CCGLProgram.cpp in memcmp call (Address Sanitizer spots it easily)
...
- previously the flow went memcmp, if that != 0, do a bounds check, etc
- now do a bounds check, if destSize >= srcSize, do memcmp, etc
2016-07-12 11:10:16 -07:00
b9c78ac41c
Use std::abs to avoid overhead of casting float to double
2016-07-13 00:55:11 +09:00
c9ad76e56a
Fix a bug, in lua can't get the "backClicked" but a nil
...
in lua, I registerScriptKeypadHandler,when debug on Andriod, after clicking back button, I didn't get "backClicked",but a nil
I see that in CHANGELOG:
cocos2d-x-3.1 May.24 2014
[FIX] EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
so,I fix it , and get the right "backClicked"
2016-07-12 17:37:33 +08:00
c0e0931838
fix, replace std::sort by std::stable_sort ( #16092 )
...
* fix, replace std::sort by std::stable_sort
2016-07-12 13:46:38 +08:00
f162ffe2ae
Match parent's camera mask when adding child.
2016-07-12 00:07:41 -05:00
5ecd016a9e
fix leak in Data on move assignment
2016-07-11 15:33:51 -07:00
3aeefd911e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-11 07:54:54 +00:00
3d5789ee77
Merge pull request #16077 from mogemimi/fix-documentation-comments
...
Fix documentation when compile with -Wdocumentation and Clang
2016-07-11 15:49:28 +08:00
9c7d44ccd7
Merge pull request #16080 from minggo/use-std_abs
...
use std::abs instead
2016-07-11 12:02:10 +08:00
2ca1760b78
Merge pull request #16079 from minggo/use-std_srand
...
use std::srand() instead
2016-07-11 12:01:38 +08:00
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
a146f3eec7
use std::srand() instead
2016-07-11 11:17:28 +08:00
7531c5156b
Fix documentation when compile with -Wdocumentation and Clang
2016-07-10 17:38:32 +09:00
995868c62e
fix: Text::create() does not crash on mac/ios
...
...on invalid unicode.
fixes issue #16073
2016-07-08 16:59:44 -07:00
c267167d07
Merge pull request #16069 from minggo/ndkr12b-issue
...
fix compiling and linking error with ndk r12b
2016-07-08 17:01:09 +08:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
8d8c295ff0
Merge pull request #16062 from minggo/fileutils-issue
...
fix bug that FileUtils::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-08 14:54:25 +08:00
8fe92fbd4b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-07 19:04:04 +00:00
891fe706da
Merge pull request #16057 from ricardoquesada/issue_12226
...
test: add test case for Github issue #12226
2016-07-07 08:34:30 -07:00
836acff6d0
Merge pull request #16060 from minggo/merge-v312
...
Merge v312
2016-07-07 18:29:28 +08:00
4511b35b51
fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac
2016-07-07 17:43:19 +08:00
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
6d5a94e569
test: add test case for Github issue #12226
...
Adds test case for Github issue #12226
2016-07-06 16:37:15 -07:00
6ce7f3c0e9
Avoid overhead of casting float to double
2016-07-07 01:38:27 +09:00
8d6acd9ffe
Merge pull request #16050 from pandamicro/v3.12
...
[ci skip]Update JS versions
2016-07-06 17:04:42 +08:00
ccb30cefc7
Update JS versions
2016-07-06 17:02:53 +08:00
6248480b3a
Merge pull request #16047 from minggo/issue-14071
...
[ci skip]convert aplpha channel correctly
2016-07-06 15:59:50 +08:00
d0db838b71
convert aplpha channel correctly
2016-07-06 15:49:05 +08:00
418907d972
Merge pull request #16044 from pandamicro/v3.12
...
Improve web template and update web ref
2016-07-06 14:47:23 +08:00
305bd95dc2
More secure release in JSB_closeWindow
2016-07-06 13:55:18 +08:00
cf2646b7a2
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-06 02:16:03 +00:00
bed4e048b6
Fix various typos
2016-07-06 08:27:39 +09:00
2f1e14dcde
fix compiling error
2016-07-05 14:28:30 +08:00
4c2efb1319
don't read file content if it is empty
2016-07-05 14:27:28 +08:00
33d1eb4455
don't invoke front() if container is empty
2016-07-05 14:27:11 +08:00
e4aa6d1ef7
Merge pull request #16035 from minggo/issue-16032
...
remove extra '\'
2016-07-05 14:22:19 +08:00
0cc8b9fc09
Merge pull request #16031 from MrCapone/fix_GLView
...
GLView::setFrameSize fixed
2016-07-05 09:54:59 +08:00
1c9ad5594c
remove extra '\'
2016-07-05 09:50:38 +08:00
f666d99192
Merge pull request #16021 from yalab/cocosstudio_with_texturepacker
...
Fixed to use TexturePacker with cocosstudio.
2016-07-05 09:35:59 +08:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
0e64c2a071
GLView::setFrameSize fixed
2016-07-04 19:48:24 +07:00
b9d6f0d8d6
Merge pull request #16027 from CocosRobot/update_lua_bindings_1467596228
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 11:00:49 +08:00
ca8ff36f2e
Merge pull request #16016 from LeeMyoungYeol/v3
...
Update utils::getTimeInMilliseconds()
2016-07-04 10:55:41 +08:00
934b2413dc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-04 01:40:35 +00:00
8bbeb01be4
Merge pull request #16025 from mogemimi/fix-doc-typo
...
Fix typos and other mistakes in docs
2016-07-04 09:33:29 +08:00
b380df97c6
Merge pull request #16022 from mogemimi/fix-format-string
...
Fix format string warning when compiling with Android NDK
2016-07-04 09:31:45 +08:00
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
57900112c5
Fix format string warning when compiling with Android NDK
2016-07-03 17:19:17 +09:00
f30a7cf546
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-03 05:14:11 +00: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
f7d65fbe8a
Squashed commit of the following:
...
commit 3a8ccb54b58f01daaa5b17efcd0e1ab4b7ccf914
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 1 11:05:02 2016 -0700
Add support for Hex tiled maps
Based on original patch by https://github.com/JustVic
Original patch:
https://github.com/cocos2d/cocos2d-x/pull/13288
fix: tiled hex maps
Hexagonal TileMaps Support
fix: odd, even works as expected
still problems with rendering order
fix: fixes layer position in Hex
fix render ordering
2016-07-01 15:51:00 -07:00
c1949be617
Merge pull request #16017 from minggo/issue-15978
...
don't search APK if the path is absolute
2016-07-01 17:21:37 +08:00
12442521b2
don't search APK if the path is absolute
2016-07-01 15:42:02 +08:00
853e083c68
- The result comes across as negative.(device android)
2016-07-01 15:32:43 +09:00
2354df9faf
Fix getSubStringOfUTF8String bug
2016-07-01 15:16:35 +09:00
d02bdda781
Fix callfunc released with retained data (callback, target, extradata) issue
2016-07-01 10:56:17 +08:00
94de257115
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-01 02:16:32 +00:00
043d81be1c
Merge pull request #16008 from yalab/cocosstudio_with_texturepacker
...
cocosstudio can manage TexturePacker Image.
2016-07-01 10:10:09 +08:00
2610ad77cc
#15965 : remove unused _orderOfArrival ( #16009 )
2016-07-01 10:09:25 +08:00
c5648db10a
cocosstudio can manage TexturePacker Image.
2016-06-30 18:10:08 +09:00
274a82c7f5
[ci skip][AUTO]: updating luabinding & jsbinding automatically ( #16001 )
2016-06-29 22:56:13 +08:00
47442b9d8b
Merge pull request #15997 from mogemimi/fix-variable-names
...
Fix some minor typos in local variable names
2016-06-29 14:24:00 +08:00
ef01ac4465
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-29 04:47:21 +00:00
b1f93b2679
fix: not leak Toggle items
...
Github issue: fixes #13351
2016-06-28 20:41:47 -07:00
c0f2194961
Fix some minor typos in local variable names
2016-06-29 11:04:11 +09:00
7302ad979a
Can set scroll to item duration in ListView and derived classes ( #15964 )
...
* Can set scroll to item duration in ListView and derived classes (e.g. PageView)
* Parameter no more 'const'. Comments
2016-06-29 09:48:03 +08:00
ecf97575ad
Revert "Added CCGLViewImpl.h"
2016-06-29 09:45:05 +08:00
feb513c7eb
Merge pull request #15982 from mogemimi/fix-typo
...
Fix typo: destoryMark -> destroyMark
2016-06-29 09:41:59 +08:00
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
8598003b55
Added CCGLViewImpl.h ( #10501 )
...
* Added CCGLViewImpl.h for more consistency
* fixed indentation
2016-06-29 09:36:13 +08:00
2060b333ca
Fix typo: destoryMark -> destroyMark
2016-06-29 10:04:31 +09:00
0c290540df
Merge pull request #9823 from ericmux/frame-independent-ms
...
Making CCMotionStreak _maxPoints framerate independent.
2016-06-28 18:29:14 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
d46cd96896
Don't warn user about API deprecation
2016-06-28 12:11:21 +08:00
e7e365a00f
Fix window.close crash in JSB
2016-06-28 11:59:55 +08:00
2a853ba73e
Avoid const_cast when calling Node::setAdditionalTransform
2016-06-27 19:33:45 +09:00
d7cb7676bc
Merge pull request #15966 from mogemimi/improve-refptr
...
Improve RefPtr to avoid casting when possible
2016-06-27 10:07:54 +08:00
a287e696c9
Improve RefPtr to avoid casting when possible
2016-06-26 21:39:43 +09:00
b6fa894f81
Fix page view indicator opacity for inactive pages
2016-06-25 18:49:13 +02:00
bc51528301
Fix typo in FileUtils::Status enum
2016-06-25 12:58:55 +09:00
04a01b65f4
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
Github issue #15934
2016-06-24 11:44:55 -07:00
4f973044ac
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
github issue #15934
2016-06-24 11:40:13 -07:00
26fb64395a
Merge pull request #15954 from pandamicro/v3.12
...
Fix easing action crash because the js object is not rooted
2016-06-24 17:21:41 +08:00
0872cccd67
fix: collection of vr fixes ( #15948 )
...
* fix: collection of vr fixes
* Node::additionalTransform() and Node::setNodeToParentTransform() can be used at the same time
* Node allocs _additionalTransform in runtime taking 60 bytes lees for 99% of the nodes
* Node calculates the transform faster when an additionalTransform is being used
* VR works when the camera is being moved manually with setNodeToParentTransform
* VR has its own tests
* VR can be disabled and works as expected
* doc: documentation for the new fix
* fix: restore submodule web
* fix: compile and link on iOS
* fix conflicts
2016-06-24 16:55:28 +08:00
8cb2e93644
Fix easing action crash because the js object is not rooted
2016-06-24 14:38:59 +08:00
0dce4961ee
Avoid implicit conversion from size_t to int
2016-06-24 15:15:45 +09:00
2931b310cf
Merge pull request #15942 from zilongshanren/improveEditBox
...
Improve edit box
2016-06-24 10:27:22 +08:00
b29fbf0fc8
Merge pull request #15885 from Sumxx/v3
...
fix restart game crash in FT_Get_Char_Index
2016-06-24 10:08:32 +08:00
69d2ac1786
fix: collection of vr fixes ( #15947 )
...
* fix: collection of vr fixes
Node: additionalTransform() has its own dirty variable
VR: disabling VR works as expected
VR: works with camera3d test
VR: iOS Tracking works even if it doesn't have any input
fix: setNodeToParentTransform() and setAdditionalTransfrom() work...
...at the same time.
Also, this PR makes the size of Node smaller. `_additionalTransform` is
no longer an inline object.
Instead, it is allocated on demand making 99% of the Nodes smaller by 60
bytes.
fix: compile in windows
* doc: documentation for this fix
2016-06-24 10:03:38 +08:00
86af4cdab8
Merge pull request #15897 from halx99/patch-4
...
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
dbc083b924
Merge pull request #15939 from halx99/patch-2
...
Optimize, remove unnecessory truncate.
2016-06-24 09:54:57 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
b7982fd8e0
Fix -Wreturn-type warnings when compiling JSB with Clang
2016-06-24 08:48:21 +09:00
e681a9b5d1
fix: fix delay when creating QuadCommands
...
starts with a bigger buffer, and also increases buffer by 25% if needed.
triggered by particles.
Github issue #15937
2016-06-23 09:19:21 -07:00
9e0371a3b8
fix: fix delay when creating quadcomamnds
...
triggered by particles.
Github issue #15937
2016-06-23 09:17:26 -07:00
459b7f30c6
refactoring Android editbox setVisible API
...
fix set visible issue of android editbox
fix android lower case multiline
revert unkown changes
2016-06-23 18:18:39 +08:00
cd93612746
Optimize, remove unnecessory truncate.
2016-06-23 16:01:05 +08:00
a6b0ea76de
improve editbox test and font creation
2016-06-23 15:57:41 +08:00
ee7ceee007
Merge pull request #15874 from mogemimi/fix-unused-variable
...
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
08898db883
Merge pull request #15831 from j-jorge/premultiplied-alpha-config
...
Add a config option to enable or disable the premultiplied alpha code.
2016-06-23 13:57:41 +08:00
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
bac1870d16
fix android editbox custom font file ( #15924 )
...
* fix android editbox custom font file
* simplify get real font name on Android
2016-06-23 11:26:32 +08:00
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
597fb61a78
Merge pull request #15922 from dumganhar/fix/lua-binding
...
Some lua bindings fixes:
2016-06-23 10:00:45 +08:00
ec5155137f
Merge pull request #15933 from ricardoquesada/issue15932
...
fix: not crash after removing a physics body right after...
2016-06-22 15:28:56 -07:00
ff71ffae84
fix: not crash after removing a physics body right after...
...
adding it.
2016-06-22 14:12:27 -07:00
a31279f8cb
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:28:58 -07:00
edafe726cc
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:22:47 -07:00
7828b505fe
Merge pull request #15925 from minggo/andriod-preload
...
[ci skip]return true for preload though it is not implemented
2016-06-22 18:19:09 +08:00
82597d4305
Merge pull request #15920 from dumganhar/fix/particle
...
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 18:10:55 +08:00
324931a242
Merge pull request #15919 from zilongshanren/fix-android-system-fontname
...
fix system font creation on Android platform
2016-06-22 18:10:13 +08:00
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
465da95c01
return true for preload though it is not implemented
2016-06-22 17:41:04 +08:00
09d5fd3f90
Fix ParticleSystem::_paused varible isn't initialized. Particle will show or hide after being created randomly.
2016-06-22 16:54:57 +08:00
783dfb3f14
fix system font name on Android ttf creation
2016-06-22 16:54:01 +08:00
67dd4b0684
JSScript* may be garbage collected before the next time execute the same JS file.
...
It will crash in JS_ExecuteScript.
2016-06-22 16:18:20 +08:00
9fd190d283
Merge pull request #15916 from dumganhar/fix/AssetsManager
...
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 15:25:18 +08:00
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
4a5bedc6e6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-22 05:52:51 +00:00
9d0801834e
Merge pull request #15893 from halx99/patch-1
...
Optimize, avoid unnecessary memory alloc & copy
2016-06-22 13:44:40 +08:00
cdc3b2b9f1
Merge pull request #15903 from minggo/fileutil-directory-exists
...
should use full path to check directory
2016-06-22 13:40:07 +08:00
cffc9cecd7
cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this.
2016-06-22 11:05:04 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
6b9c76fd93
should use full path to check directory
2016-06-22 10:19:35 +08:00
414f1d4252
fix: little menu fixes
...
does not execute `dynamic_cast<>` in release mode
uses for(:) instead of the old way
2016-06-21 16:46:27 -07:00
2d3785c03d
fix tizen compile error
2016-06-21 19:50:00 +08:00
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
654d17d27c
Update CCFontFNT.cpp
2016-06-21 11:25:11 +08:00
51ba45ae26
Optimize, avoid unnecessary memory alloc & copy
2016-06-21 10:52:25 +08:00
ca677f2be1
fix: not crash if CC_SPRITE_DEBUG_DRAW is enabled in SpriteBatchNode
...
`SpriteBatchNode` was trying to render `DrawNode` when
`CC_SPRITE_DEBUG_DRAW` was enabled.
Github issue #14730
2016-06-20 19:13:53 -07:00
6fb3946c51
Add a config option to enable or disable the premultiplied alpha code.
2016-06-20 18:05:11 +02:00
ad28d44d2f
Merge pull request #15878 from cezheng/build_for_android6/downloader
...
fix downloader build issue for Android API 23
2016-06-20 13:38:22 +08:00
f0028e5459
Fix unused variable warnings when compiling release mode
2016-06-20 09:23:42 +09:00
4700bbce43
fix restart game crash in FT_Get_Char_Index
2016-06-19 03:22:57 +08:00
35008702bf
fix: underline will have the same solor as text in TTF
...
underline will have the same solor as text in TTF when calling
`setColor`. There is another method called `setTextColor` which is
confusing. What does each function?
github issue #15214
2016-06-17 17:23:59 -07:00
d9b3ef55ae
Merge pull request #15880 from ricardoquesada/issue-15776
...
fix: TextureCache ASSERTS if image is invalid
2016-06-17 16:48:19 -07:00
c387f953fa
fix: TextureCache ASSERTS if image is invalid
...
Github issue #15776
2016-06-17 16:07:33 -07:00
84db1ac294
fix downloader build issue for Android API 23
...
fixes #15823
2016-06-17 22:32:49 +09:00
ed955cbe1d
update version
2016-06-17 18:09:27 +08:00
4c233b8df7
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-17 02:22:58 +00:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
e9cf762304
Merge pull request #15866 from minggo/remove-compiling-flag
...
remove gcc comipling flag
2016-06-17 09:39:18 +08:00
6280b8a376
Merge pull request #15870 from mogemimi/fix-unused-function
...
Remove unused debug function in RenderCommand
2016-06-17 09:38:32 +08:00
44ced37785
Merge pull request #15825 from dumganhar/iss15652-perf-fix
...
issue #15652 : fix low FPS on some android devices while auto batch is disabled.
2016-06-17 09:37:42 +08:00
0872a50f60
Remove unused debug function in RenderCommand
2016-06-17 03:19:19 +09:00
08ed2eccd2
fix: using `enum class` instead of `typedef enum`
2016-06-16 07:02:04 -07:00
832ec5eab4
remove gcc comipling flag
2016-06-16 16:14:50 +08:00
0db0a45fa0
Merge pull request #15863 from zilongshanren/fix-word-clamp-with-only-one-word-left
...
fix TTF and BMFont word wrap
2016-06-16 15:01:27 +08:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
d66b686bd8
Merge pull request #15816 from yalab/valuemap_reject_none
...
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-16 14:20:46 +08:00
f0f8663fa9
fix TTF and BMFont word wrap
2016-06-16 14:15:00 +08:00
01aaff66c8
Fix -Wsometimes-uninitialized warning in release build
2016-06-16 14:27:52 +09:00
5fa57ae5c1
Merge pull request #15844 from halx99/patch-1
...
fix: missing properties for clone
2016-06-16 11:15:13 +08:00
ab0e461b00
Merge pull request #15852 from MSOpenTech/v3-winrt-x64
...
V3: updated to support Windows 10 UWP x64 builds
2016-06-16 11:08:28 +08:00
d8bd0ff8c8
Merge pull request #15855 from mogemimi/fix-possible-leak
...
Fix possible memory leak when pass initialization fails
2016-06-16 11:04:03 +08:00
cc2b887dbb
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-16 02:58:46 +00:00
b0f3d43414
Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb
...
RenderTexture - set opacity modify RGB
2016-06-16 10:52:21 +08:00
9e40fffb13
fix: remove liboculus
2016-06-15 17:53:01 -07:00
4f329d8aac
Fix possible memory leak when pass initialization fails
2016-06-16 04:52:38 +09:00
ccfbc29288
fix travis error
2016-06-15 12:08:40 -07:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
53321e401a
updated to support Windows 10 UWP x64 builds
2016-06-15 08:50:04 -07:00
fc44d0deed
Merge pull request #15850 from minggo/hide-virtual-button
...
[ci skip]hide virtual button correctly
2016-06-15 18:38:59 +08:00
7bf13f34cd
hide virtual button correctly
2016-06-15 18:33:52 +08:00
7214173e98
Added Particle Emitter Pause option, and tests ( #15836 )
...
* Added Particle Emitter Pause option, and tests
* private field emitter => _emitter
isPaused changed to const
removed erroneously added spaces
renamed unPauseEmissions => resumeEmissions
2016-06-15 18:31:10 +08:00
8c9019b128
Merge pull request #15848 from minggo/hide-virtual-button
...
[ci skip]hide virtual button if has focus
2016-06-15 18:20:53 +08:00
d94dc7edc0
hide virtual button if has focus
2016-06-15 18:19:06 +08:00
3807a2f678
Merge pull request #15847 from minggo/hide-virtual-button
...
[ci skip]hide virtual button by default
2016-06-15 18:08:00 +08:00
a8c6011f66
use android sdk 19
2016-06-15 18:06:53 +08:00
8634773be3
hide virtual button by default
2016-06-15 17:55:26 +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
dd6fed7928
Fixed ClippingNode not cleaning up _stencil correctly ( #15814 )
...
* Fixed ClippingNode not cleaning up _stencil correctly
_stencil may be running due to onEnter() called by ClippingNode. If onExit() is not called then Node::~Node() will assert when _stencil is released.
* Added onEnterXXX to ClippingNode::setStencil()
ClippingNode::_stencil would not be initialised correctly when set after ClippingNode was adding to the active scene.
2016-06-15 14:55:29 +08:00
dafa8054bf
fix: missing properties for clone
...
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
2016-06-15 14:39:18 +08:00
7c4b7e1bf1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-15 02:49:50 +00:00
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +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
7d6d677983
RenderTexture - set opacity modify RGB
2016-06-13 23:07:17 +03:00
10418676ca
Remove duplicate header includes in cocos2d.h
2016-06-13 19:11:05 +09:00
da2ea7e08b
Merge pull request #15794 from TheCodez/cachetexture
...
UIScrollbar and UIPageViewIndicator cache base64 Texture now #15780
2016-06-13 17:31:12 +08:00
126b60945e
issue #15652 : fix low FPS on some android devices while auto batch is disabled.
2016-06-12 11:35:30 +08:00
109f572bf6
Merge pull request #15807 from mogemimi/add-switch-default-case
...
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-12 10:37:05 +08:00
598be0840c
Fixed to fail FileUtils::writeValueMapToFile on iOS.
2016-06-10 14:53:11 +09:00
07e0c1cbf9
Fix typo in method name: 'destory' -> 'destroy'
2016-06-09 09:25:06 +09:00
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
363beb436d
Merge pull request #15790 from dumganhar/profiling-fix
...
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-08 10:55:54 +08:00
93d87ad19e
android supports LOWERCASE_ALL_CHARACTERS
2016-06-07 12:41:22 +08:00
7e1da2188c
ios supports LOWERCASE_ALL_CHARACTERS
2016-06-07 10:31:16 +08:00
7885f55ce5
Cache bas64 images
2016-06-06 16:32:50 +02:00
4f2b4559b6
Compilation fix while CC_ENABLE_PROFILERS = 1
2016-06-06 16:25:00 +08:00
3b4f2c38dd
Merge pull request #15788 from minggo/editbox-capital-issue
...
[ci skip]not use capital letters by default
2016-06-06 14:00:32 +08:00
7e2f79ce8f
not use capital letters by default
2016-06-06 13:55:20 +08:00
264bf87c87
Merge pull request #15784 from mogemimi/fix-unused-param
...
Fix unused parameter warning when compiling CCArray
2016-06-06 10:13:28 +08: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
a22302e2ee
Fix unused parameter warning when compiling CCArray
2016-06-04 21:17:53 +09:00
cf80eb18b1
Merge pull request #15777 from pandamicro/v3
...
Fix scheduler callback target lost issue
2016-06-03 14:05:32 +08:00
5cd4c8aaca
Merge pull request #15778 from minggo/scriptingcore-issue
...
avoid to access invalid memory
2016-06-03 14:04:17 +08:00
388eeed014
Suppress '-Wundefined-bool-conversion' warnings on Android NDK with Clang ( #15775 )
2016-06-03 13:42:44 +08:00
b7b74f2328
avoid to access invalid memory when received data length is the same as buffer size
2016-06-03 11:39:01 +08:00
3597ce7c43
Fix scheduler callback target lost issue
2016-06-03 11:01:06 +08:00
612cd7b82f
Fixed behavior of "cc.isObject" function for undefined and null values. ( #15085 )
...
* Fixed wrong behavior of "cc.isObject" function for undefined and null values.
* Simplify 'cc.isObject' function
* Remove double return in 'cc.isObject'
2016-06-03 09:45:32 +08:00
29cca63822
Texture2D::addImageAsync : Set pixel format correctly. ( #15774 )
2016-06-03 09:38:01 +08:00
c7c67144b7
Merge pull request #15769 from pandamicro/v3
...
Fix scheduler callback target lost issue
2016-06-03 09:29:01 +08:00
9322ecc937
Merge pull request #15768 from minggo/issue-15738
...
add a new create method to create resizable window
2016-06-03 09:28:40 +08:00
da114e13d1
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-06-02 09:16:13 +00:00
dd1c87a1e0
Merge pull request #15764 from AlexanderShniperson/listview_select_item
...
ListView select item programmatically
2016-06-02 17:09:49 +08:00
35730063f1
Merge pull request #15766 from mogemimi/fix-unused-param
...
Fix unused parameter warning
2016-06-02 17:06:02 +08:00
75227a5c0e
[desktop]fix the bug the depth test is disabled when application size changed
2016-06-02 16:18:31 +08:00
d1e9a149c4
Fix scheduler callback target lost issue
2016-06-02 16:02:29 +08:00
7243b00cad
add a new create method to create resizable window
2016-06-02 15:48:16 +08:00
bd00b2f261
Fix unused parameter warning
2016-06-02 15:30:24 +09:00
07c5e528e7
ListView select item programmatically
2016-06-02 10:11:28 +04:00
66217b7bd1
Merge pull request #15761 from dumganhar/set-blending-fix
...
SetBlending fix
2016-06-02 11:01:50 +08:00
827aa803a4
Merge pull request #15755 from mogemimi/remove-c99-macros
...
Remove unnecessary sinf, cosf, tanf and sqrtf macros
2016-06-02 11:00:51 +08:00
1d42bae8c5
Merge pull request #15735 from MrCapone/v3
...
AudioEngine-linux fix: add map contains IDs of preloaded files
2016-06-01 21:34:15 +08:00
3d116c3333
SetBlending fix
2016-06-01 17:46:27 +08:00
6f79082c6a
Merge pull request #15754 from minggo/linux-compiling-error
...
use std::isnan instead of isnan to fix compiling errors
2016-05-31 09:22:05 +08:00
a4a357db69
Remove unnecessary sinf, cosf, tanf and sqrtf macros
2016-05-31 02:39:40 +09:00
3810854c45
use std::isnan instead of isnan to fix compiling errors
2016-05-30 18:19:10 +08:00
4f0869e51e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-30 09:27:04 +00:00
3521e605f8
Merge pull request #15723 from urokuta/issue-9367
...
#9367 blend mode does not work with animated sprite
2016-05-30 10:53:15 +08:00
fa4bfe43d8
fix AudioEngine bug for iOS, UTF8 filePath ( #15743 )
...
* fix AudioEngine bug for iOS, UTF8 filePath
Fix bug for apple platform, open audio file failed with chinese App Name.
* Update AudioPlayer.mm
2016-05-30 10:47:48 +08:00
67c95549b3
Merge pull request #15744 from mogemimi/fix-refptr-warnings
...
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-30 10:45:28 +08:00
c647a95656
Fix C4267 and C4309 warnings when compiling for Windows 10 UWP
2016-05-29 14:43:28 +09:00
69974ab06f
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-28 22:15:56 +09:00
74fe77a367
Merge pull request #15737 from yalab/slicent_warning_android_clang
...
It mute warning on android clang.
2016-05-27 16:46:50 +08:00
533636e63a
Merge pull request #15726 from minggo/v3.11.1
...
merge v3.11.1 to v3
2016-05-27 16:45:04 +08:00
3ea46c617f
It mute warning on android clang.
2016-05-27 15:39:33 +09:00
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
127f718dfc
Merge pull request #15728 from mogemimi/remove-duplicate-includes
...
Remove duplicate header includes
2016-05-27 14:25:39 +08:00
103bdb3d37
fix conflict
2016-05-27 14:22:03 +08:00
80039c4aee
Merge pull request #15731 from minggo/jsb-debug-issue
...
fix the bug that will lost message if only received one message
2016-05-27 09:46:36 +08:00
fc6c612c4c
Remove duplicate header includes
2016-05-26 23:25:44 +09:00
1a7c22bd97
Merge pull request #15594 from yutaka-takeda-drecom/fix/sprite3d_singlesprite_bug
...
CCSprite::createNode bug fix.
2016-05-26 08:59:46 -03:00
5b02460989
AudioEngine-linux fix: add map contains IDs of preloaded files
2016-05-26 17:57:56 +06:00
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
f9415734f2
Merge pull request #15732 from zilongshanren/fix-actionNode-studio
...
fix actionNode studio 1.6 parser error
2016-05-26 18:17:25 +08:00
13003d9a78
Merge pull request #15727 from dumganhar/editbox-fix
...
Make sure closeKeyboard run on UI thread
2016-05-26 18:08:03 +08: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
517cb9e437
Merge pull request #15729 from dumganhar/editbox-fix-2
...
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 17:24:09 +08:00
3e941be0ce
fix actionNode studio 1.6 parser error
2016-05-26 17:20:51 +08:00
031e329d64
fix the bug that will lost message if only received one message
2016-05-26 16:32:10 +08:00
d42b99b10b
fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread.
2016-05-26 15:49:57 +08:00
cf883b5c0f
UI thread check.
2016-05-26 12:02:23 +08:00
a472ab2931
Make sure closeKeyboard run on UI thread
2016-05-26 11:57:57 +08:00
1f2dea7974
Merge pull request #15724 from dumganhar/catch-exception
...
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 11:20:14 +08:00
5321a2fc7a
Removes unused package import for Cocos2dxSound.java.
2016-05-26 11:15:44 +08:00
5e8eee2c76
Merge pull request #15721 from mogemimi/fix-minor-typo
...
Fix minor typo: Texure -> Texture
2016-05-26 10:58:55 +08:00
aab8ea5094
Fix android compilation issue with thumb mode
2016-05-26 10:50:19 +08:00
7073a1c90c
Merge pull request #15718 from pandamicro/v3
...
Fix some small issues
2016-05-26 10:46:54 +08:00
1285954cd9
Try catch IllegalStateException in Cocos2dxMusic.java.
2016-05-26 10:25:45 +08:00
072592d6e3
update version
2016-05-26 10:18:45 +08:00
785d02a818
#9367 blend mode does not work with animated sprite
2016-05-26 09:39:48 +09:00
b2c7358370
Merge pull request #15722 from ricardoquesada/issue_15154
...
Fix crash on windows when using PolygonInfo
2016-05-25 21:25:31 -03:00
906967c53a
fix: make it compile on iOS and Mac
2016-05-25 20:00:48 -03:00
f6bee1abc2
Fix minor typo: Texure -> Texture
2016-05-26 02:36:15 +09:00
26781ee592
fixed array overrun in triangulate()
2016-05-25 10:14:09 -07:00
ea6a6a8586
Reverse include path in network module and update web engine
2016-05-25 23:58:11 +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
4e92b82571
Merge pull request #15716 from cezheng/bug/ios_httpclient_ssl
...
correct assign to equal in cert trust expression
2016-05-25 18:44:01 +08:00
2c05ecc3cd
Fix Component event issue
2016-05-25 18:36:02 +08:00
896aeb2d0c
Fix android compilation issue with thumb mode
2016-05-25 18:35:38 +08:00
c4a40618f5
Merge pull request #15715 from dumganhar/dlfree-fix
...
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 18:34:29 +08:00
e4bf6584db
correct assign to equal in cert trust expression
2016-05-25 18:34:05 +09:00
47891b81af
Merge pull request #15712 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL
2016-05-25 13:56:52 +08:00
c8c57696be
Merge pull request #15705 from minggo/jsb-debug-issue
...
lock mutext to get element from g_queue
2016-05-25 13:55:34 +08:00
1db3c1644d
dlfree fix for HttpClient, the instances of Ref or its sub classes should be released by CC_SAFE_RELEASE rather than CC_SAFE_DELETE.
2016-05-25 13:54:13 +08:00
9ad3db0635
fix: make PolygonCode cleaner
...
not sure if this fixes the bug, but it makes the interfaces cleaner.
Github issue #15154
2016-05-24 20:57:40 -03:00
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
23c5c18c91
Merge pull request #15646 from Rypac/fix_quadcommand_crash
...
Fix crash due to reallocation of shared indices memory
2016-05-24 11:29:28 -03:00
02a9c9aae3
fix: update damping in physics
...
github issue #15630
2016-05-24 10:53:23 -03:00
5daaa6e49b
Adding setBounce to webview ( #15623 )
...
* Adding setBounce to webview
This makes the .bounces of the scrollview section of webview publically accessible
When set to true it stops the grey over scroll of webviews
* Adding empty function for setBounces to Android
* Adding empty setBounces function for tizen
* Adding comments for empty Android and Tizen setBounce functions
* Small comment text change
2016-05-24 18:27:59 +08:00
fff7a78efe
lock mutext to get element from g_queue
2016-05-24 15:59:00 +08:00
38fd8ebca9
Fix typo in function name: Keybard -> Keyboard
2016-05-24 10:14:36 +09:00
b8e7f37eaf
Merge pull request #15640 from xpol/better-lua-print
...
Print as Lua 5.1 does and remove duplicate code.
2016-05-23 18:42:23 +08:00
758425cfd5
Refactor CCFileUtils-apple to remove code duplication ( #15645 )
...
* Refactor CCFileUtils-apple to remove code duplication of conversion from CCValue to NSObject and vise versa
* CCFileUtilsApple: rename helper functions
2016-05-23 18:26:19 +08:00
16a1605927
Merge pull request #15690 from halx99/patch-2
...
change if (fontName.c_str()) to if(!fontName.empty())
2016-05-23 16:04:14 +08:00
5caea3a197
Merge pull request #15692 from mogemimi/prevent-c4996-warning
...
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-23 14:14:38 +08:00
b6d72e33d8
Fix password style text in UTF-16 ( #15620 )
...
* Fix password style text in UTF-16
Label used UTF-16 in internal.
Need string in UTF-8.
* Set correct char for Max and iOS
* Add test for TextFiledTTF Secure Text Entry
2016-05-23 09:48:15 +08:00
ad3c305172
Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition()
2016-05-22 07:05:35 +09:00
86d148c24c
change if (fontName.c_str()) to if(!fontName.empty())
...
fix warnning, change if (fontName.c_str()) to if(!fontName.empty()), The first expression's value always true.
2016-05-20 23:10:28 +08:00
2c9716d714
Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
...
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
797cd50a6e
Merge pull request #15683 from hopstertv/enable-webview-local-storage-on-android
...
Enable WebView's local storage on Android
2016-05-20 14:40:22 +08:00
0f3b36e834
Fix gcc warnings and type mismatch issues in AudioEngine for Linux
2016-05-20 01:39:40 +09:00
21fc67b358
Enable WebView's local storage on Android
...
Problem:
cocos2d::experimental::ui::WebView' local storage wasn't working on
Android. On iOS worked fine.
Solution:
Enable local storage of android.webkit.WebView in Android.
References:
https://developer.android.com/reference/android/webkit/WebSettings.html
http://stackoverflow.com/questions/5899087/android-webview-localstorage
2016-05-19 14:43:35 +01:00
3db84916d1
Merge pull request #15677 from mogemimi/refactor-audioengine
...
Refactor the AudioEngine-Linux to make more maintainable
2016-05-19 18:07:45 +08:00
9c0acf1e5d
Merge pull request #15619 from VisualSJ/v3_audio
...
audio search path (android)
2016-05-19 18:06:58 +08:00
b154f274a5
Merge pull request #15410 from 1scaR1/up_v3
...
Make PageView indicator more tunable
2016-05-19 16:19:18 +08:00
09d839be35
Format the code to better align with cocos2d-x code style
2016-05-19 05:17:33 +09:00
7b61aca64e
Fix indentation and remove trailing whitespaces
2016-05-19 03:42:34 +09:00
3a80e7d8fb
Change 2 spaces to 4 spaces indentation
2016-05-19 03:34:04 +09:00
03be0de2fa
Remove unnecessary trailing semicolons
2016-05-19 01:40:00 +09:00
36113f507e
add comments for ps.
2016-05-18 22:25:43 +08:00
9223d1d917
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
...
fix tizen related issues
2016-05-18 17:20:19 +08:00
c4e6db4e9b
fix tizen related issues
2016-05-18 16:26:13 +08:00
a03c45ce62
Update network licenses and reformat
2016-05-18 14:29:54 +08:00
c6034787e4
Merge pull request #15664 from mogemimi/replace-ccassert-macro
...
Replace CCAssert macros with CCASSERT
2016-05-18 11:57:18 +08:00
a54251b854
Merge pull request #15659 from mogemimi/use-const-reference
...
Use const references whenever possible
2016-05-18 11:55:55 +08:00
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
3e396fedab
Merge pull request #15617 from pandamicro/v3
...
Some modifications merged from Creator
2016-05-17 13:43:41 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
c96bd9a4df
Resolve local reference leak and function order
2016-05-17 12:06:28 +08:00
601460682e
Merge pull request #15641 from mogemimi/add-missing-references
...
Add missing references to avoid unnecessary copies
2016-05-17 10:28:08 +08:00
abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
a1a8feed71
Add missing references to avoid unnecessary copies
2016-05-17 01:15:07 +09:00
9203630583
Merge pull request #15651 from zilongshanren/fixNativeCotnrolIssuesV2
...
fix UI native control onEnter issue
2016-05-16 16:58:32 +08:00
3ae5b1075b
fix native control onEnter issue
2016-05-16 16:14:16 +08:00
88db5d3660
use AF_UNSPEC to support ipv6
2016-05-16 15:15:29 +08:00
2b480a75bf
use AF_UNSPEC to support ipv6
2016-05-16 14:45:09 +08:00
8ca09f7c2a
Fix crash due to reallocation of shared indices memory
2016-05-15 12:30:30 +10:00
a7d9dd9a75
Print as Lua 5.1 does and remove duplicate code.
2016-05-14 14:09:58 +08:00
16878a53b1
Suppress MSVC warning C4800
2016-05-13 11:44:17 +09:00
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
ada1d1dfe8
audio search path (android)
2016-05-11 17:24:14 +08:00
6b59dc24c7
Add Image::setPNGPremultipliedAlphaEnabled
2016-05-11 16:36:21 +08:00
1023c8730e
[JSB] Made cc.log overwrite-able
2016-05-11 11:58:24 +08:00
1cbbde5d8b
Fix android LocalStorage return null for empty string value
2016-05-11 11:57:54 +08:00
48937ca3e6
disable new JSB memory model by default
2016-05-11 11:10:11 +08:00
bb5d1a5e97
Merge pull request #15607 from minggo/iss-15413
...
remove Content-Type limitation
2016-05-11 10:57:34 +08:00
2ad6f10bb6
Merge pull request #15609 from pandamicro/v3.11
...
Fix web engine issues and SocketIO connection fail issue
2016-05-11 09:28:24 +08:00
85812b4f5b
Remove client_no_context_takeover extension in WebSocket (not working on Android/iOS/Mac)
2016-05-10 20:35:02 +08:00
fd160a1611
remove Content-Type limitation
2016-05-10 18:15:57 +08:00
27060e43b7
Merge pull request #15590 from ntotani/v3
...
add missing lua const values
2016-05-10 14:55:53 +08:00
36ad79761f
Merge pull request #15596 from dabingnn/v3_fix_animation3D_bug
...
fix animate 3d bug
2016-05-10 14:11:01 +08:00
f4a7ba836c
Merge pull request #15599 from Naruto/feature/fix_build_error_using_fileutils-apple
...
fix build failed using FileUtilsApple on Application code.
2016-05-10 12:07:16 +08:00
79b9a191d0
declare explicitly FileUtilsApple destructor
2016-05-09 21:50:52 +09:00
d086965683
Merge pull request #15598 from minggo/android-package-name
...
[ci skip]set correct package name
2016-05-09 18:17:28 +08:00
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
e8acf38212
fix animate 3d bug
2016-05-09 15:21:19 +08:00
d17fdfe3cc
CCSprite::createNode bug fix.
2016-05-09 15:42:39 +09:00
bbbb7e498d
Prevent variable shadowing warnings
2016-05-08 12:32:36 +09:00
5d7cbe622a
Merge pull request #15589 from pandamicro/v3.11
...
Add cc.game.end to close game window
2016-05-07 22:11:46 +08:00
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
04ebba425f
add missing lua const values
2016-05-07 16:23:23 +09:00
d0fc3ec4c4
Add cc.game.end to close game window
2016-05-07 14:37:36 +08:00
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
f34acca188
Merge pull request #15575 from stevetranby/capturescreen-drain-autorelease
...
Prevent memory leak: force drain on autoreleased `data`.
2016-05-06 16:57:29 +08:00
d72fadf6cc
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-06 05:44:31 +00:00
38631ab655
Merge pull request #15576 from minggo/sync-15066
...
Fix setPhysicsBody method
2016-05-06 13:38:53 +08:00
694259bf80
Suppress warning C4800 on MSVC
2016-05-06 12:30:16 +09:00
4de7ef1515
Fix setPhysicsBody method
2016-05-06 09:29:57 +08:00
7c1e60f0b7
Prevent memory leak: force drain on autoreleased `data`.
2016-05-05 08:00:28 -06:00
9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
0445e7c562
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-05-05 03:07:58 +00:00
44063b8e85
Merge pull request #15568 from zilongshanren/fix-jsb-related-issues
...
fix jsb 3.11 related issues
2016-05-05 11:01:44 +08:00
e2c38ed87f
make std::isnan work for winrt
2016-05-05 10:29:31 +08:00
8c046fea92
fix jsb 3.11 related issues
2016-05-05 10:20:00 +08:00
03b38bcee2
Merge branch 'fix_isnan' of https://github.com/gelldur/cocos2d-x into issue-15522
2016-05-05 10:17:17 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
fcfaafa4a5
Fix SocketIO fail to connect issue on Android
2016-05-04 17:43:36 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
9ff61f915c
Add findChild for cocos2d::utils ( #15548 )
...
* Add searchNode for cocos2d::utils
Add searchNode for cocos2d::utils
* fix compile error on win32_bak
* convert line terminates to unix sytle.
* Rename searchNode to findChild, and etc.
* fix compile error.
2016-05-04 09:46:00 +08:00
0eb25af347
Merge pull request #15555 from mogemimi/remove-c-str-calls
...
Reduce unnecessary c_str() calls
2016-05-04 09:43:01 +08:00
4766e0dd9b
Merge pull request #15545 from minggo/isse-15540
...
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
6260c67941
Merge pull request #15549 from minggo/issue_15525
...
use std::atof() instead
2016-05-04 09:38:42 +08:00
1a76c9ea3b
Add OBB (zip) support ( #15515 )
...
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.
* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
8429b34010
Reduce unnecessary c_str() calls
2016-05-04 04:18:25 +09:00
2901f0aea6
fix display.wrapScene()
2016-05-03 21:37:15 +08:00
3d6bddd2c7
Merge pull request #15465 from cezheng/fix/several_network_bugs
...
[BugFixes]Several serious bug fixes related to network/asset_manager
2016-05-03 17:37:32 +08:00
1bf56d5a78
use std::atof() instead
2016-05-03 15:50:06 +08:00
f2e5eb332a
Merge pull request #15546 from minggo/issue_15526
...
fix memory leak
2016-05-03 14:02:38 +08:00
fba4bead70
fix memory leak
2016-05-03 11:24:22 +08:00
d41207e99a
avoid remove event listener multiple times
2016-05-03 10:56:03 +08:00
9f678f2f27
Merge pull request #15541 from cocos2d/fix-doxygen-mistakes
...
Fix doxygen format mistakes in enum class Platform
2016-05-03 09:38:58 +08:00
6433172fae
Fix shadow variable warning in GameNode3DReader
2016-05-02 10:57:03 +09:00
a640f007ef
Fix doxygen format mistakes in enum class Platform
...
An user reported this error in the forum http://forum.cocos.com/t/api-document/36199/2
I noticed that our doxygen was written in wrong format.
2016-04-30 15:20:24 +08:00
f111583214
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
...
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
788dae5a2e
Merge pull request #15531 from pandamicro/v3.11
...
Fix clipping node memory management issue and update web engine
2016-04-28 16:15:59 +08:00
d8d6e55756
Fix clipping node memory management issue
2016-04-28 15:14:03 +08:00
c432b23ef6
fix: removes `friend class Game`
...
fixes Github issue #15221
2016-04-27 18:57:41 -07:00
198acb9466
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-28 01:56:50 +00: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
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
2a4799758d
Merge pull request #15511 from xpol/signed-unsigned-mismatch
...
Fixes signed/unsigned mismatch warnings.
2016-04-27 11:34:10 +08:00
fc5e537327
Merge pull request #15508 from xpol/remove-use-of-getFileData
...
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-27 09:38:30 +08:00
51fb49a522
Merge pull request #15512 from minggo/issue-15193
...
use fullpath to play background music
2016-04-27 09:37:45 +08:00
f395cadbac
Add CC_GUI_DLL to suppress warning C4275
2016-04-27 04:08:09 +09:00
1cc0130bdd
Fixes signed/unsigned mismatch warnings.
...
```
2d\CCFontFNT.cpp(328): warning C4018: '<' : signed/unsigned mismatch
2d\CCLabel.cpp(782): warning C4018: '>' : signed/unsigned mismatch
2d\CCLabel.cpp(784): warning C4018: '<' : signed/unsigned mismatch
scripting\js-bindings\manual\cocos2d_specifics.cpp(2741): warning C4018: '<' : signed/unsigned mismatch
tests\cpp-tests\Classes\Sprite3DTest\Sprite3DTest.cpp(1969): warning C4018: '>=' : signed/unsigned mismatch
tests\cpp-tests\Classes\TextInputTest\TextInputTest.cpp(264): warning C4018: '>=' : signed/unsigned mismatch
ui\UIEditBox\UIEditBoxImpl-common.cpp(113): warning C4018: '<' : signed/unsigned mismatch
ui\UIRichText.cpp(1573): warning C4018: '<=' : signed/unsigned mismatch
ui\UITextField.cpp(89): warning C4018: '>=' : signed/unsigned mismatch
```
2016-04-26 17:53:25 +08:00
b9184ac452
Merge pull request #15509 from minggo/issue-15449
...
remove unsupport flags
2016-04-26 16:03:58 +08:00
bb4a54b042
use fullpath to play background music
2016-04-26 15:59:30 +08:00
bd3c3a7c3d
remove default value for size argument.
2016-04-26 14:54:20 +08:00
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
2319860d38
remove unsupport flags
2016-04-26 14:08:23 +08:00
3f8910d80c
Remove last internal use of deprecated `FileUtils::getFileData()`.
2016-04-26 13:57:53 +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
2cc6ebc137
Merge pull request #15507 from CocosRobot/update_lua_bindings_1461642261
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 11:49:15 +08:00
29da95494e
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-04-26 03:47:27 +00:00
a6b59c40be
Merge pull request #15496 from treert/patch-2
...
[fix bug] reset UIGrayScale Shader when reload shaders
2016-04-26 11:44:20 +08:00
86df9b535a
Merge pull request #15493 from njh0602/somefix
...
Renamed ignoreAnchorPointForPosition()
2016-04-26 11:41:09 +08:00
2f2373be87
Merge pull request #15497 from stevetranby/tilemap-csv-support
...
Add CSV format support to tile maps
2016-04-26 11:39:33 +08:00
c8e2dc83d1
Merge pull request #15498 from ynaoto/v3
...
Warn if fontDef.charID exceeds 16bits.
2016-04-26 11:27:06 +08:00
d5e4cc0b88
Merge pull request #15492 from mogemimi/fix-unused-variable-warning
...
Fix unused variable warning when building with Xcode
2016-04-25 15:50:58 +08:00
8792078bb4
Merge pull request #15500 from mogemimi/fix-warning-c4804
...
Fix compiler warning C4804 under Visual Studio
2016-04-25 13:59:15 +08:00
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
d2c46167c3
Fix compiler warning C4804 under Visual Studio
2016-04-25 10:46:33 +09:00
d42cb71a27
Warn if fontDef.charID exceeds 16bits.
2016-04-25 01:02:50 +09:00
510e7b831e
csv support working test
2016-04-23 17:31:10 -06:00
2c4b634a50
reset UIGrayScale Shader when reload shaders
...
reset GLProgram for UIGrayScale Shader when reload shaders
2016-04-23 13:33:22 +08:00
ea2b73c30e
Renamed ignoreAnchorPointForPosition()
2016-04-22 22:29:49 +09:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
71677ee286
Fix unused variable warning when building with Xcode
2016-04-22 20:25:32 +09:00
5aa83ef1cf
Merge pull request #15490 from mogemimi/fix-signed-unsigned-mismatch
...
Fix warnings about signed/unsigned mismatch
2016-04-22 13:54:52 +08:00
0f0c9b627b
Add support for Unsigned with CCValue ( #13785 )
...
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
a3ad4cddf8
Fix warnings about signed/unsigned mismatch
2016-04-22 12:20:05 +09:00
16c7a594c8
Merge pull request #14005 from wighawag/draw_node_shader_fix
...
allow to use custom shader uniforms and attributes on drawNode
2016-04-22 10:49:41 +08:00
2c75a4cf39
Merge pull request #15480 from mogemimi/remove-unary-operator
...
Remove incorrect unary operator to fix warnings
2016-04-21 15:42:29 +08:00
488ceb485d
Merge pull request #14547 from colajam93/fix-linux-clang-build
...
Add missing header
2016-04-21 15:38:53 +08:00
minggo