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 |
dualface
|
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 |
kompjoefriek
|
6eca03fdd2
|
Merged changes from "Vibrate support in v4" into v3 branch.
|
2015-06-26 01:02:44 +02:00 |
samuele3hu
|
ad4f5b8ec0
|
Fix the some lua tests case bug
|
2015-06-25 15:13:01 +08:00 |
samuele3hu
|
5c5f3dcc79
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 20:03:14 +08:00 |
samuele3hu
|
e2aa669b8d
|
Fix the LayerTest error about Lua
|
2015-06-23 20:02:26 +08:00 |
Vincent Yang
|
27d011dd50
|
Fixbug: LabelTestNew New Label + CharMap's effect is wrong.
|
2015-06-23 16:02:38 +08:00 |
pandamicro
|
b08325dd5b
|
Merge pull request #12475 from samuele3hu/v3_7_test
[ci skip]Fix the some test cases error about Lua
|
2015-06-23 13:15:21 +08:00 |
samuele3hu
|
3b766e5236
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
|
2015-06-23 10:20:05 +08:00 |
samuele3hu
|
683c5b4cb2
|
Fix the LabeLTestNew error.
|
2015-06-22 22:32:21 +08:00 |
samuele3hu
|
bc964c96da
|
Fix the error about the Camera3D Test
|
2015-06-22 09:28:18 +08:00 |
samuele3hu
|
0181a84883
|
Fix the bugs about the particle3DTest
|
2015-06-22 09:27:34 +08:00 |
pandamicro
|
000be8316b
|
Merge pull request #12415 from samuele3hu/v3_7_ui
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 12:30:28 +08:00 |
samuele3hu
|
6c749a77f2
|
Fix the bugs about the Physics3DTest for Lua.
|
2015-06-18 11:17:08 +08:00 |
samuele3hu
|
31aae38fac
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 09:41:16 +08:00 |
子龙山人
|
dc33a8d66e
|
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
Fix spritepolygon
|
2015-06-17 14:40:30 +08:00 |
samuele3hu
|
9c550e0a11
|
Update the Physics3DTest for js and Lua by synchronizing the API.
|
2015-06-17 13:58:05 +08:00 |
Jacky
|
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 |