c61cd9afe7
fix spine binding codes and test case ( #17335 )
2017-02-10 11:58:23 +08:00
8825a091bb
update spine to 3.5.35 ( #17331 )
...
* update spine to 3.5.35
* fix jsb compiling error
* fix lua compiling error
2017-02-09 16:57:42 +08:00
1d47ae7e90
Fix typo in function name ( #17253 )
2017-02-04 10:35:56 +08:00
690db56f44
Merge v3.14.1 ( #17231 )
...
* update cocos console to fix compiling error with Android Studio projects (#17129 ) (#17145 )
* fix crash if physics3d camera is not set (#17139 ) (#17144 )
* fix linking error with vs2015 (#17146 )
* fix issue #17116 & #17119 for v3.14.1
* tests cases
* better documentation
* doc: updates sprite doc
* Fix scale9sprite polygon info (#17161 )
* add guard code to Scale9Sprite
* add new test code
* Glfw linux issue (#17166 )
* purge glfw3 before installing glfw3.2
* purge glfw3 before installing glfw3.2
* Update web engine ref (#17169 )
* update version and release note (#17170 )
* issue ##17119 improved v3.14.1 (#17189 )
* update version (#17230 )
2017-01-20 09:59:30 +08:00
00b9dcd62e
Lua custom handler ( #17211 )
...
* avoid crash if custom handler vector is empty
* simplify codes
2017-01-18 17:05:08 +08:00
888b985e0e
Fix variable name typo ( #17195 )
2017-01-16 11:21:34 +08:00
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
64994a2471
make it support .luac file too ( #16981 )
2016-12-09 17:52:45 +08:00
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
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
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
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
868e6f62c5
Fix typos in doc: accpetable / accepteable -> acceptable ( #16641 )
2016-10-04 22:08:56 -07:00
e8c3082229
Move skipBOM function outside to prevent shadowing warning ( #16585 )
2016-09-20 14:52:15 +08:00
91cdb3394b
Suppress warning C4101 on MSVC ( #16573 )
2016-09-14 10:49:14 -07:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
e124fe4fc5
Update CCBProxy.cpp ( #16421 )
...
fixed bug
2016-08-23 14:48:06 +08:00
86b8a633f3
Android arm64-v8a also uses Luajit. ( #16352 )
...
* Android arm64-v8a also uses Luajit.
* Updates external/config.json
2016-08-15 14:57:04 +08:00
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
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
15030ad4c3
Fix typos in log messages
2016-07-25 02:53:22 +09:00
94d4971ddc
Fix typos in documentation and comments
2016-07-22 02:05:19 +09:00
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
c9ad76e56a
Fix a bug, in lua can't get the "backClicked" but a nil
...
in lua, I registerScriptKeypadHandler,when debug on Andriod, after clicking back button, I didn't get "backClicked",but a nil
I see that in CHANGELOG:
cocos2d-x-3.1 May.24 2014
[FIX] EventKeyboard::KeyCode: key code for back button changed from KEY_BACKSPACE to KEY_ESCAPE
so,I fix it , and get the right "backClicked"
2016-07-12 17:37:33 +08:00
3dc167a9f9
use std::abs instead
2016-07-11 12:01:09 +08:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
86af4cdab8
Merge pull request #15897 from halx99/patch-4
...
luabindings: Add script with utf-8 bom support.
2016-06-24 09:58:41 +08:00
ba55723178
Update CCLuaStack.cpp
2016-06-23 13:42:38 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
90434e58d0
fix compile error.
2016-06-23 11:37:20 +08:00
c4def57774
Update CCLuaStack.cpp
...
Lua script utf-8 bom support, handle encrypted script.
2016-06-23 10:24:22 +08:00
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
f41130bafe
luabindings: Add script with utf-8 bom support.
2016-06-21 14:31:25 +08:00
de5dd21ded
Add missing default cases within switch block for JS and Lua JavaBridge
2016-06-08 15:41:44 +09:00
a7d9dd9a75
Print as Lua 5.1 does and remove duplicate code.
2016-05-14 14:09:58 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
bd263d6be4
Fixes deprecated warnings
...
* remove all internal use of FileUtils::getFileData().
2016-04-18 16:45:46 +08:00
24db45e925
Fixes some warnings in Lua manual bindings. ( #15443 )
...
1. Use __Type for deprecated classes.
2. Refactored LuaStack::luaLoadChunksFromZIP() and use FileUtils:getDataFromFile().
3. Fixes wrongly compare NULL with char array.
2016-04-18 16:35:50 +08:00
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
44d2a161dc
Remove unnecessary c_str() calls
2016-02-04 11:52:14 +09:00
366407ca1c
fix win32 compile issue
2016-01-27 20:21:32 +08:00
41dd44c75d
Fix some typos in docs
2016-01-11 19:23:05 +09:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
66b0a0e9b1
Adds `std::nothrow` to the `new` statements
2015-12-16 17:06:56 +08:00
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
8f9ea8a87e
Add missing lua engine export declaration.
2015-12-04 15:23:59 +08:00
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
ec1d76b15e
Fix compile error
2015-11-27 13:08:22 +08:00
58dd27efd3
add missing return type
2015-11-26 17:33:45 +08:00
108d145bf0
Add missing luaval and color3b conversion function export
2015-11-26 15:08:49 +08:00
928dc3ab1f
Add lua value conversion function for cocos studio
2015-11-25 23:03:25 +08:00
145943068f
Add missing function export
2015-11-25 22:35:02 +08:00
9811d6efcf
Combine studio change for LuaBinding, jsb and simulator
2015-11-25 21:52:44 +08:00
e8d853934b
terrain lua bindings
2015-11-23 14:33:39 +08:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
7d93b419fd
Merge pull request #14303 from xiaofeng11/v3_fix
...
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-04 13:52:14 +08:00
3223a97b26
Fix ComponentTest in la-test can not load lua file under iOS & Android
2015-11-03 15:49:46 +08:00
8f632365c3
Fix typos in documentation
2015-11-03 04:43:44 +09:00
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
59d7868d4c
Fix minor typos
2015-10-14 15:12:22 +09:00
7b85211cfe
Remove ScriptComponent
...
Because windows platform can't successfully compile in previous architecture
2015-09-27 22:18:59 +08:00
f4c56e8605
Fixed compile errors
2015-09-26 19:43:36 +08:00
2a3526a3fd
Fix lua project
2015-09-26 19:43:36 +08:00
ddb636a022
Add ScriptComponent and ComponentJS
2015-09-26 19:43:36 +08:00
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
b77d04f593
Fixed link errors
2015-09-19 00:59:28 +08:00
0eaf4c6866
[lua] Wrong callback setting for webview:setOnDidFailLoading
2015-09-17 10:52:17 +08:00
89d81bd959
Merge pull request #12281 from lijinlong/v3
...
luabinding enumerateChildren bug
2015-09-14 22:32:56 +08:00
6073456f23
[Lua] Life control fix for XMLHttpRequest
2015-09-12 17:49:30 +08:00
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
15156a015a
add RadioButton and RadioButtonGroup event type
2015-08-20 22:49:42 +08:00
a799c99b1a
fix setVertexAttribPointer luabinding
2015-08-18 11:46:45 +08:00
9a257d8136
fix lua pai error
2015-08-05 16:15:22 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
979700e343
there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program
2015-08-04 11:30:30 +08:00
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
bd39247192
Add Luabinding conversions for std::map<std::string, std::string>
2015-07-26 07:40:34 +08:00
0a6933cc8c
Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak.
2015-07-14 10:46:17 +08:00
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
370845a738
luabinding enumerateChildren bug
...
第一次调用enumerateChildren的回调时将lua handler释放了，下次再进入回调时报错，将handler释放提到enumerateChildren调用完成后
2015-06-10 17:15:01 +08:00
0cccd6e765
Fix compile error on the Linux and update the test cases
2015-06-03 18:12:21 +08:00
a20681aa21
Add Lua-bindings for NavMesh
2015-06-02 18:37:57 +08:00
001614a9c5
Merge pull request #11908 from flashjay/patch-1
...
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
2015-05-28 10:58:46 +08:00
9934d73548
issue #12046 : Add Lua bindings for material systems and related test cases.
2015-05-27 15:37:59 +08:00
203203a92d
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
...
upgrade rapidjson to 1.0.2
2015-05-25 15:18:15 +08:00
81070a5299
fix lua project compile error
2015-05-25 13:42:54 +08:00
074216bef9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
acb29ed5a8
fix: luaLoadChunksFromZIP should just remove .lua or .luac extension
...
last version may filter modules like 'framework.luaj', 'framework.luaoc'
2015-05-20 10:36:05 +08:00
dec9acfd87
Give more detailed tips by adding function name for luaval_to_object and update the bindings-generator submodule
2015-05-20 10:26:54 +08:00
minggo