Commit Graph

286 Commits

Author SHA1 Message Date
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
Paul Gardiner 68ec773f39 lua: generate bindings for Sprite3DMaterial (#16609)
Add Sprite3DMaterial to the list of classes for autogeneration of
lua bindings.

Add a new test case to the end of Sprite3DTest.lua showing the
use of outline.material.
2016-09-30 09:34:16 +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
minggo e9a5a4e2bd Revert luajit (#16397)
* revert to use lua

* comment lua bytecode test

* update release note
2016-08-19 11:49:19 +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
James Chen 12d022d6ea [lua-tests] Reverts uniform after GetUniformTest. (#16357) 2016-08-15 09:41:18 +08: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
mogemimi 5bd2d74078 Fix spelling for `getPolygonCenter` function 2016-07-19 08:24:22 +09:00
minggo 4dfa9d1719 [ci skip]Lua test case issue (#15970)
* modify title and replace or with BitOr

* remove unneeded codes
2016-06-27 18:44:09 +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
minggo 359fdb92f2 remove studio related test cases 2016-06-22 14:05:58 +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
zilongshanren 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
minggo 1de5141473 update label string every 0.1s 2016-03-29 15:25:18 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
mogemimi 23a05ddab2 Fix incorrect function name of getTrianglesCount 2016-03-15 07:39:42 +09:00
zilongshanren b43764fc92 fix lua deprecated function bindings 2016-01-25 14:48:17 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
zilongshanren ac4f66fff2 fix lua focus test 2015-12-19 18:32:43 +08:00
XiaoFeng f6021d502d Fix pageViewTest Horizontal scroll won't work in Lua-test 2015-12-19 13:12:32 +08:00
Ricardo Quesada 0e34a864b2 Merge pull request #14528 from xiaofeng11/v3_3dtouch
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
2015-12-03 22:21:48 -08:00
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
肖峰 bb832f8d60 Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device 2015-12-01 13:02:53 +08:00
songchengjiang dcfdfd3a78 LUA tests: add Sprite3DNormalMappingTest 2015-11-26 11:27:33 +08:00
XiaoFeng 668558b99f Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system 2015-11-06 11:38:41 +08:00
XiaoFeng 80b2def648 Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status. 2015-10-28 14:12:24 +08:00
songchengjiang 29c5ca6ea9 fix the #23309 bug 2015-10-14 11:23:11 +08:00
XiaoFeng aee3244ad3 Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2 2015-10-10 17:50:48 +08:00
XiaoFeng 4df211fa0b Fix particle test under lua test project display different in different platform
Fix cocostudio 3d test under lua test project crash bug
2015-10-10 14:51:14 +08:00
pandamicro a1bbd43f9f Add component test to lua-tests and remove it from lua empty test 2015-09-26 19:43:36 +08:00
pandamicro 3fc1349561 Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:05:26 +08:00
WenhaiLin db102f2030 [ci skip]Lua-tests:Fixed physical test cases. 2015-09-19 00:03:21 +08:00
pandamicro 0cbc1e5f40 Merge pull request #13923 from WenhaiLin/v3-physics-refine
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
hanxi b1ed1a8a51 add UIEditBox support linux platform. 2015-09-18 17:11:58 +08:00
WenhaiLin a17a702cd1 Refine components to improve performance 2015-09-18 14:34:02 +08:00
James Chen 10e45ee744 Updates XMLHttpRequestTest.lua 2015-09-12 19:11:32 +08:00
zhangbin 8e9928ad99 Remove performance tests from lua-tests & js-tests. 2015-09-11 10:53:17 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
andyque 15156a015a add RadioButton and RadioButtonGroup event type 2015-08-20 22:49:42 +08:00
andyque 72496ae426 add missing ui test in Lua 2015-08-20 15:25:09 +08:00
子龙山人 1f735b4f0e Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
Fixed setVertexAttribPointer luabinding and Test case.
2015-08-19 11:43:18 +08:00
WenhaiLin 5dd6d94c17 Test cases:improve small problems. 2015-08-18 22:19:24 +08:00
fusijie f671d36e31 Fixed lua testacase setPointer error. 2015-08-18 11:19:32 +08:00
pandamicro 6644b06643 Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
肖峰 4575587cf7 Fix cocostudio 3d test crash on mobile platform 2015-08-08 11:57:40 +08:00
WenhaiLin 772dab2002 Fixed minor problems in test cases. 2015-08-07 23:08:49 +08:00
pandamicro 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
dualface ea594b92b4 add ActionTime lua test 2015-07-29 17:50:50 +08:00