Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
35,819 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

12488 Commits

Author SHA1 Message Date
minggo 8419cc2662 Merge pull request #16183 from SaxonDruce/android-willplaymusic 
Implement willPlayBackgroundMusic() on Android
 2016-07-22 10:57:26 +08:00
minggo fcd02f109e Merge pull request #16189 from mogemimi/fix-docs-typo 
Fix typos in documentation and comments
 2016-07-22 10:55:05 +08:00
Ricardo Quesada 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
mogemimi 94d4971ddc Fix typos in documentation and comments 2016-07-22 02:05:19 +09:00
SaxonDruce 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 26a04b38f2

* Don't re-pause music that has already been paused

In this situation:

1. Start game, music plays
2. Switch to Music app, game music paused, start other music
3. Switch to game, game music not resumed due to other music playing
4. Switch to Music app, stop other music
5. Switch back to game, game music should resume due to no other music playing

At step 5 the game music doesn't currently resume. This is because at step 4 when switching to the Music app, the game music gets re-paused (actually isPlaying is false, so systemPaused is set to NO, even though the music *is* still paused). This causes the music to not be resumed at step 5.

This change fixes this, by skipping the pause logic if systemPaused is already true.

Note that this is dependent on https://github.com/cocos2d/cocos2d-x/pull/16178

* Fix typo in previous fix.
 2016-07-21 17:41:24 +08:00
James Chen 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
minggo 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
minggo 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
James Chen 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
minggo b8f8ff0d25 Merge pull request #16177 from mogemimi/fix-constant-spelling 
Fix typo in constant name
 2016-07-21 14:41:35 +08:00
Saxon Druce 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
minggo 26dd7b2698 remove curl link for Android 2016-07-21 11:56:56 +08:00
CocosRobot 708dab448d [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16175) 2016-07-21 10:11:14 +08:00
mogemimi 17dfd03fa7 Fix typo in constant name 2016-07-21 00:49:19 +09:00
Ricardo Quesada 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
Ce Zheng 35b848e842 fix label text formatter right alignment 2016-07-20 18:08:15 +09:00
James Chen 2e5626236b Remove unused code in cocos/audio/openal 2016-07-20 14:49:39 +08:00
minggo 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
Ricardo Quesada b3218c1e58 fix: stagger tilemaps hexa works as expected 
Github issue #16105
 2016-07-19 22:55:05 -07:00
James Chen ddb25ca563 Uses std::chrono::steay_clock for calculating dt. 2016-07-20 12:43:40 +08:00
Ricardo Quesada 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
Ricardo Quesada cc947737dd Merge pull request #16160 from ricardoquesada/issue_16139 
fix: display FPS again on GLFW platforms
 2016-07-19 19:19:31 -07:00
minggo 66e29ba82d Merge pull request #16151 from mogemimi/fix-function-spelling 
Fix spelling for `getPolygonCenter` function
 2016-07-20 09:56:51 +08:00
Ricardo Quesada 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
mogemimi 5bd2d74078 Fix spelling for `getPolygonCenter` function 2016-07-19 08:24:22 +09:00
mogemimi 60dbbde3eb Fix misspelled enum: POLYGEN -> POLYGON 2016-07-18 19:10:07 +09:00
CocosRobot cbcbeb96b3 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-18 06:20:59 +00:00
minggo 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
James Chen 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
yalab ef21e44d9c Fixed to use cocosstudio LoadingBarReader with TexturePacker. 2016-07-17 16:30:17 +09:00
mogemimi d931c62649 Fix typos in documentation comments 2016-07-16 04:18:40 +09:00
minggo 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
minggo 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
mogemimi 07d0b4412f Add missing fclose() to fix a possible bug caused by PR #16114 2016-07-15 17:04:14 +09:00
minggo 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
Ricardo Quesada 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
Ricardo Quesada 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
halx99 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
minggo 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
mogemimi 8b05476d45 Use fstat instead of fseek and ftell for performance and portability 2016-07-14 01:18:44 +09:00
minggo 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
minggo c5c846f6e1 Merge pull request #16107 from cezheng/fix/EaseExponentialOut_clone_crash 
fix crash in EaseExponentialOut::clone()
 2016-07-13 16:32:48 +08:00
mogemimi 98cc48bc62 Add missing override keyword 2016-07-13 15:03:53 +09:00
Ce Zheng cf18857206 fix crash in EaseExponentialOut::clone() 2016-07-13 14:28:04 +09:00
Ricardo Quesada 1824b21cb7 Merge pull request #16090 from ricardoquesada/issue_15566 
fixes issue #15566
 2016-07-12 21:36:52 -07:00
minggo 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
Ricardo Quesada 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
Tyler Kopf 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
mogemimi b9c78ac41c Use std::abs to avoid overhead of casting float to double 2016-07-13 00:55:11 +09:00
coderwj 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
halx99 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
Steve Tranby f162ffe2ae Match parent's camera mask when adding child. 2016-07-12 00:07:41 -05:00
Tyler Kopf 5ecd016a9e fix leak in Data on move assignment 2016-07-11 15:33:51 -07:00
CocosRobot 3aeefd911e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-11 07:54:54 +00:00
minggo 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
minggo 9c7d44ccd7 Merge pull request #16080 from minggo/use-std_abs 
use std::abs instead
 2016-07-11 12:02:10 +08:00
minggo 2ca1760b78 Merge pull request #16079 from minggo/use-std_srand 
use std::srand() instead
 2016-07-11 12:01:38 +08:00
minggo 3dc167a9f9 use std::abs instead 2016-07-11 12:01:09 +08:00
minggo a146f3eec7 use std::srand() instead 2016-07-11 11:17:28 +08:00
mogemimi 7531c5156b Fix documentation when compile with -Wdocumentation and Clang 2016-07-10 17:38:32 +09:00
Ricardo Quesada 995868c62e fix: Text::create() does not crash on mac/ios 
...on invalid unicode.

fixes issue #16073
 2016-07-08 16:59:44 -07:00
minggo 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
minggo 4e125d84a4 fix compiling and linking error with ndk r12b 2016-07-08 15:29:35 +08:00
minggo 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
CocosRobot 8fe92fbd4b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-07 19:04:04 +00:00
Ricardo Quesada 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
minggo 836acff6d0 Merge pull request #16060 from minggo/merge-v312 
Merge v312
 2016-07-07 18:29:28 +08:00
minggo 4511b35b51 fix bug that FileUitls::removeDirectory() can not work on all platforms except iOS and Mac 2016-07-07 17:43:19 +08:00
minggo 734d857ced Merge branch 'v3.12' into merge-v312 2016-07-07 15:13:21 +08:00
Ricardo Quesada 6d5a94e569 test: add test case for Github issue #12226 
Adds test case for Github issue #12226
 2016-07-06 16:37:15 -07:00
mogemimi 6ce7f3c0e9 Avoid overhead of casting float to double 2016-07-07 01:38:27 +09:00
minggo 8d6acd9ffe Merge pull request #16050 from pandamicro/v3.12 
[ci skip]Update JS versions
 2016-07-06 17:04:42 +08:00
pandamicro ccb30cefc7 Update JS versions 2016-07-06 17:02:53 +08:00
minggo 6248480b3a Merge pull request #16047 from minggo/issue-14071 
[ci skip]convert aplpha channel correctly
 2016-07-06 15:59:50 +08:00
minggo d0db838b71 convert aplpha channel correctly 2016-07-06 15:49:05 +08:00
minggo 418907d972 Merge pull request #16044 from pandamicro/v3.12 
Improve web template and update web ref
 2016-07-06 14:47:23 +08:00
pandamicro 305bd95dc2 More secure release in JSB_closeWindow 2016-07-06 13:55:18 +08:00
CocosRobot cf2646b7a2 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-06 02:16:03 +00:00
mogemimi bed4e048b6 Fix various typos 2016-07-06 08:27:39 +09:00
minggo 2f1e14dcde fix compiling error 2016-07-05 14:28:30 +08:00
minggo 4c2efb1319 don't read file content if it is empty 2016-07-05 14:27:28 +08:00
minggo 33d1eb4455 don't invoke front() if container is empty 2016-07-05 14:27:11 +08:00
minggo e4aa6d1ef7 Merge pull request #16035 from minggo/issue-16032 
remove extra '\'
 2016-07-05 14:22:19 +08:00
minggo 0cc8b9fc09 Merge pull request #16031 from MrCapone/fix_GLView 
GLView::setFrameSize fixed
 2016-07-05 09:54:59 +08:00
minggo 1c9ad5594c remove extra '\' 2016-07-05 09:50:38 +08:00
minggo f666d99192 Merge pull request #16021 from yalab/cocosstudio_with_texturepacker 
Fixed to use TexturePacker with cocosstudio.
 2016-07-05 09:35:59 +08:00
