Commit Graph

251 Commits

Author SHA1 Message Date
Ricardo Petrére dfdaf9ed61 cc.PI2 was only present in html5 release, added it into JSB (#18860)
[JavaScript] cc.PI2 was only present in html5 release, added it into JSB
2018-05-30 20:36:21 +08:00
leda a5c52607d5 check test cases and fix small bugs before 3.17 release (#18786)
* update edit box H alignment case

* improve label no-break-space test case

* fix label test cases bug

* add GetterSetter define for the placeHolder of TextField

* fix event condition bugs on ParticleTest.lua
2018-04-25 09:50:53 +08:00
leda 8ada72aa5c update web Spine to 3.6.39 2018-04-19 09:26:37 +08:00
Dimon4eg 74daac0751 Support Belarusian language (#18658)
* Support Belarusian language

* Fixed code duplication - moved language convertion code to ccUtils

* added Belarusian language for all platforms

* Fix ios/mac build errors
2018-02-11 09:19:47 +08:00
leeda 18a6d8241d update Copyright. might need manual fix later (#18659)
* Copyright use python script updated. might be fix by manual later

* Revert "Copyright use python script updated. might be fix by manual later"

This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.

* re modify copyright, consider utf-8-sig encoding

* another situation, add Copyright before  "Permission is hereby granted"

* Revert "another situation, add Copyright before  "Permission is hereby granted""

This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.

* another situation, add Copyright before Permission is hereby granted

* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."

* script modify copyright, consider is cocos copyright or not

* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."

* manual fix, not fix audio related

* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
pandamicro 1929265a7c [ci skip] Fix web engine issues for 3.16 QA (#18251)
* Fix web test case issue in UIListView

* imgLoader callback use texture instead of image

* Update web ref
2017-09-11 21:03:22 -05:00
James Chen 7a65363208 Changes JS version to 3.16. (#18210) 2017-09-06 09:10:14 +08:00
minggo c23330e528 webview supports https in jsb (#17805) 2017-05-11 10:25:43 +08:00
Ricardo Petrére c69823ba6f cc.Follow not working on mobile
When using a cc.Follow action, I've tested on mobile devices (Android & iOS) and it's not working. This changed fixed the problem.
2017-04-06 08:45:06 -03:00
pandamicro 4fe75a99b5 Update engine version (#17624) 2017-03-31 16:09:20 +08:00
pandamicro d25cd8ddf4 [ci skip] Fix QA issues (#17596)
* Fix RenderTexture#clear API inconsistency

* Improve js-tests desktop page

* Fix issues in js test cases
2017-03-27 18:03:20 +08:00
pandamicro 0eec73ba43 Bindings fix and assets manger ex fix (#17115)
* Fix custom event being discard during event emission

* Fix tilemap black line issue

* Fix auto bindings config

* Adapt websocket to new memory model

* Improve cocos2d_specifics code stability

* Fix issue with get_or_create_js_object function

* Improve memory usage in function wrapper invocation

* Use JS Function bind to avoid memory tracking issues

* Support size parameter to collect total byte size before update process

* Fix download resuming issue on Android

* Remove temporary assets when temporary manifest is invalid or out of date

* Use version compare handle to compare manifests versions

* Support max concurrent tasks setting & download verify callback

* Add Manifest::Asset conversion

* Avoid crash caused by wrappers

* Sync implementation of tested and published AssetsManagerEx from Cocos Creator

* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
CocosRobot d07794052f Update license to 2017 (#17362)
* Typo: CopyRight -> Copyright

* Copyright update: chukong-inc.com -> Chukong Technologies Inc.

* [js files] Copyright update: 2014 -> 2014-2017

* [cpp files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2015 -> 2015-2017

* [js files] Copyright update: 2014 -> 2014-2017

* Copyright update: 2016 -> 2016-2017

* Copyright update: 2013 -> 2013-2017

* Copyright update: 201?-201? -> 201?-2017

* License year fixes.

* Liscene year fix in CCRay.cpp

* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
minggo c61cd9afe7 fix spine binding codes and test case (#17335) 2017-02-10 11:58:23 +08:00
mogemimi 777a97e141 Fix typo in AudioState (#17258) 2017-02-04 10:34:34 +08:00
pandamicro a715e3169f Sync issue fixes from creator (#17041)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd

* Separate FinalizeHook for ref objects and non ref objects

* Fix spine TrackEntry recursive conversion issue by using getter

* Fix crash during Wrappers deallocation (possible to have leak)

* Increase default JS heap to 32 mb

* Update engine version

* Add change log of web engine

* Improve cc.formatStr

* Fix chipmunk crash issues when using setDefaultCollisionHandler

* Add change log for JSB and update web engine ref
2016-12-21 13:39:34 +08:00
pandamicro 5823f5792b Synchronize creator engine bug fixes and upgrade web engine (#17003)
* Add EventDispatcher#hasEventListener (sync from creator)

* Fix function wrapper using js object during its gc

* Support more system languages

* Direct log/error for better understanding problems & add sys.now

* Synchronize Editbox APIs

* Synchronize Scheduler.PRIORITY_NON_SYSTEM const

* Upgrade web engine

* Upgrade test cases

* Manually bind EventDispatcher::addCustomEventListener to avoid memory issue

* Manual bind EventListeners’ create to avoid memory issue

* Fix compilation issue when COCOS_DEBUG = 2

* Unify function name of Texture2D::releaseTexture

* Fix compilation issues and update web & bindings-generator

* Fix lua compilation issue

* Use %ld instead of %zd
2016-12-14 09:27:47 +08:00
samael c6f98cd95b jsb.addRoot is not a function (#16509)
* jsb.addRoot is not a function

jsb.addRoot is not a function

* Update jsb_cocos2d.js

remove jsb._root
2016-11-09 15:19:32 +08:00
mogemimi 5b8919829c Fix typos in local variables (#16712) 2016-10-20 18:17:37 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522)
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
2016-09-06 10:14:14 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
pandamicro 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
pandamicro 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
mogemimi 808a10429b Fix some typos in comments and strings (#16290) 2016-08-02 15:29:23 +08:00
minggo 9a8f577095 fix some typos (#16269) 2016-07-29 17:20:42 +08:00
pandamicro ccb30cefc7 Update JS versions 2016-07-06 17:02:53 +08:00
pandamicro d02bdda781 Fix callfunc released with retained data (callback, target, extradata) issue 2016-07-01 10:56:17 +08:00
pandamicro d46cd96896 Don't warn user about API deprecation 2016-06-28 12:11:21 +08:00
James Chen cffc9cecd7 cc.Node.ignoreAnchorPointForPostion was deprecated, lua/js script should handle this. 2016-06-22 11:05:04 +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
minggo 7516db0fa8 Merge pull request #15734 from pandamicro/v3
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
pandamicro 1928d24bf0 Made templates support cc.view.setOrientation on web 2016-05-26 19:24:24 +08:00
zilongshanren 3e941be0ce fix actionNode studio 1.6 parser error 2016-05-26 17:20:51 +08:00
minggo 9c0acf1e5d Merge pull request #15619 from VisualSJ/v3_audio
audio search path (android)
2016-05-19 18:06:58 +08:00
ViusualSJ ada1d1dfe8 audio search path (android) 2016-05-11 17:24:14 +08:00
pandamicro d0fc3ec4c4 Add cc.game.end to close game window 2016-05-07 14:37:36 +08:00
Juan Luis Boya García 9c4f3ffa8d Make selectedSprite optional in JSB too 2016-04-11 11:53:53 +08:00
Бесшапошников Никита 54e457f1be Fixed ccui scroll widgets constants for JS bindings 2016-04-11 11:29:00 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
2016-04-11 11:12:34 +08:00
pandamicro f9f9551645 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
Бесшапошников Никита 9acde1bc06 Fixed ccui scroll widgets constants for JS bindings 2016-04-08 15:34:25 +03:00
Ricardo Quesada c4230f839e Merge pull request #15392 from ricardoquesada/chipmunk_js_fix
Chipmunk js fix
2016-04-07 16:24:28 -07:00
Ricardo Quesada f243cc4ce3 fix: use chipmunk v6.2 API whenever possible
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
2016-04-07 16:22:49 -07:00
pandamicro e6d4beef8a Merge pull request #15388 from pandamicro/v3
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro 1ada222c36 Fix some issues
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
pandamicro 817f4f4871 Update engine version 2016-04-07 22:36:29 +08:00
Juan Luis Boya García 73b900a77f Make selectedSprite optional in JSB too 2016-04-05 12:58:50 +02:00
minggo 48d24f14d7 upgrade engine version 2016-03-30 15:17:49 +08:00
pandamicro 849a2ee544 Merge pull request #15215 from minggo/firefox-remote-debug
[ci skip]fix a bug that will miss packets
2016-03-09 16:59:03 +08:00
minggo e44f4d8d61 fix a typo 2016-03-09 16:07:57 +08:00