VisualSJ
|
0a526875a8
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
VisualSJ
|
82c09e8d0c
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 22:00:54 +08:00 |
pandamicro
|
10a8adad53
|
Change physics3d api to jsb namespace
|
2015-06-18 20:39:40 +08:00 |
jianglong0156
|
4fe1542d17
|
add navmesh tests
|
2015-06-18 19:22:27 +08:00 |
pandamicro
|
aa566a3722
|
Merge pull request #12424 from pandamicro/physics3d
Fix Physics3D test and js bindings
|
2015-06-18 16:09:49 +08:00 |
jianglong0156
|
85c40b6580
|
Merge pull request #8 from pandamicro/physics3d
Physics3d
|
2015-06-18 14:54:32 +08:00 |
pandamicro
|
811173ea3b
|
Fix Physics3D test and js bindings
|
2015-06-18 14:33:16 +08:00 |
pandamicro
|
9dc52ba72f
|
Merge pull request #12403 from VisualSJ/v3-aa
[ci skip]Fixed some bug
|
2015-06-18 12:31:27 +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 |
VisualSJ
|
44c37c676e
|
change the seek to time
|
2015-06-18 11:54:25 +08:00 |
samuele3hu
|
7f21731bb1
|
Update UIS9NinePatchTest for jsb
|
2015-06-18 10:08:13 +08:00 |
samuele3hu
|
31ce264c6a
|
Add a new line.
|
2015-06-18 09:44:47 +08:00 |
samuele3hu
|
8c01d94945
|
issue #12414:Add UIS9NinePatchTest for js
|
2015-06-18 09:43:05 +08:00 |
samuele3hu
|
31aae38fac
|
issue #12414:Add UIS9NinePatchTest for Lua and js
|
2015-06-18 09:41:16 +08:00 |
VisualSJ
|
400b2d7663
|
Fixed a bug that xhr cross-domain error
|
2015-06-18 09:23:15 +08:00 |
pandamicro
|
3ffc0e6be6
|
Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d
|
2015-06-18 09:20:37 +08:00 |
pandamicro
|
3975d44d3b
|
Chain NavMeshTest
|
2015-06-18 00:58:03 +08:00 |
pandamicro
|
bcf9659408
|
Merge branch 'v3' into navmesh
|
2015-06-18 00:36:37 +08:00 |
pandamicro
|
5b23e8b381
|
Fix resource issue
|
2015-06-18 00:24:01 +08:00 |
pandamicro
|
85e8a407b1
|
Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3
# Conflicts:
# tests/js-tests/project/Classes/AppDelegate.cpp
# tools/tojs/genbindings.py
|
2015-06-17 19:58:24 +08:00 |
samuele3hu
|
683812d817
|
Update Physics3D test for js.
|
2015-06-17 18:50:55 +08:00 |
jianglong0156
|
b265033a41
|
add testcase and manual bindings
|
2015-06-17 18:38:18 +08:00 |
VisualSJ
|
010cb23ead
|
Fixed a bug that xhr cross-domain error
|
2015-06-17 17:10:31 +08:00 |
pandamicro
|
ddc820eb42
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-06-17 15:33:34 +08:00 |
子龙山人
|
fd508a0198
|
Merge pull request #12381 from VisualSJ/v3-aa
[ci skip]Fix some simple bug
|
2015-06-17 15:11:08 +08:00 |
VisualSJ
|
0a223adf7c
|
After exiting should restore settings
|
2015-06-17 14:43:41 +08:00 |
子龙山人
|
dc33a8d66e
|
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
Fix spritepolygon
|
2015-06-17 14:40:30 +08:00 |
VisualSJ
|
fba76b11cd
|
Fixed path bug
|
2015-06-17 14:07:07 +08:00 |
samuele3hu
|
9c550e0a11
|
Update the Physics3DTest for js and Lua by synchronizing the API.
|
2015-06-17 13:58:05 +08:00 |
VisualSJ
|
6669f1df5e
|
Fixed widgetFromJsonFile bug(#20035)
|
2015-06-17 11:49:27 +08:00 |
VisualSJ
|
d855066472
|
Fixed a bug that control's default resource error #20037
|
2015-06-17 11:19:06 +08:00 |
VisualSJ
|
164fb3a058
|
If json have the back button, then use this button
|
2015-06-17 11:16:44 +08:00 |
VisualSJ
|
ab34c1de89
|
Change the path(UIVideoPlayerTest.js)
|
2015-06-16 17:30:48 +08:00 |
pandamicro
|
d51fd2397c
|
Fix js test ES6 usage issue
|
2015-06-16 15:01:52 +08:00 |
pandamicro
|
ccd15b3da7
|
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
|
2015-06-16 00:56:58 +08:00 |
pandamicro
|
4f8bd25a83
|
Add js test cases for sprite polygon
|
2015-06-16 00:56:08 +08:00 |
pandamicro
|
cd7f39d823
|
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
|
2015-06-15 13:22:38 +08:00 |
pandamicro
|
34954c2600
|
Add PolygonSprite Test1
|
2015-06-15 13:21:49 +08:00 |
jianglong0156
|
f9df298401
|
modify copy resource to res/resjs
|
2015-06-15 09:53:53 +08:00 |
pandamicro
|
1a9056cf14
|
Merge pull request #12300 from jianglong0156/textFieldShowString
[ci skip]add textfield show textString
|
2015-06-11 19:33:21 +08:00 |
jianglong0156
|
f97955682a
|
add pr#2928 test case, load same remote img. can callback the function
|
2015-06-11 11:11:51 +08:00 |
jianglong0156
|
96ce3ec22c
|
add textfield show textString
|
2015-06-10 16:15:09 +08:00 |
pandamicro
|
fa71a6e352
|
Merge pull request #12204 from jianglong0156/issue1756
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
|
2015-06-05 13:17:53 +08:00 |
jianglong0156
|
33beab2d81
|
add gzip test
|
2015-06-05 11:40:29 +08:00 |
pandamicro
|
ba1191f98f
|
Merge pull request #12132 from pandamicro/v3_origin
cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread
|
2015-06-04 17:51:11 +08:00 |
jianglong0156
|
6eddf97416
|
fix the platform judge error
|
2015-06-02 17:29:36 +08:00 |
jianglong0156
|
4abaa51e12
|
webview and videoplayer only play in android, ios and web
|
2015-06-02 15:06:44 +08:00 |
jianglong0156
|
c46fea1f7a
|
Merge branch 'v3' into videoplayer
|
2015-06-02 11:26:48 +08:00 |
jianglong0156
|
97d0265e32
|
gzip test
|
2015-06-02 10:23:30 +08:00 |
pandamicro
|
4c6f67fd7e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tools/bindings-generator
web
|
2015-06-02 10:12:22 +08:00 |
pandamicro
|
fdec552ed7
|
Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader
|
2015-06-02 10:08:13 +08:00 |
子龙山人
|
b39006432f
|
Merge pull request #12091 from joshuastray/properties
[ci skip]fix material test
|
2015-05-29 14:22:36 +08:00 |
Jialong Zhai
|
9cf5c1b636
|
fix material test
|
2015-05-29 13:54:29 +08:00 |
jianglong0156
|
8b52563a8a
|
add videoplayer config ini and fix the url bug
|
2015-05-29 11:10:39 +08:00 |
jianglong0156
|
9a62d06091
|
add video player test and auto bindings
|
2015-05-28 18:10:07 +08:00 |
jianglong0156
|
379f536330
|
improve test case, remove the invalid testcase
|
2015-05-28 14:02:07 +08:00 |
jianglong0156
|
c0b42fdfec
|
modify addEventListener to setEventListener
|
2015-05-28 10:12:58 +08:00 |
jianglong0156
|
e105c47cb0
|
improve testcase
|
2015-05-27 18:23:56 +08:00 |
jianglong0156
|
e898a680e2
|
Merge branch 'modifyTestResource' into jsWebviewTest
|
2015-05-27 11:49:23 +08:00 |
jianglong0156
|
521ce15cb6
|
add webview autobindings. modify webtest. adapt the web interface
|
2015-05-27 11:46:26 +08:00 |
jianglong0156
|
9cd2b16ad0
|
modify js resource name
|
2015-05-27 09:52:44 +08:00 |
jianglong0156
|
7820610f13
|
Merge branch 'modifyTestResource' into jsWebviewTest
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
|
2015-05-26 17:49:17 +08:00 |
jianglong0156
|
6f67ec1e6c
|
Merge branch '2d-xv3' into modifyTestResource
|
2015-05-26 16:23:25 +08:00 |
jianglong0156
|
ae4c8d9798
|
fix opengl resource error
|
2015-05-26 14:26:45 +08:00 |
jianglong0156
|
95e8212727
|
add js cocosbuilder resource
|
2015-05-26 14:08:51 +08:00 |
jianglong0156
|
fd05998b5f
|
fix the bug: shader in jsb can not run correctly.
|
2015-05-25 17:48:34 +08:00 |
jianglong0156
|
f1145139ac
|
fix js resource path in code
|
2015-05-25 17:02:26 +08:00 |
minggo
|
e1823fb66d
|
Merge pull request #11968 from jianglong0156/rebuildAutoBindingCons
add the notification node test in sceneTest
|
2015-05-22 14:43:01 +08:00 |
minggo
|
698428e0a1
|
Merge pull request #11971 from joshuastray/physics
Physics3d js binding
|
2015-05-22 14:42:34 +08:00 |
jianglong0156
|
6915213b86
|
add jsb binding parms which can support null object.
add the notification node test in sceneTest
|
2015-05-22 11:01:39 +08:00 |
joshuastray
|
342734e3b5
|
Merge remote-tracking branch 'upstream/v3' into physics
|
2015-05-21 21:15:42 +08:00 |
jianglong0156
|
cf5f3c321c
|
fix invalid native object error
|
2015-05-21 18:10:00 +08:00 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
jianglong0156
|
9ed290e64e
|
Merge branch 'jsTest' into modifyTestResource
|
2015-05-21 17:35:13 +08:00 |
jianglong0156
|
f2b41971d0
|
modify js test resource path
|
2015-05-21 16:21:45 +08:00 |
Dale Stammen
|
aa641189ad
|
fixed audio file path for winrt
|
2015-05-20 11:22:13 -07:00 |
joshuastray
|
712ba4f64c
|
add physics3d auto binding
|
2015-05-20 10:36:26 +08:00 |
joshuastray
|
06846b5b1a
|
added some missing tests
|
2015-05-18 14:44:33 +08:00 |
minggo
|
ff3d28e6d7
|
Merge pull request #11870 from joshuastray/matierial
add material system tests for js
|
2015-05-18 13:33:30 +08:00 |
jianglong0156
|
9434f63ce0
|
modify js-test resource
|
2015-05-18 11:18:19 +08:00 |
joshuastray
|
00dd854578
|
add material system tests for js
|
2015-05-18 10:44:15 +08:00 |
minggo
|
8f7a023233
|
Merge pull request #11848 from VisualSJ/v3-build
Add VideoPlayer and webview tests
|
2015-05-15 16:19:56 +08:00 |
VisualSJ
|
376a3f2866
|
[ci skip]Fix naming errors
|
2015-05-15 15:45:37 +08:00 |
VisualSJ
|
01203a8b1b
|
Increase the VideoPlayer and webview tests
|
2015-05-15 15:31:03 +08:00 |
minggo
|
0a3e6338f1
|
Merge pull request #11834 from pandamicro/v3_origin
Sync fixes in Cocos2d-JS
|
2015-05-14 13:38:18 +08:00 |
pandamicro
|
3190d0e5fb
|
Add localStorage.clear test case
|
2015-05-12 19:02:22 +08:00 |
jianglong0156
|
80326aa40e
|
add webiew jsb code
|
2015-05-12 10:30:51 +08:00 |
joshuastray
|
234f4db8a0
|
add SpritePolygon binding && js tests
|
2015-05-11 17:04:23 +08:00 |
zhangbin
|
b4f2d94109
|
Update js bindings & js tests.
|
2015-05-05 10:50:19 +08:00 |
WenhaiLin
|
e50b14b7fb
|
Add js-tests
|
2015-04-16 18:07:35 +08:00 |