WenhaiLin
|
5cdfdf8497
|
[ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0
|
2015-08-18 22:37:00 +08:00 |
zhangbin
|
38edfea28a
|
Solve the error effect of lua portrait project created from template.
|
2015-08-14 17:20:21 +08:00 |
子龙山人
|
675d5efb39
|
Merge pull request #13151 from flashjay/patch-2
Update AppController.h
|
2015-08-12 13:43:39 +08:00 |
zhangbin
|
9fd88d6587
|
Optimize the lua & js templates.
The changes are used for generating templates of Cocos Framework.
|
2015-08-05 16:51:33 +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 |
HuaYang Huang
|
abbf7eabfc
|
Update AppController.h
|
2015-08-01 17:49:12 +08:00 |
WenhaiLin
|
875d01573a
|
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
|
2015-07-31 21:20:42 +08:00 |
Wenhai Lin
|
70628c9dec
|
Fixed link errors on iOS/Mac
|
2015-07-29 13:59:58 +08:00 |
zhangbin
|
4d46a03797
|
Solve the error : the VS release configuration of lua template cause `cocos run` error.
|
2015-07-28 14:54:42 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
pandamicro
|
bd1f5b4a39
|
Merge pull request #12911 from natural-law/portrait-support
Fixed #12252 : Support new portrait projects from templates.
|
2015-07-23 15:38:32 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
Bin Zhang
|
a8b22f6886
|
Support new portrait project from lua templates.
|
2015-07-20 09:58:40 +08:00 |
Wenhai Lin
|
45e0eda81c
|
Fixed compile error
|
2015-07-17 11:34:26 +08:00 |
andyque
|
451bedbaad
|
change sign team to none.
|
2015-07-07 22:02:35 +08:00 |
andyque
|
04ade7c16e
|
remove xcode scheme
|
2015-07-07 14:57:25 +08:00 |
andyque
|
302976b603
|
add shared scheme to iOS & Mac project.
|
2015-07-07 14:24:17 +08:00 |
Ricardo Quesada
|
4c88be9520
|
removes -fno-excpetion and -fexception from cmake
|
2015-07-06 12:09:50 -07:00 |
WenhaiLin
|
cbb073e905
|
Fixed Application may be created more than once on Android.
|
2015-06-23 16:58:38 +08:00 |
Bin Zhang
|
01cb135e77
|
Solve the error in the VS project of templates.
|
2015-06-17 18:06:09 +08:00 |
tangziwen
|
b84531ea04
|
add librecast to js and lua templates
|
2015-06-17 13:39:28 +08:00 |
pandamicro
|
f3765a4c5f
|
Fix physics 3d macro include issue
|
2015-06-12 15:58:43 +08:00 |
andyque
|
a6649e24fe
|
fix resource not copy issue on windows
|
2015-06-01 18:59:27 +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 |
minggo
|
203203a92d
|
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
upgrade rapidjson to 1.0.2
|
2015-05-25 15:18:15 +08:00 |
andyque
|
81d562803b
|
upgrade rapidjson to 1.0.2
|
2015-05-25 11:43:03 +08:00 |
samuele3hu
|
0492323ec8
|
Update the Lua template
|
2015-05-24 23:14:23 +08:00 |
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 |
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 |
Bin Zhang
|
3d0c716ee9
|
Add script in build.gradle for sign the release apk.
|
2015-05-22 15:52:41 +08: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 |
WenhaiLin
|
a569d877ba
|
[ci skip]Remove unnecessary code.
|
2015-05-20 18:05:46 +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 |
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 |
yinjimmy
|
d78d8b2c1f
|
move menu bar to system menu
|
2015-05-14 13:43:17 +08:00 |
WenhaiLin
|
c70bac7bb4
|
Add support for visual studio 2015.
|
2015-05-12 16:26:28 +08:00 |
samuele3hu
|
037c17fe5d
|
Remove vs2012 support in v3
|
2015-05-05 16:11:26 +08:00 |
zhangbin
|
fc9e5609c8
|
Rename the target name of Xcode project in templates.
|
2015-04-30 15:20:47 +08: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 |
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 |
yinjimmy
|
2c0f1c1a50
|
add lua runtime template
|
2015-04-21 01:25:44 +08:00 |
yinjimmy
|
7a228cd79f
|
Merge branch 'v3' into lua_runtime
|
2015-04-17 18:28:42 +08:00 |
samuele3hu
|
b300701ec4
|
Remove the reference of quick module
|
2015-04-17 15:52:45 +08:00 |
yinjimmy
|
5589796029
|
Merge branch 'v3' into lua_runtime
|
2015-04-17 15:27:04 +08:00 |
samuele3hu
|
a64e90d469
|
Update the related project setting for Luajit and related test cases
|
2015-04-06 22:41:34 +08:00 |
yinjimmy
|
587ee21e4b
|
revert lua runtime
|
2015-04-02 18:27:53 +08:00 |
SunLightJuly
|
f321f725b0
|
fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed
|
2015-03-13 16:12:08 +08:00 |
SunLightJuly
|
8c196847cb
|
add security framework to Mac template project of Lua
|
2015-03-12 19:18:06 +08:00 |
SunLightJuly
|
608ed24180
|
Synchronization with V3
|
2015-03-11 00:02:50 +08:00 |
SunLightJuly
|
6c2eb01213
|
cleanup proj.android
|
2015-03-10 23:33:09 +08:00 |
SunLightJuly
|
b77801a99b
|
cleanup proj.win32
|
2015-03-10 22:56:03 +08:00 |
SunLightJuly
|
ba55f14fbf
|
removed runtime in libsimulator
|
2015-03-10 18:28:59 +08:00 |
SunLightJuly
|
aac4d6f846
|
removed CodeIDESupport.h
|
2015-03-10 11:12:42 +08:00 |
SunLightJuly
|
ff8c0dac2b
|
removed framework of simulator
|
2015-03-10 10:51:16 +08:00 |
samuele3hu
|
1844fdd806
|
Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES
|
2015-03-06 15:41:48 +08:00 |
yinjimmy
|
2042633294
|
update runtime to 2.0
|
2015-02-27 14:49:04 +08:00 |
SunLightJuly
|
ec22923aa9
|
modifed AppDelegate.cpp: add function "register_all_packages()" to support packages manager
|
2015-02-24 20:50:58 +08:00 |
htl
|
12010ce3da
|
fixed run lua samples 360 will popup access wifi note!
|
2015-01-21 15:30:05 +08:00 |
htl
|
52b03039fa
|
fixed show open wifi dialog on android without runtime
|
2015-01-20 19:15:44 +08:00 |
dualface
|
bc75849ac7
|
update template/runtime version
|
2015-01-16 23:22:03 +08:00 |
zhangbin
|
b1f9fb4b8e
|
Rename the Xcode target of libsimulator.
|
2015-01-16 14:29:48 +08:00 |
yinjimmy
|
6e8188d4ff
|
Fix lang file path for vs project
|
2015-01-15 14:04:15 +08:00 |
yinjimmy
|
9f60e82cc7
|
Fix compile error with lua-tempate-default / lua-template-runtime
|
2015-01-15 13:34:23 +08:00 |
yinjimmy
|
f652e1359a
|
1. Compatible vs2012 for libsimulator
2. Adjust output directory for simulator
|
2015-01-15 11:10:32 +08:00 |
yinjimmy
|
49869847cc
|
add default `-workdir` for vs project
|
2015-01-14 18:45:18 +08:00 |
yinjimmy
|
a80e26f680
|
cleanup
|
2015-01-14 16:27:29 +08:00 |
yinjimmy
|
bd3c250a6d
|
add proj.linux support
|
2015-01-14 14:44:48 +08:00 |
yinjimmy
|
bdf4393be0
|
Fix runtime output directory for Windows release mode
|
2015-01-14 10:18:00 +08:00 |
yinjimmy
|
49b265d147
|
cleanup
|
2015-01-13 19:44:46 +08:00 |
yinjimmy
|
c3a536bcf0
|
add lua-template-runtime
|
2015-01-13 18:28:33 +08:00 |
yinjimmy
|
cf331c3abd
|
update lua-template-default
|
2015-01-12 23:42:37 +08:00 |
yinjimmy
|
0978a88b7f
|
Merge branch 'v3' into combine
Conflicts:
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
tools/simulator/frameworks/runtime-src/proj.android/jni/Android.mk
tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
|
2015-01-12 17:54:58 +08:00 |
yinjimmy
|
d1821fb1ef
|
update template for iOS
|
2015-01-12 12:46:43 +08:00 |
yinjimmy
|
db80ab0028
|
update lua default template
|
2015-01-09 13:21:19 +08:00 |
yinjimmy
|
349f5d1a87
|
add config.json
|
2015-01-09 11:43:41 +08:00 |
dualface
|
c041787f01
|
update proj.android for template
|
2015-01-09 04:14:31 +08:00 |
yinjimmy
|
d2a3a6a8c0
|
merge lua-template-default with lua-template-runtime
|
2015-01-09 04:08:41 +08:00 |
dualface
|
7046f508da
|
update proj.win32 for templates
|
2015-01-09 03:10:54 +08:00 |
dualface
|
156e9eb4f2
|
update templates
|
2015-01-06 08:31:43 +08:00 |
dualface
|
efada94e18
|
update proj.ios_mac
|
2015-01-05 17:56:34 +08:00 |
minggo
|
50914665e6
|
Merge pull request #9742 from huangshiwu/iosnetwork_template
ios template add security.framework
|
2014-12-31 15:15:08 +08:00 |
huangshiwu
|
ac2ff38624
|
ios template add security.framework
|
2014-12-31 14:46:34 +08:00 |
andyque
|
5d9274acf5
|
fix conflicts
|
2014-12-31 14:22:18 +08:00 |