i want to merge v3quick to cocos2d-x trunk#442

Open

joywish wants to merge 10000 commits intodualface:v3from

This pull request is big! We're only showing the most recent 250 commits

Commits on Feb 20, 2017

[WebSocket] Adds support for getting url and server selected protocol (#17381)

James Chen
authored and
minggo
committed
Use ndk-build with Android Studio. (#15676)

chaoren
authored and
minggo
committed

Commits on Feb 21, 2017

[ci skip]make all tests and template support Android Studio (#17389)
minggo
authored

Commits on Feb 22, 2017

Update the spine runtime of JS. (#17391)

Bin Zhang
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17392)

CocosRobot
authored and
James Chen
committed
Update the reference of submodule web. (#17393)

Bin Zhang
authored and
minggo
committed
Update the reference of submodule web. (#17396)

Bin Zhang
authored and
minggo
committed

Commits on Feb 23, 2017

fixed #17397: Updates CMakeList.txt for win32 audio module (#17401)
James Chen
authored
Fix minor typos in UI test cases (#17400)

mogemimi
authored and
James Chen
committed
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` (#17399)

mogemimi
authored and
James Chen
committed

Commits on Feb 24, 2017

Fix minor typos in tests (#17404)

mogemimi
authored and
James Chen
committed
Update the reference of submodule cocos2d-console. (#17407)

Bin Zhang
authored and
James Chen
committed

Commits on Feb 27, 2017

Fix variable name typo in Sprite3DTest.js (#17409)

mogemimi
authored and
James Chen
committed
Fix various typos in comments and strings (#17410)

mogemimi
authored and
James Chen
committed
fixed #17413: [Android] AudioEngine::play2d may still wait 2 seconds if preload is too fast. (#17414)
James Chen
authored

Commits on Mar 1, 2017

Update the reference of submodule cocos2d-console. (#17425)

Bin Zhang
authored and
James Chen
committed

Commits on Mar 2, 2017

17357: Better encapsulate the definition of mouse buttons (#17358)

radman0x
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17430)

CocosRobot
authored and
James Chen
committed
Update the reference of submodule cocos2d-console. (#17432)

Bin Zhang
authored and
James Chen
committed

Commits on Mar 3, 2017

win10 uwp fix for new Mouse events (#17434)

stammen
authored and
James Chen
committed

Commits on Mar 6, 2017

Fix some local variable names in tests (#17445)

mogemimi
authored and
minggo
committed
fixed #17433: [webSocket ] webSocket random crash in win32 (#17440)

huachangmiao
authored and
minggo
committed
update external version (#17446)
minggo
authored
Some fixes for search paths: (#17435)

James Chen
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17449)

CocosRobot
authored and
James Chen
committed

Commits on Mar 7, 2017

Websocket bug fix after PR#17440 was merged. (#17450)

James Chen
authored and
minggo
committed
cocos2d::Sequence::isDone() checks that the last action is actually done. (#17437)

j-jorge
authored and
minggo
committed
Solve the error logic in spine runtime. (#17448)

Bin Zhang
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17453)

CocosRobot
authored and
minggo
committed
fix the broken of lua-tests after PR #17445 was merged. (#17454)

James Chen
authored and
minggo
committed
Prevent unexpected calls to unscheduled selector in long updates. (#17431)

j-jorge
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17456)

CocosRobot
authored and
James Chen
committed
fixed #17427: lws_parse_url has wrong behavior, it parses ’ws://domain.com/abc/d’ to ‘path: abc/d’ rather than ‘path: /adb/d’. (#17455)

James Chen
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17458)

CocosRobot
authored and
minggo
committed
fixed #17416: Wrong default port of SocketIO connection. (#17459)

James Chen
authored and
minggo
committed
*Fix: GLThread and other threads access sDownloaderMap in a thread-unsafe way, which will result in crash in some occasion on Android. (#16326)

pwang08
authored and
minggo
committed

Commits on Mar 8, 2017

csbload error bug (#17465)

owen200008
authored and
minggo
committed
fix the issue that onEnterTransitionDidFinish() is not invoked at first scene change (#17466)
minggo
authored
Prevent signed/unsigned mismatch (#17468)

mogemimi
authored and
minggo
committed

Commits on Mar 9, 2017

More powerful Uri class, adds unit test for Uri class. Refactors some code in SocketIO & Websocket. (#17472)

James Chen
authored and
minggo
committed
fixed #17474: [Android] It may trigger ConcurrentModificationException in Cocos2dxSound.java. (#17479)

James Chen
authored and
minggo
committed

Commits on Mar 13, 2017

fixed #17395: AudioEngine alSourcePlay error code:a003 in lua-tests. (#17485)

James Chen
authored and
minggo
committed

Commits on Mar 14, 2017

Fixes memory issues catched by Xcode Analyze Tool. (#17489)

James Chen
authored and
minggo
committed
[win32] Updates template project configuration files. (#17491)

James Chen
authored and
minggo
committed
[ci skip][win32] Updates lua template (#17493)

James Chen
authored and
minggo
committed
Improve the AndroidStudio configurations of tests & templates (#17495)

Bin Zhang
authored and
minggo
committed
fixed #17395: OpenAL A003 error if doing AL invocation before alcMakeContextCurrent(s_ALContext); (#17492)

James Chen
authored and
minggo
committed
Signal the scroll once the list is updated in cocos2d::extension::TableView. (#17295)

j-jorge
authored and
minggo
committed
update gradle version and build tool version (#17496)
minggo
authored

Commits on Mar 15, 2017

update build tool version and gradle version (#17499)
minggo
authored
Fixes cocos2d build for tvOS. (#17498)

filipe-lemos
authored and
minggo
committed
Update the reference of submodule cocos2d-console. (#17501)

Bin Zhang
authored and
minggo
committed
fixed #17494: [iOS] CrashIfClientProvidedBogusAudioBufferList (#17500)

James Chen
authored and
minggo
committed
Fix spelling mistake in test case (#17502)

mogemimi
authored and
minggo
committed
Solve the error when building Android Studio project. (#17504)

Bin Zhang
authored and
minggo
committed
Bindings fix and assets manger ex fix (#17115)

pandamicro
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17507)

CocosRobot
authored and
minggo
committed
issue #17503: Avoid crash if initializing audio fails. (#17505)

James Chen
authored and
minggo
committed

Commits on Mar 16, 2017

Jsb improvements (#17513)

pandamicro
authored and
minggo
committed
[ci skip] Improve js template and update web ref (#17510)

pandamicro
authored and
minggo
committed
Support for the tvOS micro gamepad as a CCController (#17517)

filipe-lemos
authored and
minggo
committed
fixed #17494: Adds setTimeout to wrap NSTimer since ‘timerWithTimeInterval:repeats:block’ is only available from iOS 10, macOS 10.12. (#17518)

James Chen
authored and
minggo
committed
fix an Accelerometer second to microsecond convertion error in Android platform (#17519)

blackcruiser
authored and
minggo
committed
Add utils::getMD5Hash (#17520)

pandamicro
authored and
minggo
committed
VS and XCode project files have non-existent file references (#17512)

rh101
authored and
minggo
committed
Update submodule cocos2d-console. (#17523)

Bin Zhang
authored and
minggo
committed
Support notify progression in XMLHTTPRequest (#17509)

pandamicro
authored and
minggo
committed
[ci skip]Update version (#17525)
minggo
authored
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17524)

CocosRobot
authored and
minggo
committed
Update README.md. (#17529)

James Chen
authored and
minggo
committed

Commits on Mar 17, 2017

Fix typos in comments and strings (#17534)

mogemimi
authored and
minggo
committed
Update Cocos2dxDownloader.java (#17528)

Dauch
authored and
minggo
committed
use different separator on different platforms and make path length short (#17542)
minggo
authored
use correct resource (#17543)
minggo
authored
fix crash (#17544)
minggo
authored
fix resource path (#17546)
minggo
authored

Commits on Mar 20, 2017

revert #17437 (#17545)
minggo
authored
Added VS2017 support in project files (#17548)

rh101
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17549)

CocosRobot
authored and
minggo
committed
Fixes label cover (#17550)

James Chen
authored and
minggo
committed
use correctly '' (#17553)
minggo
authored

Commits on Mar 21, 2017

Gles3 support (#17537)
minggo
authored

Commits on Mar 22, 2017

Fix spelling: billborad -> billboard (#17560)

mogemimi
authored and
minggo
committed
make all mesh in view rect (#17558)
minggo
authored
Update submodule reference of cocos2d-console. (#17562)

natural-law
authored and
minggo
committed
[win32] Fixes cpp-tests/FileUtilsTest crash. (#17551)

James Chen
authored and
minggo
committed
Updates templates for switching AudioEngine in AppDelegate.cpp. (#17555)

James Chen
authored and
minggo
committed
change clear color in onEnter (#17564)
minggo
authored
remove unneeded test cases and fix parameter length limitation on windows
minggo
authored
Flag the end of ActionInstant and ActionInterval. (#17557)

j-jorge
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17566)

CocosRobot
authored and
minggo
committed
fixed #17497: Win32 performance is bad. (#17556)

James Chen
authored and
minggo
committed
correct module path (#17569)
minggo
authored

Commits on Mar 23, 2017

Fix various minor typos (#17570)

mogemimi
authored and
minggo
committed
unify sensor timestamp units in Android / iOS / Tizen (#17532)

blackcruiser
authored and
minggo
committed
find .luac first (#17572)
minggo
authored
Update CCNode.cpp (#16947)

fred1024
authored and
minggo
committed

Commits on Mar 27, 2017

make log more clear (#17589)
minggo
authored
make menu item don't overlap with other label (#17590)
minggo
authored
Improve js template and test pages (#17575)

pandamicro
authored and
minggo
committed
Fix bug with unresolved symbols in Android Studio 2.3 (#17586)

ilqvya
authored and
minggo
committed
fix crash in release mode (#17592)
minggo
authored
fixed #17591: [ios, mac, win32] Audio could not be played in the callback of AudioEngine::setFinishedCallback (#17593)

James Chen
authored and
minggo
committed
[ci skip] Fix QA issues (#17596)

pandamicro
authored and
minggo
committed

Commits on Mar 28, 2017

fix comment and explicitly initialize _anchorPoint (#17597)
minggo
authored
add 'virtual' for ActionManager functions (#17594)
minggo
authored
Fix some web issues and update web engine (#17600)

pandamicro
authored and
minggo
committed

Commits on Mar 29, 2017

fixed #17603: Connection error in Console uploadFile test. (#17604)

James Chen
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17606)

CocosRobot
authored and
minggo
committed
Fixes ConsoleUploadFile test could not work on android. (#17607)

James Chen
authored and
minggo
committed
remove unneeded test case (#17609)
minggo
authored
[ci skip]make android studio work for release mode (#17610)
minggo
authored
fix error effect (#17612)
minggo
authored

Commits on Mar 30, 2017

copy needed resources (#17618)
minggo
authored

Commits on Mar 31, 2017

fixed #17619: [android] Crash if uncache audio in the finished callback (#17620)

James Chen
authored and
minggo
committed
adjust position (#17622)
minggo
authored
Update engine version (#17624)

pandamicro
authored and
minggo
committed

Commits on Apr 1, 2017

Adds libmd5-rfc third-party library for calculating MD5 since the functions in <openssl/md5.h> aren’t exported in win10, plus <openssl/md5.h> seems to be private header. (#17625)

James Chen
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17626)

CocosRobot
authored and
James Chen
committed
Tizen compilation fix (#17627)

James Chen
authored and
minggo
committed
match the logic to unbind vao (#17628)
minggo
authored
synchronize v3.15
minggo
committed
Sensor timestamp fix, tizen uses micro-seconds as timestamp unit. (#17629)

James Chen
authored and
minggo
committed

Commits on Apr 5, 2017

fixed build properties for compiling md5.c (#17638)

stammen
authored and
minggo
committed
fix resource (#17645)
minggo
authored
fixed bug that toggle can not work at first time (#17647)
minggo
authored
fix comiling issue
minggo
committed
Merge pull request #17630 from minggo/merge-v315
minggo
authored
update readme
minggo
authored
skip some test on android (#17648)
minggo
authored

Commits on Apr 6, 2017

[ci skip]fix some error for Android Studio project (#17655)
minggo
authored
fix error (#17656)
minggo
authored
update architecture picture (#17659)
minggo
authored
cc.Follow not working on mobile
ricardopetrere
authored

Commits on Apr 10, 2017

projection fixes (#17487)

newnon
authored and
minggo
committed
[lua-tests] Check the validity of label instance before setString. (#17664)

James Chen
authored and
minggo
committed
CocosDenshionTest, unload doesn't work for android 5.0.1 devices (#17662)

James Chen
authored and
minggo
committed
Fix can't open URLs that have '&' character. (#17633)

stevetranby
authored and
minggo
committed
Fixed FileUtils::getFileSize() on android platform (#17632)

gallipoly
authored and
minggo
committed
Fixed WebSocket.cpp memory leaks (#17653)

Rubonnek
authored and
minggo
committed
fixed #17665: [android] Crash while launching on the devices only support OpenGL ES 2. (#17671)

James Chen
authored and
minggo
committed
[android] Fixes that android studio project will be created with a default package name ‘org.cocos2dx.MyLuaGame’. (#17674)

James Chen
authored and
minggo
committed
Don’t link with libGLESv1_CM.so (#17673)

James Chen
authored and
minggo
committed
Fixed WebSocket.cpp memory leaks (#17672)

James Chen
authored and
minggo
committed
Merge pull request #17660 from ricardopetrere/patch-1
pandamicro
authored
do not use git command (#17677)
minggo
authored
do not use git command (#17679)
minggo
authored
do not set attributes in java (#17680)
minggo
authored

Commits on Apr 12, 2017

[ci skip]Fix JS test issues reported from QA (#17691)

pandamicro
authored and
minggo
committed

Commits on Apr 13, 2017

fixed #17685: [android] Audio in game couldn't be mute while a ring or a call is coming (#17686)

James Chen
authored and
minggo
committed
[ci skip]Changelog releasenote (#17695)
minggo
authored
Update RELEASE_NOTES.md
minggo
authored
Update RELEASE_NOTES_CN.md
minggo
authored
Update RELEASE_NOTES_CN.md
minggo
authored
Update RELEASE_NOTES_CN.md
minggo
authored
Update RELEASE_NOTES_CN.md
minggo
authored
Cleanup AudioEngine resource after exiting NewAudioEngineTest. (#17675)

James Chen
authored and
minggo
committed
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17693)

CocosRobot
authored and
minggo
committed

Commits on Apr 14, 2017

update release note (#17698)
minggo
authored
Change library/header search paths of external libraries for tvOS. (#17547)

filipe-lemos
authored and
minggo
committed
update v3.15
minggo
committed

Commits on Apr 17, 2017

Merge pull request #17701 from minggo/mergev315
minggo
authored

Commits on Apr 18, 2017

Commits on Apr 19, 2017

Adding additional async functions to FileUtils (#17634)

David DeSimone
authored and
minggo
committed

Commits on Apr 21, 2017

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17733)

CocosRobot
authored and
minggo
committed

Commits on Apr 25, 2017

fix ios label shrink overflow clamp letters issue (#17737)

zilongshanren
authored and
minggo
committed

Commits on Apr 26, 2017

Memory leak, if set equal font in Label.
perminovVS
committed

Commits on Apr 27, 2017

V3.15 (#17752)

RickyZheng001
authored and
minggo
committed
[android] Audio Engine crash on Android when playing and stopping some audios repeatedly. (#17748)

James Chen
authored and
minggo
committed
Support ETC1 Alpha Channel in the Spine Library (#17692)

ADHwang
authored and
minggo
committed

Commits on Apr 28, 2017

Avoid crash on large file download. (#17735)

sbrednikhin
authored and
minggo
committed

Commits on May 3, 2017

Moved CC_SYNTHESIZE and CC_PROPERTY macros onto a single line (#17765)

Almax27
authored and
minggo
committed
fix downloader will not be conitnue (#17761)

Eric Zhong
authored and
minggo
committed
update console (#17772)
minggo
authored
Merge pull request #17756 from perminovVS/set-font-atlas-memory-leak
zilongshanren
authored

Commits on May 4, 2017

Added function for calculating md5 hash from Data. (#17762)

perminovVS
authored and
minggo
committed
Fix android edit box duplicated text (#17775)

zilongshanren
authored and
minggo
committed
Fix reschedule issue with same key (#17706)

Dimon4eg
authored and
minggo
committed
do not use ES3 context if using multi sample (#17778)
minggo
authored

Commits on May 8, 2017

Allow extensions to work out of the box by default on Win32 C++ projects (#17787)

Rubonnek
authored and
minggo
committed
Changing AsyncTaskPool/Scheduler to better leverage move semantics (#17727)

David DeSimone
authored and
minggo
committed
Fix edit box font size and padding
Saumya Mukul
committed
Fix alignment flags
Saumya Mukul
committed

Commits on May 9, 2017

Fixup
Saumya Mukul
committed
Missed padding for default vertical alignment
Saumya Mukul
committed

Commits on May 11, 2017

Commits on May 15, 2017

Merge pull request #17786 from AIGRIND-LLC/patch-1
zilongshanren
authored
[WinRT] Fix removeDirectory unicode. (#17812)

perminovVS
authored and
minggo
committed

Commits on May 16, 2017

Set camera type accordingly in Camera's init methods (#17809)

beroso
authored and
minggo
committed
[Win32] Fix AudioDecoder fopen unicode. (#17815)

perminovVS
authored and
minggo
committed

Commits on May 17, 2017

[Win32,WinRT] Fix old bag, Manifest not save. (#17814)

perminovVS
authored and
minggo
committed
Refactoring editbox and system label on win32 platform (#17828)

zilongshanren
authored and
minggo
committed
[tolua]Lua bindings-generator support android-ndk-r9d android-ndk-r10d android-ndk-r10e (win32 support android-ndk-r9d android-ndk-r10d android-ndk-r10e android-ndk-r11c android-ndk-r13b android-nd…

xbpiao
authored and
minggo
committed

Commits on May 18, 2017

[Win32,WinRT] Fix listFiles and listFilesRecursively use unicode. (#17813)

perminovVS
authored and
minggo
committed

Commits on May 19, 2017

[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17830)

CocosRobot
authored and
minggo
committed
fixed #17835: pauseEventListenersForTarget doesn't work correctly while in dispatching event (#17836)

James Chen
authored and
minggo
committed
Add const keyward to Node::isScheduled and Scheduler::isScheduled (#17833)

Atsumu Ono
authored and
minggo
committed

Commits on May 22, 2017

Allow visit Sprite without camera for render to texture (#17824)

madrazo
authored and
minggo
committed
small BillBoard optimizations (#17825)

madrazo
authored and
minggo
committed
Add const keyword to Node::isScheduled (#17841)

Atsumu Ono
authored and
minggo
committed
Call 'update' method in 'stop/stopAll' to cleanup immediately (#17846)

James Chen
authored and
minggo
committed
Fixing serious XMLHTTP leak when CC_ENABLE_GC_FOR_NATIVE_OBJECTS enabled (#17844)

DavidDeSimone
authored and
minggo
committed
LayerRadialGradient works on mac and iOS (#17826)
minggo
authored
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17848)

CocosRobot
authored and
minggo
committed

Commits on May 23, 2017

make fps stable on iOS (#17852)
minggo
authored
fix action running times for instant actions (#17849)
minggo
authored
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17857)

CocosRobot
authored and
minggo
committed
Fix iskindof (#17785)

dadi
authored and
minggo
committed

Commits on May 25, 2017

update console to fix compiling issue on with Xcode 8.3+ (#17862)
minggo
authored

Commits on May 26, 2017

fix to problem with updating APK in Google Play keeping old OBB (#17689)

hellobody
authored and
minggo
committed
Handle auto layout with scaled widget (#17822)

thuydx55
authored and
minggo
committed
before draw event (#17669)

newnon
authored and
minggo
committed

Commits on May 31, 2017

[Windows]Fix edit box spacing and alignment (#17807)

saumyamukul
authored and
minggo
committed

Commits on Jun 1, 2017

Commits on Jun 3, 2017

fix build for android
joywish
committed

Commits on Jun 4, 2017

add some material params
joywish
committed

Commits on Jun 6, 2017

add chipmunk project
joywish
committed

Commits on Jun 10, 2017

try
joywish
committed

Commits on Jun 28, 2017

Commits on Jun 29, 2017

Commits on Jun 30, 2017

Merge branch 'v3' of https://github.com/joywish/cocos2d-x into v3
joywish
committed