mogemimi 2650fd1afd Add missing float suffix to avoid -Wdouble-promotion 2016-07-04 23:12:45 +09:00
mr_capone-win7 0e64c2a071 GLView::setFrameSize fixed 2016-07-04 19:48:24 +07:00
minggo 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
minggo ca8ff36f2e Merge pull request #16016 from LeeMyoungYeol/v3 
Update utils::getTimeInMilliseconds()
 2016-07-04 10:55:41 +08:00
CocosRobot 934b2413dc [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-04 01:40:35 +00:00
minggo 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
minggo 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
mogemimi 2443e09d29 Fix typos and other mistakes in docs 2016-07-04 00:42:10 +09:00
mogemimi 57900112c5 Fix format string warning when compiling with Android NDK 2016-07-03 17:19:17 +09:00
CocosRobot f30a7cf546 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-03 05:14:11 +00:00
yalab 35968a6fc1 Slidebar can load TextureCache on cocosstudio. 2016-07-02 18:45:20 +09:00
yalab c675675de5 Fixed to use TexturePacker with cocosstudio. 2016-07-02 17:31:32 +09:00
Ricardo Quesada 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
minggo 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
minggo 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
mogemimi 2354df9faf Fix getSubStringOfUTF8String bug 2016-07-01 15:16:35 +09:00
pandamicro d02bdda781 Fix callfunc released with retained data (callback, target, extradata) issue 2016-07-01 10:56:17 +08:00
CocosRobot 94de257115 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-01 02:16:32 +00:00
minggo 043d81be1c Merge pull request #16008 from yalab/cocosstudio_with_texturepacker 
cocosstudio can manage TexturePacker Image.
 2016-07-01 10:10:09 +08:00
halx99 2610ad77cc #15965: remove unused _orderOfArrival (#16009) 2016-07-01 10:09:25 +08:00
yalab c5648db10a cocosstudio can manage TexturePacker Image. 2016-06-30 18:10:08 +09:00
CocosRobot 274a82c7f5 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16001) 2016-06-29 22:56:13 +08:00
minggo 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
CocosRobot ef01ac4465 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-29 04:47:21 +00:00
Ricardo Quesada b1f93b2679 fix: not leak Toggle items 
Github issue: fixes #13351
 2016-06-28 20:41:47 -07:00
mogemimi c0f2194961 Fix some minor typos in local variable names 2016-06-29 11:04:11 +09:00
Drakon-Cocos 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
minggo ecf97575ad Revert "Added CCGLViewImpl.h" 2016-06-29 09:45:05 +08:00
minggo feb513c7eb Merge pull request #15982 from mogemimi/fix-typo 
Fix typo: destoryMark -> destroyMark
 2016-06-29 09:41:59 +08:00
minggo 076e0b488b Merge pull request #15980 from minggo/merge-v312 
Merge v312
 2016-06-29 09:41:30 +08:00
kuzy000 8598003b55 Added CCGLViewImpl.h (#10501) 
* Added CCGLViewImpl.h for more consistency

* fixed indentation
 2016-06-29 09:36:13 +08:00
mogemimi 2060b333ca Fix typo: destoryMark -> destroyMark 2016-06-29 10:04:31 +09:00
minggo 0c290540df Merge pull request #9823 from ericmux/frame-independent-ms 
Making CCMotionStreak _maxPoints framerate independent.
 2016-06-28 18:29:14 +08:00
minggo bbd837aefa merge v3.12 back to v3 2016-06-28 17:53:50 +08:00
pandamicro d46cd96896 Don't warn user about API deprecation 2016-06-28 12:11:21 +08:00
pandamicro e7e365a00f Fix window.close crash in JSB 2016-06-28 11:59:55 +08:00
mogemimi 2a853ba73e Avoid const_cast when calling Node::setAdditionalTransform 2016-06-27 19:33:45 +09:00
minggo d7cb7676bc Merge pull request #15966 from mogemimi/improve-refptr 
Improve RefPtr to avoid casting when possible
 2016-06-27 10:07:54 +08:00
mogemimi a287e696c9 Improve RefPtr to avoid casting when possible 2016-06-26 21:39:43 +09:00
Alfonso Grillo b6fa894f81 Fix page view indicator opacity for inactive pages 2016-06-25 18:49:13 +02:00
mogemimi bc51528301 Fix typo in FileUtils::Status enum 2016-06-25 12:58:55 +09:00
Ricardo Quesada 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
Ricardo Quesada 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
minggo 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
Ricardo Quesada 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
pandamicro 8cb2e93644 Fix easing action crash because the js object is not rooted 2016-06-24 14:38:59 +08:00
mogemimi 0dce4961ee Avoid implicit conversion from size_t to int 2016-06-24 15:15:45 +09:00
minggo 2931b310cf Merge pull request #15942 from zilongshanren/improveEditBox 
Improve edit box
 2016-06-24 10:27:22 +08:00
minggo 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
Ricardo Quesada 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
minggo 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
minggo dbc083b924 Merge pull request #15939 from halx99/patch-2 
Optimize, remove unnecessory truncate.
 2016-06-24 09:54:57 +08:00
minggo 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
mogemimi b7982fd8e0 Fix -Wreturn-type warnings when compiling JSB with Clang 2016-06-24 08:48:21 +09:00
Ricardo Quesada 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
Ricardo Quesada 9e0371a3b8 fix: fix delay when creating quadcomamnds 
triggered by particles.

Github issue #15937
 2016-06-23 09:17:26 -07:00
zilongshanren 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
halx99 cd93612746 Optimize, remove unnecessory truncate. 2016-06-23 16:01:05 +08:00
zilongshanren a6b0ea76de improve editbox test and font creation 2016-06-23 15:57:41 +08:00
minggo 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
minggo 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
halx99 ba55723178 Update CCLuaStack.cpp 2016-06-23 13:42:38 +08:00
mogemimi cbc0612306 Use nullptr instead of 0 or NULL 2016-06-23 12:39:23 +09:00
halx99 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
halx99 c4def57774 Update CCLuaStack.cpp 
Lua script utf-8 bom support, handle encrypted script.
 2016-06-23 10:24:22 +08:00
minggo 597fb61a78 Merge pull request #15922 from dumganhar/fix/lua-binding 
Some lua bindings fixes:
 2016-06-23 10:00:45 +08:00
Ricardo Quesada 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
Ricardo Quesada ff71ffae84 fix: not crash after removing a physics body right after... 
adding it.
 2016-06-22 14:12:27 -07:00
Ricardo Quesada 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
Ricardo Quesada 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
minggo 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
minggo 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
minggo 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
James Chen 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
minggo 465da95c01 return true for preload though it is not implemented 2016-06-22 17:41:04 +08:00
James Chen 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
zilongshanren 783dfb3f14 fix system font name on Android ttf creation 2016-06-22 16:54:01 +08:00
James Chen 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
minggo 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
James Chen 8e19db7d26 fix AssetsManager could not work after Pull Request #13893 was merged. 2016-06-22 14:31:26 +08:00
CocosRobot 4a5bedc6e6 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-22 05:52:51 +00:00
minggo 9d0801834e Merge pull request #15893 from halx99/patch-1 
Optimize, avoid unnecessary memory alloc & copy
 2016-06-22 13:44:40 +08:00
minggo 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
James Chen cffc9cecd7 cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this. 2016-06-22 11:05:04 +08:00
mogemimi a3bc979452 Fix typos in documentation and comments 2016-06-22 11:22:05 +09:00
minggo 6b9c76fd93 should use full path to check directory 2016-06-22 10:19:35 +08:00
Ricardo Quesada 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
zilongshanren 2d3785c03d fix tizen compile error 2016-06-21 19:50:00 +08:00
halx99 f41130bafe luabindings: Add script with utf-8 bom support. 2016-06-21 14:31:25 +08:00
halx99 654d17d27c Update CCFontFNT.cpp 2016-06-21 11:25:11 +08:00
halx99 51ba45ae26 Optimize, avoid unnecessary memory alloc & copy 2016-06-21 10:52:25 +08:00
Ricardo Quesada 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
Julien Jorge 6fb3946c51 Add a config option to enable or disable the premultiplied alpha code. 2016-06-20 18:05:11 +02:00
minggo 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
mogemimi f0028e5459 Fix unused variable warnings when compiling release mode 2016-06-20 09:23:42 +09:00
sum 4700bbce43 fix restart game crash in FT_Get_Char_Index 2016-06-19 03:22:57 +08:00
Ricardo Quesada 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
Ricardo Quesada d9b3ef55ae Merge pull request #15880 from ricardoquesada/issue-15776 
fix: TextureCache ASSERTS if image is invalid
 2016-06-17 16:48:19 -07:00
Ricardo Quesada c387f953fa fix: TextureCache ASSERTS if image is invalid 
Github issue #15776
 2016-06-17 16:07:33 -07:00
Ce Zheng 84db1ac294 fix downloader build issue for Android API 23 
fixes #15823
 2016-06-17 22:32:49 +09:00
minggo ed955cbe1d update version 2016-06-17 18:09:27 +08:00
CocosRobot 4c233b8df7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-17 02:22:58 +00:00
minggo 6778ebf451 Merge pull request #15853 from ricardoquesada/vr_squashed 
Squashed commit of the following:
 2016-06-17 10:15:20 +08:00
minggo e9cf762304 Merge pull request #15866 from minggo/remove-compiling-flag 
remove gcc comipling flag
 2016-06-17 09:39:18 +08:00
minggo 6280b8a376 Merge pull request #15870 from mogemimi/fix-unused-function 
Remove unused debug function in RenderCommand
 2016-06-17 09:38:32 +08:00
minggo 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
mogemimi 0872a50f60 Remove unused debug function in RenderCommand 2016-06-17 03:19:19 +09:00
Ricardo Quesada 08ed2eccd2 fix: using `enum class` instead of `typedef enum` 2016-06-16 07:02:04 -07:00
minggo 832ec5eab4 remove gcc comipling flag 2016-06-16 16:14:50 +08:00
minggo 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
minggo 9b210e00d7 Merge pull request #15837 from geemedia/cmake-improvements 
Various CMake improvements
 2016-06-16 14:53:10 +08:00
minggo 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
zilongshanren f0f8663fa9 fix TTF and BMFont word wrap 2016-06-16 14:15:00 +08:00
mogemimi 01aaff66c8 Fix -Wsometimes-uninitialized warning in release build 2016-06-16 14:27:52 +09:00
minggo 5fa57ae5c1 Merge pull request #15844 from halx99/patch-1 
fix: missing properties for clone
 2016-06-16 11:15:13 +08:00
minggo 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
minggo 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
CocosRobot cc2b887dbb [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-16 02:58:46 +00:00
minggo b0f3d43414 Merge pull request #15834 from Shulepov/rendertexture_opacity_modify_rgb 
RenderTexture - set opacity modify RGB
 2016-06-16 10:52:21 +08:00
Ricardo Quesada 9e40fffb13 fix: remove liboculus 2016-06-15 17:53:01 -07:00
mogemimi 4f329d8aac Fix possible memory leak when pass initialization fails 2016-06-16 04:52:38 +09:00
Ricardo Quesada ccfbc29288 fix travis error 2016-06-15 12:08:40 -07:00
Ricardo Quesada 180c2f1e9a Squashed commit of the following: 
VR support for cocos2d-x

commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:26:33 2016 -0700

    Merge branch 'v3' into vr

commit b32d329f9331a4f9bbbbf946b88b31db7559934d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 11:25:27 2016 -0700

    fix: dont' include oculus files

commit 816928c6a8782984830aa92de5bed038c1306cdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:57:26 2016 -0700

    fix: missing guard in header

commit 2abd4eb5a1fc961c2cbae9b00809b5e6409740db
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:43:49 2016 -0700

    removed VR engines... should be part of package manager

commit 583179755d1c66c02e898297230d0f882e629b98
Merge: 12f4f71 b6d6bb0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:37 2016 -0700

    Merge branch 'vr' of github.com:ricardoquesada/cocos2d-x into vr

commit 12f4f71aca4fa15231976a7727faf40648d62313
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Jun 15 10:42:12 2016 -0700

    fix: new VR API... easier to enable/disable different VR renderers

commit b6d6bb087f54cbd272fbfb9e1cf1cd6bba776ffa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:48:04 2016 -0700

    fix: compiles and runs on win10

commit e73aa8902118377abbd2192c757104c4531d2a9e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 20:27:06 2016 -0700

    fix: vr works again

commit 5615e276507edf8602f043f3130204a89dbaba69
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 18:55:18 2016 -0700

    fix: compiles on windows

commit 494061ee4da8fbc5616f83efb64b2c0c3932778e
Merge: 284910b fd3b6d4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:13:47 2016 -0700

    Merge branch 'v3' into vr

commit 284910b204ee0dd76d949ea8f2b2f6b1b72e533f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 14 17:12:25 2016 -0700

    android vr: better performance

commit aa8328e8029143dd7c6c724f38915f0fb3b64abe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 16:10:14 2016 -0700

    fix: low pass filter in accel and magnet

commit f6d9b622abff5abb95ad60fa7139f3ce1ec9caab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 15:43:00 2016 -0700

    fix: removes debugging info

commit 2004f0ce5605dad70ff8656a058073181346f083
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 13 14:54:32 2016 -0700

    fix: kind of works on android! yeah!

commit d6dcb6a3410fda053f0d6fbc00af817a13a86d3b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Jun 10 09:44:53 2016 -0700

    logging

commit 7e5d6ad52d39642c111e7b690173338af4e94092
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 22:53:07 2016 -0300

    android head tracking

    compiles, doesn't work yet... how to debug java code?

commit cbf5f6482aa0ae002a7dc40045ef3ffdbe192e26
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 19:45:41 2016 -0300

    reading sensor from android

    not compiling yet

commit 6ee0a3c2c43f8e8a603bfce9fddb0cce5ce79415
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Jun 7 11:45:06 2016 -0300

    compiles on android... finally

commit fb728da756ca7ee94b316c113e2239a77d9f4b53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 18:15:12 2016 -0300

    fix: compile vr android files only on android

commit 90db6daef382d142bb60207d2b16936dd66ee245
Merge: 2e56f03 cc936af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Jun 6 12:15:56 2016 -0300

    Merge pull request #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
Dale Stammen 53321e401a updated to support Windows 10 UWP x64 builds 2016-06-15 08:50:04 -07:00
minggo fc44d0deed Merge pull request #15850 from minggo/hide-virtual-button 
[ci skip]hide virtual button correctly
 2016-06-15 18:38:59 +08:00
minggo 7bf13f34cd hide virtual button correctly 2016-06-15 18:33:52 +08:00
PooperPig 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
minggo 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
minggo d94dc7edc0 hide virtual button if has focus 2016-06-15 18:19:06 +08:00
minggo 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
minggo a8c6011f66 use android sdk 19 2016-06-15 18:06:53 +08:00
minggo 8634773be3 hide virtual button by default 2016-06-15 17:55:26 +08:00
minggo d7b495c3d1 Merge pull request #15838 from MagicXrEv/rename-end-functions 
lua binding : Rename end() to endToLua().
 2016-06-15 16:24:34 +08:00
mogemimi 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
Aaron 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
halx99 dafa8054bf fix: missing properties for clone 
missing CascadeColorEnabled and CascadeOpacityEnabled for clone.
 2016-06-15 14:39:18 +08:00
CocosRobot 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
MagicXrEv 8e6ca57f4f lua binding : Rename end() to endToLua(). 2016-06-14 23:35:17 +08:00
Adrien de Sentenac 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
Mikhail Shulepov 7d6d677983 RenderTexture - set opacity modify RGB 2016-06-13 23:07:17 +03:00
mogemimi 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
James Chen 126b60945e issue #15652: fix low FPS on some android devices while auto batch is disabled. 2016-06-12 11:35:30 +08:00
minggo 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
yalab 598be0840c Fixed to fail FileUtils::writeValueMapToFile on iOS. 2016-06-10 14:53:11 +09:00
mogemimi 07e0c1cbf9 Fix typo in method name: 'destory' -> 'destroy' 2016-06-09 09:25:06 +09:00
mogemimi de5dd21ded Add missing default cases within switch block for JS and Lua JavaBridge 2016-06-08 15:41:44 +09:00
minggo 363beb436d Merge pull request #15790 from dumganhar/profiling-fix 
Compilation fix while CC_ENABLE_PROFILERS = 1
 2016-06-08 10:55:54 +08:00
minggo 93d87ad19e android supports LOWERCASE_ALL_CHARACTERS 2016-06-07 12:41:22 +08:00
minggo 7e1da2188c ios supports LOWERCASE_ALL_CHARACTERS 2016-06-07 10:31:16 +08:00
TheCodez 7885f55ce5 Cache bas64 images 2016-06-06 16:32:50 +02:00
James Chen 4f2b4559b6 Compilation fix while CC_ENABLE_PROFILERS = 1 2016-06-06 16:25:00 +08:00
minggo 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
minggo 7e2f79ce8f not use capital letters by default 2016-06-06 13:55:20 +08:00
minggo 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
patriciog 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
mogemimi a22302e2ee Fix unused parameter warning when compiling CCArray 2016-06-04 21:17:53 +09:00
minggo cf80eb18b1 Merge pull request #15777 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 14:05:32 +08:00
minggo 5cd4c8aaca Merge pull request #15778 from minggo/scriptingcore-issue 
avoid to access invalid memory
 2016-06-03 14:04:17 +08:00
mogemimi 388eeed014 Suppress '-Wundefined-bool-conversion' warnings on Android NDK with Clang (#15775) 2016-06-03 13:42:44 +08:00
minggo b7b74f2328 avoid to access invalid memory when received data length is the same as buffer size 2016-06-03 11:39:01 +08:00
pandamicro 3597ce7c43 Fix scheduler callback target lost issue 2016-06-03 11:01:06 +08:00
Nikita 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
MagicXrEv 29cca63822 Texture2D::addImageAsync : Set pixel format correctly. (#15774) 2016-06-03 09:38:01 +08:00
minggo c7c67144b7 Merge pull request #15769 from pandamicro/v3 
Fix scheduler callback target lost issue
 2016-06-03 09:29:01 +08:00
minggo 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
CocosRobot da114e13d1 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-06-02 09:16:13 +00:00
minggo dd1c87a1e0 Merge pull request #15764 from AlexanderShniperson/listview_select_item 
ListView select item programmatically
 2016-06-02 17:09:49 +08:00
minggo 35730063f1 Merge pull request #15766 from mogemimi/fix-unused-param 
Fix unused parameter warning
 2016-06-02 17:06:02 +08:00
minggo 75227a5c0e [desktop]fix the bug the depth test is disabled when application size changed 2016-06-02 16:18:31 +08:00
pandamicro d1e9a149c4 Fix scheduler callback target lost issue 2016-06-02 16:02:29 +08:00
minggo 7243b00cad add a new create method to create resizable window 2016-06-02 15:48:16 +08:00
mogemimi bd00b2f261 Fix unused parameter warning 2016-06-02 15:30:24 +09:00
Alexander Shniperson 07c5e528e7 ListView select item programmatically 2016-06-02 10:11:28 +04:00
minggo 66217b7bd1 Merge pull request #15761 from dumganhar/set-blending-fix 
SetBlending fix
 2016-06-02 11:01:50 +08:00
minggo 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
minggo 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
James Chen 3d116c3333 SetBlending fix 2016-06-01 17:46:27 +08:00
minggo 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
mogemimi a4a357db69 Remove unnecessary sinf, cosf, tanf and sqrtf macros 2016-05-31 02:39:40 +09:00
minggo 3810854c45 use std::isnan instead of isnan to fix compiling errors 2016-05-30 18:19:10 +08:00
CocosRobot 4f0869e51e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-05-30 09:27:04 +00:00
minggo 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
halx99 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
minggo 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
mogemimi c647a95656 Fix C4267 and C4309 warnings when compiling for Windows 10 UWP 2016-05-29 14:43:28 +09:00
mogemimi 69974ab06f Fix warnings caused by comparison between RefPtr and C++11's nullptr 2016-05-28 22:15:56 +09:00
minggo 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
minggo 533636e63a Merge pull request #15726 from minggo/v3.11.1 
merge v3.11.1 to v3
 2016-05-27 16:45:04 +08:00
yalab 3ea46c617f It mute warning on android clang. 2016-05-27 15:39:33 +09:00
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3 
Support cc.view.setOrientation on web
 2016-05-27 14:26:50 +08:00
minggo 127f718dfc Merge pull request #15728 from mogemimi/remove-duplicate-includes 
Remove duplicate header includes
 2016-05-27 14:25:39 +08:00
minggo 103bdb3d37 fix conflict 2016-05-27 14:22:03 +08:00
minggo 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
mogemimi fc6c612c4c Remove duplicate header includes 2016-05-26 23:25:44 +09:00
Ricardo Quesada 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
capone 5b02460989 AudioEngine-linux fix: add map contains IDs of preloaded files 2016-05-26 17:57:56 +06:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren 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
zilongshanren 13003d9a78 Merge pull request #15727 from dumganhar/editbox-fix 
Make sure closeKeyboard run on UI thread
 2016-05-26 18:08:03 +08:00
zilongshanren 2476722137 fix default value of studio version 2016-05-26 17:33:44 +08:00
zilongshanren b317588e6e fix include path 2016-05-26 17:25:03 +08:00
zilongshanren 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
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 031e329d64 fix the bug that will lost message if only received one message 2016-05-26 16:32:10 +08:00
James Chen d42b99b10b fixed java.lang.IndexOutOfBoundsException while invoking toString on GL thread. 2016-05-26 15:49:57 +08:00
James Chen cf883b5c0f UI thread check. 2016-05-26 12:02:23 +08:00
James Chen a472ab2931 Make sure closeKeyboard run on UI thread 2016-05-26 11:57:57 +08:00
minggo 1f2dea7974 Merge pull request #15724 from dumganhar/catch-exception 
Try catch IllegalStateException in Cocos2dxMusic.java.
 2016-05-26 11:20:14 +08:00
James Chen 5321a2fc7a Removes unused package import for Cocos2dxSound.java. 2016-05-26 11:15:44 +08:00
minggo 5e8eee2c76 Merge pull request #15721 from mogemimi/fix-minor-typo 
Fix minor typo: Texure -> Texture
 2016-05-26 10:58:55 +08:00
pandamicro aab8ea5094 Fix android compilation issue with thumb mode 2016-05-26 10:50:19 +08:00
minggo 7073a1c90c Merge pull request #15718 from pandamicro/v3 
Fix some small issues
 2016-05-26 10:46:54 +08:00
James Chen 1285954cd9 Try catch IllegalStateException in Cocos2dxMusic.java. 2016-05-26 10:25:45 +08:00
minggo 072592d6e3 update version 2016-05-26 10:18:45 +08:00
urokuta 785d02a818 #9367 blend mode does not work with animated sprite 2016-05-26 09:39:48 +09:00
Ricardo Quesada b2c7358370 Merge pull request #15722 from ricardoquesada/issue_15154 
Fix crash on windows when using PolygonInfo
 2016-05-25 21:25:31 -03:00
Ricardo Quesada 906967c53a fix: make it compile on iOS and Mac 2016-05-25 20:00:48 -03:00
mogemimi f6bee1abc2 Fix minor typo: Texure -> Texture 2016-05-26 02:36:15 +09:00
Dale Stammen 26781ee592 fixed array overrun in triangulate() 2016-05-25 10:14:09 -07:00
pandamicro ea6a6a8586 Reverse include path in network module and update web engine 2016-05-25 23:58:11 +08:00
pandamicro 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
minggo 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
pandamicro 2c05ecc3cd Fix Component event issue 2016-05-25 18:36:02 +08:00
pandamicro 896aeb2d0c Fix android compilation issue with thumb mode 2016-05-25 18:35:38 +08:00
minggo 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
Ce Zheng e4bf6584db correct assign to equal in cert trust expression 2016-05-25 18:34:05 +09:00
minggo 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
minggo 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
James Chen 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
Ricardo Quesada 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
mogemimi 1e04cb5950 Use nullptr instead of 0 or NULL 2016-05-25 03:09:11 +09:00
Ricardo Quesada 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
Ricardo Quesada 02a9c9aae3 fix: update damping in physics 
github issue #15630
 2016-05-24 10:53:23 -03:00
alecmilne 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
minggo fff7a78efe lock mutext to get element from g_queue 2016-05-24 15:59:00 +08:00
mogemimi 38fd8ebca9 Fix typo in function name: Keybard -> Keyboard 2016-05-24 10:14:36 +09:00
minggo 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
Shulepov 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
minggo 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
minggo 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
Vladimir Perminov 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
mogemimi ad3c305172 Prevent too many C4996 warnings caused by ignoreAnchorPointForPosition() 2016-05-22 07:05:35 +09:00
halx99 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
minggo 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
minggo 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
mogemimi 0f3b36e834 Fix gcc warnings and type mismatch issues in AudioEngine for Linux 2016-05-20 01:39:40 +09:00
Greg Rynkowski 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
minggo 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
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio 
audio search path (android)
 2016-05-19 18:06:58 +08:00
zilongshanren b154f274a5 Merge pull request #15410 from 1scaR1/up_v3 
Make PageView indicator more tunable
 2016-05-19 16:19:18 +08:00
mogemimi 09d839be35 Format the code to better align with cocos2d-x code style 2016-05-19 05:17:33 +09:00
mogemimi 7b61aca64e Fix indentation and remove trailing whitespaces 2016-05-19 03:42:34 +09:00
mogemimi 3a80e7d8fb Change 2 spaces to 4 spaces indentation 2016-05-19 03:34:04 +09:00
mogemimi 03be0de2fa Remove unnecessary trailing semicolons 2016-05-19 01:40:00 +09:00
fusijie 36113f507e add comments for ps. 2016-05-18 22:25:43 +08:00
zilongshanren 9223d1d917 Merge pull request #15668 from zilongshanren/fix-issue-of-tizen 
fix tizen related issues
 2016-05-18 17:20:19 +08:00
zilongshanren c4e6db4e9b fix tizen related issues 2016-05-18 16:26:13 +08:00
pandamicro a03c45ce62 Update network licenses and reformat 2016-05-18 14:29:54 +08:00
minggo c6034787e4 Merge pull request #15664 from mogemimi/replace-ccassert-macro 
Replace CCAssert macros with CCASSERT
 2016-05-18 11:57:18 +08:00
minggo a54251b854 Merge pull request #15659 from mogemimi/use-const-reference 
Use const references whenever possible
 2016-05-18 11:55:55 +08:00