Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
36,624 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

589 Commits

Author SHA1 Message Date
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
Dale Stammen 808de7b475 removed e option from xcopy 2015-06-03 09:54:43 -07:00
Dale Stammen 18ce48dc2a /NODEFAULTLIB:MSVCRT to fix linker warning 2015-06-03 09:26:15 -07: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 c3aae69fc0 modify proj.android-studio copy resource path 2015-05-27 10:08:03 +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 fb4d638231 copy resources in linux 2015-05-26 16:34:04 +08:00
jianglong0156 60e3b5390d copy resources in android 2015-05-26 16:33:47 +08:00
jianglong0156 6f67ec1e6c Merge branch '2d-xv3' into modifyTestResource 2015-05-26 16:23:25 +08:00
jianglong0156 e117d62b13 add js-test resource copy command 2015-05-26 14:47:49 +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
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
jianglong0156 6e27825dec add web shader resource 2015-05-25 16:51:58 +08:00
Bin Zhang 3d0c716ee9 Add script in build.gradle for sign the release apk. 2015-05-22 15:52:41 +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
Bin Zhang 94e2e1cb00 Modify the configuration for android studio support in console. 2015-05-21 18:27:30 +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
Bin Zhang 41792caa6b Add files & configuration for android studio support in console. 2015-05-21 16:34:03 +08:00
jianglong0156 f2b41971d0 modify js test resource path 2015-05-21 16:21:45 +08:00
Bin Zhang 78d4089215 Add the project.properties for the ndk-build of proj.android-studio. 2015-05-21 15:43:01 +08:00
Bin Zhang 37dddf9b15 Add execute permission for the gradlew in proj.android-studio. 2015-05-21 15:31:18 +08:00
Dale Stammen aa641189ad fixed audio file path for winrt 2015-05-20 11:22:13 -07:00
Dale Stammen 209e7c62f4 added libbullet to Windows 8.1 Universal App projects 2015-05-20 08:01:01 -07:00
Dale Stammen 3523173594 removed CC_PLATFORM_WP8 2015-05-20 07:58:39 -07:00
Dale Stammen d68f2c1c3d removed CC_PLATFORM_WP8 2015-05-20 07:56:14 -07:00
WenhaiLin a569d877ba [ci skip]Remove unnecessary code. 2015-05-20 18:05:46 +08:00
joshuastray 712ba4f64c add physics3d auto binding 2015-05-20 10:36:26 +08:00
WenhaiLin df3548673f Remove unnecessary files. 2015-05-20 10:19:32 +08:00
minggo e700ef6d30 Merge pull request #11856 from WenhaiLin/v3-support-android-studio 
Add Android Studio support
 2015-05-18 16:17:24 +08:00
WenhaiLin 26f094b1a7 Remove unnecessary files 2015-05-18 16:02:05 +08:00
WenhaiLin 54b6260dfd Rename module 2015-05-18 15:17:05 +08:00
WenhaiLin 6dd3108e42 Rename module 2015-05-18 15:01:20 +08:00
joshuastray 06846b5b1a added some missing tests 2015-05-18 14:44:33 +08:00
WenhaiLin 68188f7424 Add native code for AS project. 2015-05-18 13:41:58 +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
WenhaiLin 7caa6bb2fc Update Copyright. 2015-05-18 09:59:50 +08:00
minggo 2dbe375380 Merge pull request #11868 from joshuastray/bullet-preprocessor-macro 
add CC_ENABLE_BULLET_INTEGRATION=1 to js project
 2015-05-18 09:33:00 +08:00
joshuastray ead74ac89e add CC_ENABLE_BULLET_INTEGRATION=1 to js project 2015-05-17 23:11:17 +08:00
minggo e99b99cc79 Merge pull request #11853 from joshuastray/fix-resource-path 
fix resource path for js-tests
 2015-05-15 16:53:47 +08:00
WenhaiLin dc8492948e Add Android Studio support 2015-05-15 16:37:43 +08:00
joshuastray 4d0ada1cac fix resource path for js-tests 2015-05-15 16:23:43 +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
minggo 5e87bd307b Merge pull request #11798 from WenhaiLin/v3-support-vs2015 
Add support for visual studio 2015.
 2015-05-13 09:37:12 +08:00
pandamicro 3190d0e5fb Add localStorage.clear test case 2015-05-12 19:02:22 +08:00
WenhaiLin c70bac7bb4 Add support for visual studio 2015. 2015-05-12 16:26:28 +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
samuele3hu 23e4e0d4e3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-07 16:21:03 +08:00
samuele3hu 243da71082 Update the project configure of js-tests and js-template on the win32 platform 2015-05-07 11:38:43 +08:00
samuele3hu f1b5729183 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012 2015-05-05 16:14:57 +08:00
samuele3hu 037c17fe5d Remove vs2012 support in v3 2015-05-05 16:11:26 +08:00
zhangbin b4f2d94109 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
WenhaiLin 5e5cd5faa1 [js-tests]Fixed crash on Win32/Universal. 2015-04-24 17:12:46 +08:00
WenhaiLin 55d3cc1252 Update the js-tests CMake files. 2015-04-23 10:42:44 +08:00
zhangbin f75bf93706 Update the js-tests project files. 2015-04-21 15:30:47 +08:00
WenhaiLin f453235ce3 Add missing resource 2015-04-20 15:38:56 +08:00
Wenhai Lin 7860f57ef0 Fixed compile errors 2015-04-17 14:00:53 +08:00
WenhaiLin e50b14b7fb Add js-tests 2015-04-16 18:07:35 +08:00