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 |
Dale Stammen
|
74f4d29fa9
|
added missing librecast
|
2015-06-15 20:06:54 -07:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
pandamicro
|
852b9b42b9
|
Remove jsb_cocos2dx_experimental_manual
|
2015-06-15 10:46:57 +08:00 |
jianglong0156
|
5ff0825468
|
modify android res copy
|
2015-06-15 09:55:10 +08:00 |
jianglong0156
|
393ad49481
|
add win32 project resource copy
|
2015-06-15 09:55:05 +08:00 |
jianglong0156
|
6310f74533
|
modify resource to res/resjs
|
2015-06-15 09:54:00 +08:00 |
pandamicro
|
f3765a4c5f
|
Fix physics 3d macro include issue
|
2015-06-12 15:58:43 +08:00 |
pandamicro
|
e9d648f151
|
Fix physics 3d macro include issue
|
2015-06-12 15:41:46 +08:00 |
pandamicro
|
c3aba0392d
|
Update auto conversion for sprite polygon
|
2015-06-12 13:00:49 +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
|
9a62d06091
|
add video player test and auto bindings
|
2015-05-28 18:10:07 +08:00 |
jianglong0156
|
e898a680e2
|
Merge branch 'modifyTestResource' into jsWebviewTest
|
2015-05-27 11:49:23 +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 |
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 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +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 |
joshuastray
|
83237b8dbd
|
add physics3d js manual binding and tests
|
2015-05-21 18:05:49 +08:00 |
Bin Zhang
|
41792caa6b
|
Add files & configuration for android studio support in console.
|
2015-05-21 16:34:03 +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
|
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 |
WenhaiLin
|
68188f7424
|
Add native code for AS project.
|
2015-05-18 13:41:58 +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 |
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
|
5e87bd307b
|
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
Add support for visual studio 2015.
|
2015-05-13 09:37:12 +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
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +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 |