c4042c220b
[ci skip]fix issue that can not change position style, can not add new emitter ( #18272 )
2017-09-15 10:49:04 +08:00
19962a3b59
[ci skip]don't clean layer when switch to another layer ( #18267 )
2017-09-14 17:42:56 +08:00
36f7f3c37e
Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316
2017-09-13 11:18:39 +08:00
ec83cc99cc
[ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. ( #18244 )
2017-09-08 16:42:12 +08:00
5cf8db85d4
Fixes crash of lua particle test while building lua-tests in release mode. ( #18221 )
2017-09-06 15:06:21 +08:00
30266b4ddd
[ci skip]Fixes crash of lua particle test while building lua-tests in release mode. ( #18222 )
2017-09-06 15:05:47 +08:00
afe7ddcad3
Updates EventDispatcherTest for js-tests and lua-tests. ( #18211 )
...
Fixes http://punchbox.info:3000/issues/26293
Uses removeFromParent(false) for not cleaning up EventListener associated with node.
2017-09-06 15:05:03 +08:00
03635ecc4a
Improved Cocos2dxLuaLoader.cpp ( #18171 )
...
* Improved Cocos2dxLuaLoader.cpp
* Added testcase for new LuaLoader
2017-08-25 09:32:02 +08:00
d11674fd9c
[ci skip]implementation conversion lua table to ObjC Dictionary ( #18134 )
2017-08-24 14:17:21 +08:00
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
e5e87311b6
[lua-tests] Check the validity of label instance before setString. ( #17664 )
...
* [lua-tests] Check the validity of label instance before setString.
fixed http://punchbox.info:3000/issues/26233
* Minor fix: Adds missing test case in NewAudioEngineTest.
2017-04-10 10:14:06 +08:00
513092bd88
fix error ( #17656 )
2017-04-06 16:18:28 +08:00
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
d2a5c194cc
adjust position ( #17622 )
2017-03-31 10:20:08 +08:00
b6d42e0b42
fix error effect ( #17612 )
2017-03-29 17:20:01 +08:00
c5140f7af2
remove unneeded test case ( #17609 )
2017-03-29 14:24:11 +08:00
c8af3fe0bd
fix crash in release mode ( #17592 )
2017-03-27 15:19:24 +08:00
f90691eb63
Fix spelling: billborad -> billboard ( #17560 )
2017-03-22 09:21:34 +08:00
8be22ce55c
Fix typos in comments and strings ( #17534 )
2017-03-17 10:44:38 +08:00
b04fcbcd30
fix the broken of lua-tests after PR #17445 was merged. ( #17454 )
...
repeat is a keyword in lua.
2017-03-07 10:14:55 +08:00
e293520057
Fix some local variable names in tests ( #17445 )
2017-03-06 10:01:53 +08:00
cfbbc65c71
Fix various typos in comments and strings ( #17410 )
2017-02-27 11:12:29 +08:00
454fd8518b
Fix minor typos in tests ( #17404 )
2017-02-24 12:45:41 +08:00
48cbc890c6
Typo fix: Rename `MutiTouchTest` to `MultiTouchTest` ( #17399 )
2017-02-23 17:05:08 +08:00
619e012d9b
[WebSocket] Adds support for getting url and server selected protocol ( #17381 )
...
* [WebSocket] Adds support for getting url and server selected protocol
* Adds const keyword for getter methods, and make LOGE also works in release mode.
2017-02-20 09:44:20 +08:00
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
1b6c8cc5c1
bind FileUtils:getDataFromFile() to lua ( #17182 )
2017-01-13 13:39:58 +08:00
20d8ef9584
make it work with release mode on arm64 bit ( #17057 )
2016-12-23 16:44:29 +08:00
de670c1913
Lua tests ( #17005 )
...
* fix conflict effect
* set index to 1 before running a test case
2016-12-14 09:28:19 +08:00
ba7c977111
use no border policy ( #17004 )
2016-12-13 16:31:31 +08:00
91daa7a12a
Fixes NewEventDispatcherTest. ( #16983 )
...
fixed http://punchbox.info:3000/issues/26036
2016-12-12 09:39:20 +08:00
951b5174db
[lua-tests] Fixes PhysicsDemoBug5482 crashes. ( #16979 )
...
Fixed http://punchbox.info:3000/issues/26011
2016-12-09 14:12:57 +08:00
fb3055e98c
remove duplicated codes to fix crash in release mode ( #16978 )
2016-12-09 13:42:16 +08:00
e6aa2ace3e
[lua] Fixes AssetsManagerEx test crashes. ( #16977 )
2016-12-09 12:04:38 +08:00
a0b67fc99a
Fixes lua action test ‘Issue 1305’ crashes. ( #16974 )
...
* Fixes lua action test ‘Issue 1305’ crashes.
* Removes an unused log.
2016-12-09 10:39:34 +08:00
fb89672fff
Updates lua CCControlSliderTest. ( #16968 )
...
* Updates lua CCControlSliderTest.
fixed http://punchbox.info:3000/issues/26029
* [lua-tests] Fix the display position of CCControlSilderTest on win32.
2016-12-07 14:55:43 +08:00
3db39a27ea
Vibrate test ( #16966 )
...
* only show vibrate test on iOS and Android device
* vibrate no matter it is silient or not
2016-12-07 11:12:38 +08:00
1b0a6c2c5c
Sync editbox improvement from cocos creator ( #16965 )
...
* sync the changes from creator
* fix editbox vertical alignment
* improve android editbox multiline text vertical alignment
2016-12-07 09:21:17 +08:00
77fb210b3a
fix wrong codes and simplify codes ( #16964 )
2016-12-06 17:38:06 +08:00
babced8b7c
Fixes lua-tests/keypad test case. ( #16954 )
...
* Fixes lua-tests/keypad test case.
* Updates string
2016-12-02 15:50:53 +08:00
8f9b096792
fix url and use https protocol ( #16940 )
2016-11-30 17:51:57 +08:00
7e100135b6
disable menu item according different angle of view ( #16937 )
2016-11-30 16:49:50 +08:00
28e48c0af8
remove unneeded test case ( #16936 )
2016-11-30 16:21:33 +08:00
6b27f014fc
Correct the Skybox fov ( #16655 )
...
* Remove undrawn quads from the skybox mesh
CCSkybox had been implemented using a combination of two
inconsistent techniques. The rendering was being achieved via use of
the vertex shader's inherent support for cubemaps. That technique requires
only a single screen-covering quad, but the implemtation defined a cube.
Defining a cube mesh would be appropriate if one were simply mapping the
cubemap's 6 textures to faces, but is unnecessary if using the shader's
cubemap feature.
Not only was the use of a cube mesh unnecessary, but the particular way
the cube was defined and used meant that only one face would ever
contribute to the rendering. One of the other faces would always be culled
and the other four would be viewed edge on, mapping the the infinitesimally
thin lines defining the edges of the screen.
This commit simply removes the never-rendered faces, and adds comments
explaining the technique.
* Within test code, remove setScale calls applied to skyboxes.
A Skybox is defined in such a way that it's position, rotation and
scaling has no effect on it's rendering, so setScale has no effect.
The calls are removed from test code to avoid confusing anyone using
it as a template for their own programs.
* Make the Skybox correctly account for the camera's fov
The Skybox does not use the model/view and projection matricies. Instead
a single quad that maps exactly to the screen is rendered and the camera's
world matrix is passed into a shader that renders using cubemap lookups.
The way that works hardwires the fov to 90deg in both the horizontal and
vertical. That shows up particularly badly when the camera is pointed
directly downwards and rotated: the image deforms as it rotates.
This commit corrects the problem by using scaling factors from the
camera's projection matrix to prescale the matrix passed into the shader.
2016-10-17 13:46:26 +08:00
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
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
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
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
e9a5a4e2bd
Revert luajit ( #16397 )
...
* revert to use lua
* comment lua bytecode test
* update release note
2016-08-19 11:49:19 +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
12d022d6ea
[lua-tests] Reverts uniform after GetUniformTest. ( #16357 )
2016-08-15 09:41:18 +08:00
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
5bd2d74078
Fix spelling for `getPolygonCenter` function
2016-07-19 08:24:22 +09:00
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
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
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
359fdb92f2
remove studio related test cases
2016-06-22 14:05:58 +08:00
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
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
1de5141473
update label string every 0.1s
2016-03-29 15:25:18 +08:00
589d7e47bf
fix polygon api typo
2016-03-17 17:16:56 +08:00
a1b4cd845f
Revert "Fix incorrect function name of getTrianglesCount"
2016-03-17 16:38:17 +08:00
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +08:00
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
ac4f66fff2
fix lua focus test
2015-12-19 18:32:43 +08:00
f6021d502d
Fix pageViewTest Horizontal scroll won't work in Lua-test
2015-12-19 13:12:32 +08:00
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
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
dcfdfd3a78
LUA tests: add Sprite3DNormalMappingTest
2015-11-26 11:27:33 +08:00
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
80b2def648
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 14:12:24 +08:00
29c5ca6ea9
fix the #23309 bug
2015-10-14 11:23:11 +08:00
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
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
a1bbd43f9f
Add component test to lua-tests and remove it from lua empty test
2015-09-26 19:43:36 +08:00
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
db102f2030
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:03:21 +08:00
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
10e45ee744
Updates XMLHttpRequestTest.lua
2015-09-12 19:11:32 +08:00
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +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
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
5dd6d94c17
Test cases:improve small problems.
2015-08-18 22:19:24 +08:00
f671d36e31
Fixed lua testacase setPointer error.
2015-08-18 11:19:32 +08:00
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
772dab2002
Fixed minor problems in test cases.
2015-08-07 23:08:49 +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
ea594b92b4
add ActionTime lua test
2015-07-29 17:50:50 +08:00
184225519e
add ActionTime lua test
2015-07-29 17:36:54 +08:00
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
ad4f5b8ec0
Fix the some lua tests case bug
2015-06-25 15:13:01 +08:00
minggo