Commit Graph

2544 Commits

Author SHA1 Message Date
minggo 1b6c8cc5c1 bind FileUtils:getDataFromFile() to lua (#17182) 2017-01-13 13:39:58 +08:00
minggo afb55253f1 fix dutch language value and add missing languages (#17160) 2017-01-11 14:04:45 +08:00
CocosRobot 90e0ab0c2e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17152) 2017-01-11 10:49:48 +08:00
CocosRobot 91ae4b1c03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17143) 2017-01-10 16:59:15 +08:00
kosmosR2 44fb4ba3bc To use some HTTP client library those use `send(null)` like `superagent`,`XMLHTTPRequest` should send a empty request instead of abort. (#16989) 2017-01-05 16:12:03 +08:00
CocosRobot#Set 69217f0e8b [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2017-01-05 01:40:38 +00:00
minggo a0acaf5972 Merge pull request #17101 from minggo/merge-v314
Merge v314
2017-01-04 11:48:31 +08:00
CocosRobot 61170c69ee [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17103) 2017-01-04 11:47:58 +08:00
minggo f63fad3e27 Merge branch 'v3.14' into merge-v314 2017-01-04 09:49:22 +08:00
pandamicro 88be66218b Small fix to CallbackWrapper 2016-12-26 00:08:59 +08:00
pandamicro 7c2ea03b00 Improve TrackEntry issue solution with internal unordered_map 2016-12-26 00:08:18 +08:00
pandamicro 100c027054 Fix chipmunk crash issues when using setDefaultCollisionHandler 2016-12-21 11:07:18 +08:00
pandamicro a3d6705b02 Improve cc.formatStr 2016-12-21 11:05:49 +08:00
pandamicro 24be2acde0 Merge branch 'v3.14' of github.com:cocos2d/cocos2d-x into v3.14
# Conflicts:
#	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
#	cocos/scripting/js-bindings/manual/js_manual_conversions.cpp
#	cocos/scripting/js-bindings/manual/jsb_event_dispatcher_manual.cpp
#	tests/js-tests/src/SpineTest/SpineTest.js
2016-12-19 12:39:55 +08:00
pandamicro 149bdf125e Update engine version 2016-12-19 12:15:41 +08:00
pandamicro 51a09048bd Increase default JS heap to 32 mb 2016-12-19 11:51:43 +08:00
pandamicro a508b7d751 Fix crash during Wrappers deallocation (possible to have leak) 2016-12-19 11:51:23 +08:00
pandamicro 46dbb32fd9 Fix spine TrackEntry recursive conversion issue by using getter 2016-12-19 11:50:52 +08:00
pandamicro 2b6e84e9a2 Separate FinalizeHook for ref objects and non ref objects 2016-12-19 11:50:32 +08:00
CocosRobot 77d0e8292a [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17016) 2016-12-15 10:03:04 +08:00
James Chen c0291afad7 Merge branch 'v3.14' into merge-v3.14 2016-12-14 17:03:58 +08:00
CocosRobot edca6862b9 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17009) 2016-12-14 09:37:46 +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
pandamicro a73485a1bc Use %ld instead of %zd 2016-12-13 18:12:50 +08:00
pandamicro d89bde4e8e Fix compilation issues and update web & bindings-generator 2016-12-13 15:37:46 +08:00
pandamicro bedde74df5 Fix compilation issue when COCOS_DEBUG = 2 2016-12-13 14:29:25 +08:00
pandamicro 00b57c9565 Manual bind EventListeners’ create to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 3d6b1367cd Manually bind EventDispatcher::addCustomEventListener to avoid memory issue 2016-12-13 14:29:24 +08:00
pandamicro 6b25a73a93 Synchronize Scheduler.PRIORITY_NON_SYSTEM const 2016-12-13 14:29:24 +08:00
pandamicro d4618e60ef Synchronize Editbox APIs 2016-12-13 14:29:24 +08:00
pandamicro ae5ccd16f2 Direct log/error for better understanding problems & add sys.now 2016-12-13 14:29:23 +08:00
pandamicro b50ea4afce Support more system languages 2016-12-13 14:29:23 +08:00
pandamicro 197dac204b Fix function wrapper using js object during its gc 2016-12-13 14:29:23 +08:00
minggo 64994a2471 make it support .luac file too (#16981) 2016-12-09 17:52:45 +08:00
CocosRobot 77f5204877 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16972) 2016-12-09 14:30:01 +08:00
CocosRobot#Set 5ef072de03 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-12-05 01:43:54 +00:00
CocosRobot f72b950465 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16926) 2016-11-30 11:33:49 +08:00
CocosRobot 129838d960 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16896) 2016-11-24 11:39:02 +08:00
CocosRobot 18204c1e37 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16880) 2016-11-21 15:00:00 +08:00
CocosRobot 7c6f0598b2 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16861) 2016-11-18 09:27:20 +08:00
pyrosphere 663bb4d7ed No CC_UNUSED_PARAM (#16812)
* Added -Wno-unused-parameter and removed all uses of the CC_UNUSED_PARAM macro

* Commented unused parameter names in .cpp files which previously used CC_UNUSED_PARAM

* Reverted -Wno-unused-param flag.
Moved deprecated touch methods definitions to .cpp file.
Commented more unused parameter names.

* Fixed some errors and warnings caused by the previous commit.

* Commented remaining unused parameter names in .cpp files.

* Fixed unused parameter warnings in headers.

* Fixed some more unused parameter warnings.

* Fixed some more unused parameters warnings.

* Fixed mistake in previous commit, missing ComAudioReader:: in method. Other warnings.

* Fixed build errors.

* Added missing file to CMakeLists
2016-11-16 09:48:37 +08:00
Tate Allen f99dae383f Fixed math error (issue #16837) in Lua function radian2angle (#16848) 2016-11-16 09:35:47 +08:00
CocosRobot d0705d9e25 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16828) 2016-11-09 17:33: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
CocosRobot 2d18d703a0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16810) 2016-11-04 14:07:25 +08:00
David DeSimone 9204c87cfc Adding performance.now() to cocos2d-js. (#16766)
* Adding performance.now() to cocos2d-js. See https://developer.mozilla.org/en-US/docs/Web/API/Performance/now

* Fixing improper logic for converting from microseconds, to milliseconds with micro-precision

* Adding performance.now tests
2016-11-04 11:58:48 +08:00
CocosRobot 9eb177c6cc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16802) 2016-11-03 15:29:09 +08:00
Bin Zhang 3b87e46280 Support compile & run project on Tizen by cocos command. (#16783)
* Add config files for build engine source code on tizen.

* Add config files for cpp-empty-test on tizen.

* Add missing files.

* Add config files for cpp-tests on tizen.

* Add Tizen config files for lua-bindings.

* Add Tizen config files for lua-empty-test.

* Solve the error when build lua-empty-test for Tizen.

* Add Tizen config files for lua-tests.

* Solve the error when build lua-tests for Tizen.

* Add tizen config files for templates.

* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
Paul Gardiner a888f42d7f Lua: have cc.Ray:intersects additionally return the distance (#16677)
cc.Ray:intersects now returns two results, an indication of hit or
not, plus the distance along the ray. The function can still be called
expecting a single argument and hence is backward compatible.

Also correct the debug error message
2016-11-02 09:45:24 +08:00
CocosRobot#Set 57903077d0 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-30 01:00:27 +00:00
CocosRobot 3ab1be61a7 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16764) 2016-10-28 10:13:57 +08:00
pandamicro e4170a7b02 Improve JS bindings (#16751)
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref

* Fix leak: js_remove_object_reference can not remove non binding objects

* Fix ScriptingCore::evalString

* Add missed `__cppCreated` for JS create objects

* Fix manifest path issue
2016-10-28 09:29:56 +08:00
CocosRobot 44f6865697 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16750) 2016-10-27 11:15:24 +08:00
niu2x 92af2b2b6f bug fix (#16747) 2016-10-27 09:46:07 +08:00
Ricardo Quesada 323ea7c0d4 Sprite scale9 (#16702)
* Adds slice9 support for Sprite.

how to use it:

// points coords
sprite->setCenterRect(Rect(x,y,w,h));

// normalized coords
sprite->setCenterRectNormalized(Rect(x,y,w,h));
starts scale9sprite in sprite

more slice 9 changes

sprite 9 slice works?

kind of works

correct anchor point

slice 9 works, at least with non-rotated atlases

streched works ok

better Y invert code.

cleaner, compatible with the previous code

yay, scaling workings...

need a better api now

sets scale correctly

yay! works as expected!

more fixes and tests

better test for box

setContentSize() changes size in non-9-slice mode sprites as well

setCenterRect() -> setCenterRectNormalized()

yet another test

adds setPositionNormalized()

adds setCenterRect() tests

remove devel team from xcode

tests: add one more tests

fun test!

improved test

yet another test for slice 9

* fixes anchorPoint issues

* adds documentation

* fix: using top-left coordinate for setRect

* sprite: fixes related to scale9 and tiled

* Sprite: slice 9 fixes

works Ok with rotated frames
uses `setCapInsets` instead of `setCenterRect` to be more familiar
with `UIScale9Sprite`

* fixes js and lua bindings for Autopolygon
2016-10-26 18:45:40 -07:00
mogemimi 5b8919829c Fix typos in local variables (#16712) 2016-10-20 18:17:37 +08:00
Paul Gardiner 875cf45d1d Lua: add cc.vec3 functions - add, sub, mul and dot (#16706)
Also update the lua test to use these functions.
2016-10-17 10:39:40 +08:00
CocosRobot 23ff5fc51f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16676) 2016-10-11 11:40:11 -07:00
Wilson E. Alvarez cdee1e11de Performance tweak: use range-based for-loops instead of iterator-based for-loops. (#16642)
* Use ++ prefix instead for non-primitive data types in CCAutoPolygon.cpp

* Use ++ prefix instead for non-primitive data types in SimpleAudioEngine.cpp

* Use ++ prefix instead for non-primitive data types in CCNodeLoaderLibrary.cpp

* Use ++ prefix instead for non-primitive data types in CCActionManagerEx.cpp

* Use ++ prefix instead for non-primitive data types in CCDataReaderHelper.cpp

* Use ++ prefix instead for non-primitive data types in HttpClient-android.cpp

* Use ++ prefix instead for non-primitive data types in CCDevice-linux.cpp

* Use ++ prefix instead for non-primitive data types in ScriptingCore.cpp

* Switched implementation to range-based for loops

* Added readability, fixed loop in CCDataReaderHelper.cpp

Thanks to Dimon4eg for the code review.
2016-10-11 10:59:44 -07:00
Ricardo Quesada e4be87a059 Adds Spine binary-file format support (#16629)
* Adds Spine binary-file format support

fixes issue #10438

* ignore SkeletonBinary.c from linter

* add another file to the exclude list

* lua manual fixes for spine

* SkeletonBinary.c and not .cpp

* missing files for win8.1

* don't compile it as crt

* new updates from spine
2016-10-11 10:56:14 -07:00
CocosRobot#Set f280ed2cdb [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically 2016-10-11 01:51:00 +00:00
9b9387 0c8376411e Update GuiConstants.lua (#16666)
- fixed PageView constant
2016-10-10 13:56:42 +08:00
Paul Gardiner 1c0602e130 Remove unnecessary arguments from some lua cc.mat4 methods (#16658)
* Lua: remove unused 3rd argument from cc.mat4.transformVector

cc.mat4.transformVector takes a mat4 and a 4vector and returns the result
of applying the mat4 to the vector. Strangely it had been made to also
require a third argument called dst which it doesn't use but did check
was a vec4. This commit allows cc.mat4.transformVector to be called
without the unnecessary argument. We still permit calling with it for
backward compatibility.

Also changed is the wrapper in Cocos2d.lua so that a second form of
cc.mat4.transformVector can be used where the vector is supplied as
4 separate numbers.

Changed the test files to call without the unnecessary argument.

* Lua: remove unused argument from cc.mat4.createTranslation/Rotation

Both these functions have an extra unnecessary argument called dst,
although neither use it either to pass in or out a value. This
commit removes the extra argument and updates the test programs
correspondingly.

Also, within Cocos2d.lua, remove some definitions that are later
overwritten by new ones
2016-10-08 14:33:50 +08:00
mogemimi 868e6f62c5 Fix typos in doc: accpetable / accepteable -> acceptable (#16641) 2016-10-04 22:08:56 -07:00
CocosRobot c046257efc [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16630) 2016-09-30 09:44:34 +08:00
minggo a6f3773aef Luajit (#16620)
* update console

* load lua according architecture

* install android-13 in travis
2016-09-28 16:19:20 +08:00
mogemimi 8b703a8d12 Fix implicit conversion warning (#16598)
* Fix implicit conversion warning

* Change SAXParser::textHandler parameter type from int to size_t
2016-09-26 14:49:47 +08:00
pandamicro 466053b740 Fix JS AssetsManagerTest and Improve scheduler wrapper (#16605)
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref
2016-09-26 14:44:32 +08:00
mogemimi e8c3082229 Move skipBOM function outside to prevent shadowing warning (#16585) 2016-09-20 14:52:15 +08:00
colajam93 e7f739897c Fix deprecated warning (#16592) 2016-09-20 14:48:00 +08:00
mogemimi 91cdb3394b Suppress warning C4101 on MSVC (#16573) 2016-09-14 10:49:14 -07:00
CocosRobot 7410bdd981 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16563) 2016-09-12 10:03:21 +08:00
CocosRobot ced81f3527 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16554) 2016-09-12 09:46:19 +08:00
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +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
CocosRobot 8d2b645a96 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16519)
* fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16517)

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-09-06 10:11:11 +08:00
CocosRobot 8947ff722e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16514) 2016-09-05 13:48:58 +08:00
CocosRobot 6f4551cdad [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16513) 2016-09-05 10:19:41 +08:00
James Chen 5bfd110424 Fixes jsval_to_std_string could not convert number to string. (#16504)
Don't use deprecated method in ActionsProgressTest.
2016-09-05 10:02:05 +08:00
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
minggo df3b33cd59 Merge pull request #16457 from minggo/merge-v3.13
Update rapid json to version 1.1.0.
2016-08-29 15:22:01 +08:00
minggo 04fd2b16b2 merge v3.13 back to v3 2016-08-29 11:57:13 +08:00
CocosRobot ee4d59cf76 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16454) 2016-08-29 11:48:21 +08:00
9b9387 e124fe4fc5 Update CCBProxy.cpp (#16421)
fixed bug
2016-08-23 14:48:06 +08:00
CocosRobot 56cfd76b4c [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16411) 2016-08-22 15:49:43 +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
minggo e9a5a4e2bd Revert luajit (#16397)
* revert to use lua

* comment lua bytecode test

* update release note
2016-08-19 11:49:19 +08:00
CocosRobot d09ee83c5a [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16395) 2016-08-19 09:36:50 +08:00
CocosRobot 7540a64fd8 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16370) 2016-08-16 16:56:06 +08:00
James Chen 86b8a633f3 Android arm64-v8a also uses Luajit. (#16352)
* Android arm64-v8a also uses Luajit.

* Updates external/config.json
2016-08-15 14:57:04 +08:00
CocosRobot 7f222c92e0 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16360) 2016-08-15 10:53:07 +08:00
JaryGuo f9abbf02f6 fix the problem in ccUTF8.cpp and CCLuaJavaBridge.cpp (#16314)
* fix the return value when return null in java

fix the return value when return null in java

* fix getStringUTFCharsJNI

fix getStringUTFCharsJNI when srcjStr is null

* remove a word

remove a word added by mistake

* make a indention

line 233 utf8Str
2016-08-08 10:43:14 +08:00
James Chen b135d512d2 Update copyright to 2016. (#16311) 2016-08-05 09:42:15 +08:00
mogemimi 808a10429b Fix some typos in comments and strings (#16290) 2016-08-02 15:29:23 +08:00
CocosRobot aac49e35e1 [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16284) 2016-07-31 22:50:28 +08:00
minggo 9a8f577095 fix some typos (#16269) 2016-07-29 17:20:42 +08:00
CocosRobot c5923e00ca [ci skip][AUTO]: updating luabinding & jsbinding automatically (#16261) 2016-07-29 13:40:46 +08:00
CocosRobot af1783364b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-07-29 01:43:11 +00:00
Ricardo Quesada 2945968614 Upgrades to Spine v3.4 (#16242)
* Upgrades to Spine v3.4

Github issue #16115

* compiles and works on windows

tested on:

* win32
* win10
* win8.1

* include-linter: don't test spine files

we need them unmodified

* spine bindings fixes

also, doesn't use goblins-ffd. instead it uses goblins.
goblins-ffd is no longer present in spine v3.4
2016-07-28 07:25:50 -07:00