samuele3hu
|
074216bef9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
|
2015-05-24 22:46:05 +08:00 |
子龙山人
|
49c0b44252
|
Merge pull request #11988 from andyque/add-vs2015-to-simulator
fix simulator vs2015 support
|
2015-05-23 09:48:32 +08:00 |
CocosRobot
|
7879b25cdc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 23:57:26 +00:00 |
hugo
|
9a9fa7957f
|
[A] add generate libs and binary template
|
2015-05-22 19:47:16 +08:00 |
andyque
|
73902a4063
|
fix simulator vs2015 support
|
2015-05-22 17:47:48 +08:00 |
CocosRobot
|
b9ffada9cc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 09:19:24 +00:00 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08:00 |
CocosRobot
|
3c96bbbd80
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 06:47:26 +00:00 |
CocosRobot
|
ff6f505a61
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-22 01:57:03 +00:00 |
CocosRobot
|
7e392635ce
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-21 20:01:07 +00:00 |
Bin Zhang
|
94e2e1cb00
|
Modify the configuration for android studio support in console.
|
2015-05-21 18:27:30 +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 |
andyque
|
03e8f16a8a
|
add vs2015 support
|
2015-05-21 13:55:01 +08:00 |
CocosRobot
|
5005c77d45
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-21 01:45:44 +00:00 |
Dale Stammen
|
ee8a85fb9b
|
set version to 1.0.0.0 update GUID
|
2015-05-20 08:10:24 -07:00 |
Dale Stammen
|
209e7c62f4
|
added libbullet to Windows 8.1 Universal App projects
|
2015-05-20 08:01:01 -07:00 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +08:00 |
CocosRobot
|
a5a6515332
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-20 06:44:01 +00:00 |
minggo
|
79f70c49ce
|
Merge pull request #11905 from WenhaiLin/v3-37
Remove unnecessary files.
|
2015-05-20 13:39:36 +08:00 |
WenhaiLin
|
df3548673f
|
Remove unnecessary files.
|
2015-05-20 10:19:32 +08:00 |
Bin Zhang
|
4ccf18f414
|
Remove the cocos2d-html5 when creating js project by cocos new.
|
2015-05-19 14:55:04 +08:00 |
CocosRobot
|
181f225eb7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-18 08:19:22 +00: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 |
CocosRobot
|
fd55bb8e68
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-18 05:35:55 +00:00 |
WenhaiLin
|
7caa6bb2fc
|
Update Copyright.
|
2015-05-18 09:59:50 +08:00 |
WenhaiLin
|
dc8492948e
|
Add Android Studio support
|
2015-05-15 16:37:43 +08:00 |
samuele3hu
|
71595898ed
|
Update the Lua binding for Physics3D ,related test cases and the template project
|
2015-05-15 16:25:07 +08:00 |
yinjimmy
|
06bd26cb63
|
Fixed: app crash when console ui trace nil string on mac platform #11211
|
2015-05-15 15:08:42 +08:00 |
iris-wy
|
68ec7c8ca1
|
Add enhance service API
Add enhance service API
|
2015-05-15 14:29:22 +08:00 |
CocosRobot
|
4240632c68
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-14 10:32:18 +00:00 |
yinjimmy
|
d78d8b2c1f
|
move menu bar to system menu
|
2015-05-14 13:43:17 +08:00 |
joshuastray
|
59c0a64d38
|
add libbullet to js template
|
2015-05-14 10:01:22 +08:00 |
minggo
|
50aa8dba47
|
Merge pull request #11806 from MSOpenTech/v3-winrt-ad-fix
V3: updates to app.xaml code to correctly support touches on Microsoft Ads
|
2015-05-13 13:39:29 +08:00 |
CocosRobot
|
5bf26f9f10
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-13 04:07:11 +00:00 |
Dale Stammen
|
40c19b31c8
|
updates to app.xaml code to correctly support touches on Microsoft AdControls for WP8.1
|
2015-05-12 19:39:40 -07:00 |
minggo
|
0ef01edcc7
|
Merge pull request #11803 from CocosRobot/update_cocosfiles_1431481051
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-13 09:38:45 +08:00 |
CocosRobot
|
90ce442616
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-13 01:37:33 +00: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 |
minggo
|
b51f78aa42
|
Merge pull request #11797 from super626/physics3d2
fix wrong indent and add const
|
2015-05-13 09:36:51 +08:00 |
Dale Stammen
|
f1fe802442
|
updated winrt keyboard support to support physical keyboard
|
2015-05-12 09:20:10 -07:00 |
songchengjiang
|
4756647016
|
add libbullet for template project
|
2015-05-12 16:34:10 +08:00 |
WenhaiLin
|
c70bac7bb4
|
Add support for visual studio 2015.
|
2015-05-12 16:26:28 +08:00 |
CocosRobot
|
d170a79919
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-12 05:49:49 +00:00 |
CocosRobot
|
507e94b77f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-12 05:15:34 +00:00 |
CocosRobot
|
299e355152
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-08 09:02:36 +00:00 |
CocosRobot
|
a3b8f6bcb1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-08 06:13:28 +00:00 |
minggo
|
bf93289718
|
Merge pull request #11751 from samuele3hu/v3_7_remove_vs2012
Remove vs2012 support in v3
|
2015-05-08 14:11:13 +08:00 |
CocosRobot
|
745fe13ecb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-08 02:46:01 +00: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 |
CocosRobot
|
c570f60606
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-06 01:43:46 +00:00 |
CocosRobot
|
91b608697a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-06 00:59:51 +00: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 |
CocosRobot
|
b3042d771d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-05 03:28:05 +00:00 |
minggo
|
254a4b0b0c
|
Merge pull request #11660 from natural-law/v3
Rename the target name of Xcode project in templates.
|
2015-04-30 18:13:41 +08:00 |
CocosRobot
|
038ac5ab2a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-30 09:23:48 +00:00 |
zhangbin
|
fc9e5609c8
|
Rename the target name of Xcode project in templates.
|
2015-04-30 15:20:47 +08:00 |
CocosRobot
|
1759fa96fe
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-30 06:50:33 +00:00 |
minggo
|
4acd231f89
|
merge v3.6
|
2015-04-30 13:46:08 +08:00 |
CocosRobot
|
8507d7e5a4
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-30 01:44:07 +00:00 |
minggo
|
79a6f2f510
|
Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
|
2015-04-30 09:41:52 +08:00 |
Dale Stammen
|
dfee3ae3cb
|
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
|
2015-04-29 10:23:22 -07:00 |
CocosRobot
|
bea6fe3ce5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-28 13:35:07 +00:00 |
CocosRobot
|
ef82d9fa3a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-27 07:46:12 +00:00 |
CocosRobot
|
dbdb29464b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-24 03:13:32 +00:00 |
zhangbin
|
61cf0ad28b
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
|
2015-04-23 15:46:19 +08:00 |
zhangbin
|
dcca32bd82
|
Update the CMakeLists & the remote url of submodule js-bindings.
|
2015-04-23 14:23:19 +08:00 |
minggo
|
cf177bbbee
|
Merge pull request #11559 from MSOpenTech/v3-winrt-fix
V3 winrt fix to update Angle and correctly handle App termination
|
2015-04-23 13:50:37 +08:00 |
CocosRobot
|
941c8d9f14
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-23 02:27:24 +00:00 |
minggo
|
8ab03a62d1
|
Merge pull request #11543 from yinjimmy/runtime
Add lua runtime template
|
2015-04-23 10:25:00 +08:00 |
Dale Stammen
|
102726784e
|
update windows 8.1 univeral app cpp-template files
|
2015-04-22 19:13:57 -07:00 |
Dale Stammen
|
662f8374ae
|
removed CC_PLATFORM_WINRT code. It is now allowed to exit a WinRT app
|
2015-04-22 17:58:10 -07:00 |
CocosRobot
|
d7e32f270c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-22 02:53:00 +00:00 |
yinjimmy
|
94fe5ac206
|
set CC_CODE_IDE_DEBUG_SUPPORT=0 for lua-template-default
|
2015-04-22 10:12:40 +08:00 |
Jimmy Yin
|
8c4cd7ea42
|
Modify default console and upload port for lua runtime
|
2015-04-21 23:07:19 +08:00 |
Dale Stammen
|
0c47df5df2
|
fixed typo. Changed KEY_BACKSPACE to KEY_ESCAPE in comments
|
2015-04-21 06:21:32 -07:00 |
minggo
|
80bc3bf021
|
Merge pull request #11523 from MSOpenTech/v3-winrt-backbutton
V3 Windows Phone 8.1 back button support
|
2015-04-21 17:10:01 +08:00 |
CocosRobot
|
e218110107
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-21 09:02:58 +00:00 |
Dale Stammen
|
83b68ef693
|
added comment on how back button event is handled
|
2015-04-20 18:36:58 -07:00 |
Dale Stammen
|
4169ebf5c8
|
Windows Phone 8.1 back button and terminate app support
|
2015-04-20 10:43:34 -07:00 |
yinjimmy
|
2c0f1c1a50
|
add lua runtime template
|
2015-04-21 01:25:44 +08:00 |
Dale Stammen
|
e00b0dfbd9
|
Merge branch 'v3' into v3-winrt-backbutton
|
2015-04-20 08:17:16 -07:00 |
zhangbin
|
6ee624796a
|
Merge branch 'v3-jsb' of github.com:natural-law/cocos2d-x into v3-jsb
|
2015-04-20 18:09:57 +08:00 |
zhangbin
|
a1b5fa5a8e
|
Solve the error in js template.
|
2015-04-20 18:09:39 +08:00 |
CocosRobot
|
ebd76defe6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 07:53:34 +00:00 |
CocosRobot
|
9b09fb1f6a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 05:37:44 +00:00 |
CocosRobot
|
fb9cdc28e3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-04-20 02:38:23 +00:00 |
WenhaiLin
|
dc768dbd8c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-jsb-merge
|
2015-04-20 10:06:48 +08:00 |
Dale Stammen
|
a97d5c5370
|
added support for hardware back button on Windows Phone 8.1
|
2015-04-19 16:31:30 -07:00 |
Dale Stammen
|
178c241cdd
|
added back buttom function
|
2015-04-19 11:36:14 -07:00 |
yinjimmy
|
7a228cd79f
|
Merge branch 'v3' into lua_runtime
|
2015-04-17 18:28:42 +08:00 |
yinjimmy
|
1e32322350
|
revert runtime files
|
2015-04-17 18:26:47 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |