Peter Siegmund
bbdd289a62
Fix gradlew build ( #18592 )
...
* fixed ProGuard rule file
* add missing VIBRATE permission
* move permission to correct position in AndroidManifest.xml
2017-12-27 09:36:11 +08:00
CocosRobot
fe69b07e75
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18540 )
2017-12-07 13:45:26 +08:00
CocosRobot
190e1239bf
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18535 )
2017-12-05 18:04:27 +08:00
James Chen
d21af3b981
Some fixes after using ndk r16 clang to build android projects ( #18531 )
...
* [android] Fixes warning in UrlAudioPlayer.cpp and CCUserDefault-android.cpp
* Don't write 'using namespace std;' in header files.
* Uses std::unordered_map instead of std::map for Particle3D module.
* Updates external/config.json to v3-deps-141
* Continue to replace `gnustl_static` to `c++_static` for templates and test projects.
* Updates CCConsole.h/.cpp to resolve the following issue on Android:
jni/../../../../../cocos/base/CCConsole.cpp:321:28: required from here
/Users/james/Software/android/android-sdk/ndk-bundle/sources/cxx-stl/llvm-libc++/include/utility:506:63: error: incomplete type 'std::__ndk1::is_move_assignable<cocos2d::Console::Command>' used in nested name specifier
is_move_assignable<first_type>::value &&
^
make: *** [obj/local/arm64-v8a/objs-debug/cocos2dx_internal_static/base/CCConsole.o] Error 1
* Fixes a memory leak while addCommand and other minor changes.
* Updates tolua/cocos2dx.ini, don't bind Console::Command
* Adds CC_DLL for Console::Command
* Reverts tolua/cocos2dx.ini and ignore Console::[add Command addSubCommand getSubCommand delSubCommand].
* Ignores Console::getCommand.
2017-12-05 13:35:16 +08:00
minggo
5151dfd6f9
Remove ant projects ( #18532 )
...
* remove proj.android
* remove ant building and rename proj.android-studio to proj.android
* not pass --android-studio
2017-12-04 18:00:45 +08:00
minggo
9c67dcab9d
remove proj.android ( #18529 )
2017-12-04 11:26:43 +08:00
minggo
a7a61e6a83
travis build android studio projects ( #18515 )
2017-12-01 17:29:34 +08:00
James Chen
b191318e15
Auto hide home indicator for iPhoneX. ( #18514 )
2017-11-27 17:08:34 +08:00
minggo
dacd8e664f
fix issue that can not generate archieve file with Xcode9 ( #18498 )
2017-11-24 10:38:41 +08:00
Mozart Louis
bb479e4f6d
Android Studio 3.0 + Switching to libc++ (c++_static) + Simplify PROP_* values + Adding default Proguard Config for cocos ( #18470 )
...
* Updated android build process to use c++_static
* Comment out org.gradle.jvmargs
* Updated all project in test directory
* Update C++ Template
* Update js and lua projects
* Update Proguard + Lower minSdkVersion to 14
* Added All PROP_* values + updated build.gradle
* Updated versions
2017-11-23 09:08:50 +08:00
James Chen
69e5a056e6
Uses Images.xcassets instead of several icon png files. ( #18485 )
...
* Uses Images.xcassets instead of several icon png files.
* Renames AppIcon.
* Sets AppIcon from Images.xcassets
* Uses Images.xcassets instead of several icon png files for template projects.
* Modify permission to 644
2017-11-21 15:31:29 +08:00
CocosRobot
c594692d69
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18440 )
2017-11-03 14:19:47 +08:00
CocosRobot
50a0e91620
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18435 )
2017-11-03 09:56:43 +08:00
CocosRobot
d42098e2c4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18431 )
2017-11-02 11:17:04 +08:00
CocosRobot
f7c987e349
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18430 )
2017-11-01 17:36:39 +08:00
minggo
496de07633
don't have to set NDK_MODULE_PATH manually
2017-10-26 13:40:27 +08:00
minggo
0b699e8f19
fix conflict
2017-10-09 10:23:13 +08:00
CocosRobot
f3e456c8bc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18344 )
2017-10-09 09:28:15 +08:00
minggo
cb3c0853e1
[ci skip]Remove win10 and tizen support
...
* remove win10 sln
* remove win10 porj from template
* remove win10 and tizen support
2017-09-22 17:54:37 +08:00
minggo
b275a3e2f0
fix conflict
2017-09-20 09:11:35 +08:00
James Chen
0c5ba220b1
Supports full screen for iPhone X and uses Storyboard for launch screen. ( #18276 )
...
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.
* Removes unused UILaunchImages for test projects.
* Removes unused UILaunchImages for template projects.
* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.
* Fixes lua template.
2017-09-19 15:01:19 +08:00
James Chen
a73d5893b4
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. ( #18271 )
...
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
* Update AppActivity.java
* Update AppActivity.java
2017-09-18 15:12:30 +08:00
minggo
164cb98fe9
fix linking error on mac ( #18266 )
2017-09-14 17:27:41 +08:00
minggo
d092e1c877
fix output bin path ( #18258 )
2017-09-13 16:38:50 +08:00
CocosRobot
925432deb1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18215 )
2017-09-06 09:09:26 +08:00
minggo
15b43659c2
update to use Android Studio 2.3.3 ( #18214 )
2017-09-01 17:46:26 +08:00
minggo
4a0b9b1fd3
[ci skip]remove tizen projects ( #18196 )
2017-08-28 14:33:01 +08:00
Dmitry
e79f21cec0
add new CMakeLists.txt to cpp-template-default ( https://gist.github.com/MrCapone/ccdc1826cb7362086107e8096bfe6f90 ) ( #18167 )
2017-08-22 15:44:45 +08:00
Jie Meng
9c35c90614
Fix android compile fail bug ( #18166 )
2017-08-16 17:44:11 +08:00
bulzipke
b5d871d53c
Hide virtual button by user control. ( #18100 )
...
* Hide virtual button by user control.
It want a lot of people, including me.
http://discuss.cocos2d-x.org/t/solved-android-navigation-bar/31760/3
http://discuss.cocos2d-x.org/t/android-cocos2d-v3-12-about-virtual-button/30811/5
http://joyplot.com/documents/2016/09/27/cocos2d-x-navigation-bar/
http://falstar.hateblo.jp/entry/2016/07/10/180112
* I also added the lua/js template.
Thank you for your work :)
2017-08-07 11:12:26 +08:00
CocosRobot
54586d06a4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18081 )
2017-07-17 16:51:50 +08:00
Norbu Tsering
4f81d827eb
Removed extra parens ( #18075 )
2017-07-17 15:53:57 +08:00
Ole Herman Schumacher Elgesem
e9fb405488
Added closeItem nullptr check in HelloWorld ( #18057 )
...
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
2017-07-13 09:53:03 +08:00
CocosRobot
81d70adece
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #18052 )
2017-07-12 09:50:15 +08:00
Ole Herman Schumacher Elgesem
a7482b4bd1
Added error checking for missing files in HelloWorldScene ( #18049 )
...
Signed-off-by: Ole Herman Schumacher Elgesem <oleherman93@gmail.com>
2017-07-10 13:45:55 +08:00
minggo
0e26309602
remove bullet project ( #17961 )
2017-06-21 17:15:09 +08:00
minggo
77d8b0a52b
fix compiling issue on android ( #17960 )
2017-06-21 16:43:40 +08:00
CocosRobot
aa89054f8e
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17959 )
2017-06-21 16:35:47 +08:00
CocosRobot
320bf97066
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17957 )
2017-06-21 14:34:55 +08:00
CocosRobot
204a08d4fd
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17932 )
2017-06-15 14:57:33 +08:00
pyrosphere
5ce38d14fe
On XCode projects, removed specific SDK versions from framework paths. ( #17929 )
2017-06-15 09:53:32 +08:00
minggo
4ca29ac1cf
Merge v3.15.1 ( #17897 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
* The optimization for huawei. (#17832 )
* The optimization for huawei.
* setAnimationInterval fix for all platforms.
* disable debug
* include fix.
* Uses better configuration for huawei optimization (#17838 )
* Uses better configuration for huawei optimization
* Updates jar file and uncomment fps controlling code
* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#17840 )
* update release not and version (#17845 )
* [android] Removes an unused variable sRegistered in Cocos2dxActvity.java. (#17861 )
* Updates jar to resolve warning while packaging APK file. (#17863 )
* update release date (#17870 )
* fix compiling error
2017-06-05 13:37:50 +08:00
minggo
8fcf0d7fd9
fix gradle setting ( #17896 )
2017-06-05 11:35:48 +08:00
CocosRobot
a857ebe831
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17848 )
2017-05-22 16:47:08 +08:00
Wilson E. Alvarez
9e4958901d
Allow extensions to work out of the box by default on Win32 C++ projects ( #17787 )
2017-05-08 10:17:38 +08:00
RickyZheng001
f8e325792b
V3.15 ( #17752 )
...
* remove APP_SHORT_COMMANDS setting (#17722 )
some developers report it will cause error on Windows though i can not reproduce it. It is strange, the setting is used to resolve command length limitation on Windows.
* Particle font size should be a const value (#17676 )
* Particle font size should be a const value
* Minor fix: CCStencilStateManager.hpp -> CCStencilStateManager.h in xcode project.
* JSB SocketIO.connect supports to pass a CA cert file (#17736 )
* JSB SocketIO.connect supports to pass a CA cert file
* The second parameter of SocketIO.connect function is probably a `option` object. JSB just ignores it.
2017-04-27 09:25:20 +08:00
CocosRobot
56cad142ab
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17712 )
2017-04-18 09:12:21 +08:00
minggo
ee84d9f12e
update v3.15
2017-04-14 13:45:32 +08:00
CocosRobot
487490def0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17693 )
2017-04-13 17:59:19 +08:00
minggo
270bcb28a5
do not set attributes in java ( #17680 )
...
if setting attribures in java code, then engine can not select GLES2/GLES3 dynamically
2017-04-10 17:41:53 +08:00
James Chen
ccb0c168d4
[android] Fixes that android studio project will be created with a default package name ‘org.cocos2dx.MyLuaGame’. ( #17674 )
2017-04-10 13:50:31 +08:00
minggo
8a587a3681
[ci skip]fix some error for Android Studio project ( #17655 )
...
* use '/' for path separator on windows
* enable short commands
it is useful on windows because windows has length limitation of commands
2017-04-06 15:41:38 +08:00
minggo
9ed5127edc
synchronize v3.15
2017-04-01 17:16:45 +08:00
CocosRobot
7ae2e9ebd0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17626 )
2017-04-01 14:45:38 +08:00
minggo
9d81f16bc5
[ci skip]make android studio work for release mode ( #17610 )
...
* release mode of lua test case work with Android Studio
* add missing file
* fix error for debug mode
* make android studio work
2017-03-29 15:56:46 +08:00
effolkronium
55362547fa
Fix bug with unresolved symbols in Android Studio 2.3 ( #17586 )
...
* Fix bug with unresolved symbols in Android Studio 2.3
* Fix bug with unresolved symbols in Android Studio 2.3
2017-03-27 11:05:16 +08:00
pandamicro
5341f7517e
Improve js template and test pages ( #17575 )
...
* Improve js template and test pages
* Update web ref
2017-03-27 11:03:51 +08:00
minggo
6b7e5d69bb
correct module path ( #17569 )
2017-03-22 17:04:26 +08:00
minggo
db837ebdae
remove unneeded test cases and fix parameter length limitation on windows
...
* delete unnneded test case on windows
* delete unneeded test cases
* avoid parameter length limit when building android on windows
* adjust project setting to delete unneeded test cases
* remove unneeded test cases for windows10
* remove unneeded test cases for tizen
* remove unnedded test case for android
2017-03-22 13:43:12 +08:00
James Chen
ab9104f3ce
Updates templates for switching AudioEngine in AppDelegate.cpp. ( #17555 )
2017-03-22 11:19:25 +08:00
rh101
f8eccb9608
Added VS2017 support in project files ( #17548 )
...
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entries for non-existent files that were causing "Build is out of date" issues in Visual Studio
[project.pbxproj] Removed entries for non-existent file
* [libcocos2d.vcxproj.filters] Renamed CCStencilStateManager.h extension to .hpp.
* [libcocos2d.vcxproj, libcocos2d.vcxproj.filters] Removed entry for file CCDownloaderImpl.h which does not exist.
* Changed extension of CCStencilStateManager.hpp to .h
* Added support for VS2017 in project files.
2017-03-20 09:36:07 +08:00
minggo
ebdae8c2da
use different separator on different platforms and make path length short ( #17542 )
2017-03-17 11:54:36 +08:00
CocosRobot
a1772418b1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17524 )
2017-03-16 14:16:56 +08:00
pandamicro
f0061c3ddc
[ci skip] Improve js template and update web ref ( #17510 )
...
* Improve js templates
* Update web ref
2017-03-16 09:42:51 +08:00
CocosRobot
87b4d7d54d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17507 )
2017-03-15 16:23:50 +08:00
pandamicro
0eec73ba43
Bindings fix and assets manger ex fix ( #17115 )
...
* Fix custom event being discard during event emission
* Fix tilemap black line issue
* Fix auto bindings config
* Adapt websocket to new memory model
* Improve cocos2d_specifics code stability
* Fix issue with get_or_create_js_object function
* Improve memory usage in function wrapper invocation
* Use JS Function bind to avoid memory tracking issues
* Support size parameter to collect total byte size before update process
* Fix download resuming issue on Android
* Remove temporary assets when temporary manifest is invalid or out of date
* Use version compare handle to compare manifests versions
* Support max concurrent tasks setting & download verify callback
* Add Manifest::Asset conversion
* Avoid crash caused by wrappers
* Sync implementation of tested and published AssetsManagerEx from Cocos Creator
* Fix linux compilation issues
2017-03-15 16:09:02 +08:00
Bin Zhang
010a724149
Solve the error when building Android Studio project. ( #17504 )
2017-03-15 15:45:50 +08:00
minggo
fd74e4d6aa
update build tool version and gradle version ( #17499 )
...
after this PR, can see 3rd party cpp files in Android Studio
2017-03-15 09:56:20 +08:00
Bin Zhang
769f7830f0
Improve the AndroidStudio configurations of tests & templates ( #17495 )
...
* Improve the AndroidStudio configuration of test projects to fit the new implementation of cocos compile.
* Improve the AndroidStudio configuration of templates to fit the new implementation of cocos compile.
2017-03-14 13:41:28 +08:00
James Chen
b8edb47abb
[ci skip][win32] Updates lua template ( #17493 )
2017-03-14 11:57:41 +08:00
James Chen
4f6340c919
[win32] Updates template project configuration files. ( #17491 )
...
* [win32] Updates template project configruation files.
* [win32] Re-adds libcurl.lib for cpp template.
2017-03-14 11:17:15 +08:00
CocosRobot
0536f6dc74
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17458 )
2017-03-07 14:34:39 +08:00
CocosRobot
06f2d415f7
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17392 )
2017-02-22 11:38:58 +08:00
minggo
5ae8a95c6f
[ci skip]make all tests and template support Android Studio ( #17389 )
...
* make all tests and template support Android Studio
* use grable 2.2.3
2017-02-21 17:58:30 +08:00
Chaoren Lin
d14f4270aa
Use ndk-build with Android Studio. ( #15676 )
...
* Use ndk-build integration in Android Studio.
* Update build.gradle
* Update build.gradle
* Update build.gradle
2017-02-20 11:14:36 +08:00
CocosRobot
126c983ca9
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17375 )
2017-02-17 10:17:46 +08:00
CocosRobot
59a15ac1e4
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17366 )
2017-02-14 16:04:59 +08:00
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
子龙山人
1baad6b962
Fix tizen compilation issue ( #17341 )
...
* fix tizen compile issue
* enable websocket test on tizen
* change application id of tizen projects
* improve cpp-tests websockets
* update template app id of tizen
* fix tizen cpp-tests in release mode
* update 3rd deps version
* bump external version to 123
2017-02-13 17:59:48 +08:00
CocosRobot
62e759b9a1
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17350 )
2017-02-13 15:36:30 +08:00
CocosRobot
671861c710
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17322 )
2017-02-08 13:57:29 +08:00
CocosRobot
3d51645d3d
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17319 )
2017-02-08 10:42:18 +08:00
Dale Stammen
9381152ef1
removed support for Windows 8.1 store and phone ( #17311 )
2017-02-08 09:46:47 +08:00
Wilson E. Alvarez
eab9cb6060
Included the directories such that the extension classes work out of the box in Linux ( #17259 )
2017-02-04 10:43:44 +08:00
Wilson E. Alvarez
ca28af0113
Fixed variable order in initializer lists ( #17274 )
2017-02-04 10:33:58 +08:00
CocosRobot
1bc016b354
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #17232 )
2017-01-19 14:15:08 +08:00
minggo
5d41d3c65e
add cocos/editor-support into search path ( #17137 )
2017-01-10 11:57:01 +08:00
CocosRobot#Set
69217f0e8b
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2017-01-05 01:40:38 +00:00
minggo
f63fad3e27
Merge branch 'v3.14' into merge-v314
2017-01-04 09:49:22 +08:00
CocosRobot#Set
7950719e83
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
2016-12-29 02:31:01 +00:00
minggo
b57db96f09
don't use Layer ( #17048 )
2016-12-21 13:49:59 +08:00
Wilson E. Alvarez
035aab2e1c
Make COCOS2D_DEBUG span throughout libcocos2d in Linux ( #17033 )
...
CCASSERT and other macros that are affected by COCOS2D_DEBUG will now be
properly defined for debugging builds in Linux.
2016-12-20 09:32:51 +08:00
CocosRobot
e2100ce88c
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16950 )
2016-12-02 14:47:45 +08:00
Dale Stammen
8791794f39
updated for v3.14 ( #16942 )
2016-12-01 10:37:04 +08:00
Dmitry
1e1ac655b1
fixes for iOS 7 and earlier ( #16879 )
...
* initialize Director::_invalid on first init
* fix: Setting the GLView should be done after creating the RootViewController
* restore 2016 copyright on templates/cpp-template-default/proj.ios_mac/ios/AppController
* remove old iOS js and lua templates
* copy actual iOS templates from cpp to js and lua
2016-11-23 09:28:34 +08:00
tmr111116
ab8a119df2
Add NDEBUG for template Xcode project ( #10825 )
...
Android and other projects include NDEBUG already
templates/cpp-template-default/proj.android/jni/Application.mk: APP_CPPFLAGS += -DNDEBUG
templates/cpp-template-default/proj.win32/HelloCpp.vcxproj: <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECUR
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj: <PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</Preprocess
templates/cpp-template-default/proj.wp8-xaml/AppComponent/HelloCppComponent.vcxproj: <PreprocessorDefinitions>CC_ENABLE_CHIPMUNK_INTEGRATION=1;NDEBUG;%(PreprocessorDefinitions)</Preprocess
templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Application.mk: APP_CPPFLAGS += -DNDEBUG
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj: NDEBUG,
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGSNDEBUG;GLFW
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj: <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
2016-11-09 11:26:28 +08:00
CocosRobot
2d18d703a0
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16810 )
2016-11-04 14:07:25 +08:00
Bin Zhang
3b87e46280
Support compile & run project on Tizen by cocos command. ( #16783 )
...
* Add config files for build engine source code on tizen.
* Add config files for cpp-empty-test on tizen.
* Add missing files.
* Add config files for cpp-tests on tizen.
* Add Tizen config files for lua-bindings.
* Add Tizen config files for lua-empty-test.
* Solve the error when build lua-empty-test for Tizen.
* Add Tizen config files for lua-tests.
* Solve the error when build lua-tests for Tizen.
* Add tizen config files for templates.
* Update submodule cocos2d-console.
2016-11-02 17:41:26 +08:00
CocosRobot
23ff5fc51f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16676 )
2016-10-11 11:40:11 -07:00
minggo
56e0e6f741
correct search path ( #16660 )
2016-10-08 14:44:18 +08:00
CocosRobot
c046257efc
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16630 )
2016-09-30 09:44:34 +08:00
minggo
a6f3773aef
Luajit ( #16620 )
...
* update console
* load lua according architecture
* install android-13 in travis
2016-09-28 16:19:20 +08:00
minggo
84a102edf8
merge v3.13.1 back to v3
2016-09-15 10:08:28 +08:00
Dale Stammen
c6f6952258
added missing COCOS2D_DEBUG=1 to debug preprocessor defines ( #16551 )
2016-09-12 09:48:56 +08:00
minggo
937525a4de
prevent restarting activity on some events ( #16525 )
2016-09-06 16:12:49 +08:00
James Chen
93322eb728
Fixes lua template in release mode. ( #16501 )
2016-09-05 10:02:42 +08:00
CocosRobot
b6536e8d9f
[ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically ( #16499 )
2016-09-02 10:44:55 +08:00
CocosRobot
e33aa63226
[AUTO][ci skip]: updating cocos2dx_files.json
2016-08-30 09:20:13 +00:00
minggo
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
CocosRobot
6d7140d4af
[AUTO][ci skip]: updating cocos2dx_files.json ( #16439 )
2016-08-24 17:47:51 -07:00
CocosRobot
331faac9d1
[AUTO][ci skip]: updating cocos2dx_files.json ( #16436 )
2016-08-24 17:54:11 +08:00
Furkan Üzümcü
5b83fa1ac0
Fix LNK4098 and LNK2001 warnings ( #16372 )
...
* Fix LNK4098 warnings
Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```
* Fix LNK2001 error
The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```
This commit fixes that problem
2016-08-22 15:50:17 +08:00
CocosRobot
0fbc404cd9
[AUTO][ci skip]: updating cocos2dx_files.json ( #16403 )
2016-08-22 09:38:51 +08:00
minggo
2c37be5d86
fix lua tempate error ( #16377 )
2016-08-17 16:09:48 +08:00
CocosRobot
9019d7f2c4
[AUTO][ci skip]: updating cocos2dx_files.json ( #16374 )
2016-08-17 13:59:55 +08:00
minggo
3ce4134ab3
use java reflection to avoid API level dependent, use app-abi 10 ( #16371 )
...
* use java reflection to avoid API level dependent, use app-abi 10
* add license header
2016-08-17 13:55:26 +08:00
CocosRobot
c03f6468fc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16368 )
2016-08-15 17:27:05 +08:00
Greg Rynkowski
14b8fc0a71
Remove AppDelegate memory leak in Android projects ( #16333 )
...
* Remove AppDelegate memory leak from Android projects
AppDelegate object and all its members are never released.
As a solution I propose to use static unique_ptr that could destroy it
at the end of the application.
Issue:
https://github.com/cocos2d/cocos2d-x/issues/14110
* Correct code style in Android main.cpp files
- removed redundant headers (reduced dependencies)
- removed redundant code
- corrected code style
2016-08-08 10:53:04 +08:00
minggo
1cb506a5c5
fix compiling error if building for Android Studio ( #16317 )
2016-08-05 14:03:35 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
mogemimi
808a10429b
Fix some typos in comments and strings ( #16290 )
2016-08-02 15:29:23 +08:00
QingliWang
bbfd2d334c
Some bug-fix and quality assurance for Tizen support. ( #16281 )
...
* Support audio interruption and resume callback when change earphone status.
* Refactor keyevent callback and add makecurrent for compatible with different binary.
* Enable Tizen indicator.
* Remove the unnecessary evasobject in the window and refactor the function for glview mode.
* Fix the compatible issue between Tizen 2.3 and 2.4.
* Fix the wrong directory of script resources for HellLua template project.
* Create performance-test project for Tizen platform.
2016-07-31 22:32:59 +08:00
CocosRobot
dea3a83efc
[AUTO][ci skip]: updating cocos2dx_files.json ( #16272 )
2016-07-29 17:39:32 +08:00
minggo
7131451f1b
change to use api 19 ( #16248 )
...
* change to use api 19
* update deps version
2016-07-29 13:57:01 +08:00
CocosRobot
fbf74a49d5
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-29 01:38:42 +00:00
minggo
ddc5a90686
Merge pull request #16247 from minggo/js-template
...
[ci skip]fix JS template
2016-07-28 15:55:03 +08:00
minggo
fc36ce3c92
copy script
2016-07-28 10:40:08 +08:00
CocosRobot
9096e19ec7
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-28 01:59:39 +00:00
Vladimir Perminov
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
minggo
b74900fe70
fix js template
2016-07-27 16:57:03 +08:00
minggo
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
CocosRobot
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
minggo
358f247700
remove unneeded flag
2016-07-22 09:42:08 +08:00
minggo
a97906a280
Merge pull request #16184 from minggo/issue-16161
...
Issue 16161
2016-07-22 13:51:54 +08:00
minggo
5f2c1df448
use android 21 to fix compiling error
2016-07-22 10:53:56 +08:00
CocosRobot
235e65b835
[AUTO][ci skip]: updating cocos2dx_files.json ( #16174 )
2016-07-21 10:09:27 +08:00
CocosRobot
9c35dedb75
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-18 06:17:04 +00:00
Bojan Matić
727138b800
Fix browserVersion detection
...
Due to typo, the code meant for browser versions below 6.2 would
never run.
2016-07-14 08:24:12 +02:00
CocosRobot
eea229c101
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-13 04:38:56 +00:00
zhangbin
f4accbdf3e
Solve the error in command gen-templates & gen-simulator.
2016-07-13 09:42:05 +08:00
zhangbin
4408f28480
Solve the error in simulator project.
...
Remove unused files.
2016-07-12 17:33:43 +08:00
CocosRobot
ca28b5b603
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-11 04:04:47 +00:00
minggo
d4bd1d0c9a
fix conflict
2016-07-08 18:15:57 +08:00
minggo
826b142096
remove ide-support in framework project
2016-07-08 18:07:57 +08:00
minggo
3f60d1d886
remove code ide related codes in tempaltes
2016-07-08 17:17:23 +08:00
minggo
734d857ced
Merge branch 'v3.12' into merge-v312
2016-07-07 15:13:21 +08:00
pandamicro
d99a8f0f84
Made css style inline
2016-07-06 19:42:27 +08:00
pandamicro
96155a670f
Improve web template and update web ref
2016-07-06 13:54:55 +08:00
Ricardo Quesada
afe36e4a00
feat: upgrades to GLFW v3.2
...
Inclues Mac and Win32 binaries
Includes udpated downlaod+compile Linux script
fixes github issue #11748
uses WINAPI instead of APIENTRY
it seems that it is being redefined somewhere... but I couldn't find
exactly where
2016-06-29 16:11:30 -07:00
minggo
076e0b488b
Merge pull request #15980 from minggo/merge-v312
...
Merge v312
2016-06-29 09:41:30 +08:00
CocosRobot
2fbf3c9940
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-29 01:01:21 +00:00
pandamicro
6e54080e83
Fix style issue in html page
2016-06-28 21:59:37 +08:00
minggo
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
pandamicro
683a4bfec6
Fix tests for v3.12 web
2016-06-22 17:39:38 +08:00
CocosRobot
1c8ab4f504
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-20 05:41:22 +00:00
CocosRobot
eee0d14e8f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-17 02:17:23 +00:00
CocosRobot
134a09da6f
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 07:51:35 +00:00
CocosRobot
600175a93c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-16 03:10:20 +00:00
minggo
925e938724
Merge pull request #15839 from Shulepov/refactor_and_cleanup_RootViewController
...
Cleanup and refactor RootViewController
2016-06-15 14:17:05 +08:00
CocosRobot
77e71fa638
[AUTO][ci skip]: updating cocos2dx_files.json
2016-06-15 02:45:36 +00:00
子龙山人
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
Mikhail Shulepov
2cd7850427
Cleanup and refactor RootViewController
2016-06-14 19:55:31 +03:00
AlwynC
70000bcc84
Refine cpp template for iOS ( #15792 )
...
* Modified the layer follow action class to include a horizontal (x) and vertical (y) offset on the screen from which the node is to be followed.
* Added offsetX and offsetY parameters in Follow::clone() method.
* Added test case for follow action with offset.
* Made changes to the test case on follow action with offset.
* Added new createWithOffset function to create a follow action with offset.
* Modified the test case for followWithoffset to use the newly added createWithOffsets function for follow action.
* Refined the code for creating follow action with offsets.
* Modified test case for follow with offset as per updated create method.
* Code refined in createWithOffset method of follow action.
* Refined AppController.mm,RootViewController.mm and HelloWorldScene.cpp to load the cocos2d-x scene more effectively.Also included the procedure to dismiss the game scene and navigate back to iOS screen.
2016-06-08 10:55:02 +08:00
Shulepov
21ab86b5fe
iOS: ARC support #12518 ( #13937 )
...
* iOS: ARC support #12518
* Use @autoreleasepool with and without ARC
* Missed release for _viewController
2016-06-06 13:48:02 +08:00
CocosRobot
6a2f417498
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-30 09:23:17 +00:00
minggo
7516db0fa8
Merge pull request #15734 from pandamicro/v3
...
Support cc.view.setOrientation on web
2016-05-27 14:26:50 +08:00
pandamicro
1928d24bf0
Made templates support cc.view.setOrientation on web
2016-05-26 19:24:24 +08:00
BQ
93ed59bfb3
English grammar corrections.
2016-05-25 15:25:38 +01:00
BQ
6097c3abd1
English grammar corrections.
...
Make brackets consistent.
2016-05-25 15:18:57 +01:00
minggo
5019dc7878
don't strip png text
2016-05-24 10:06:28 +08:00
minggo
ecf181036a
remove unneeded files
2016-05-18 16:44:06 +08:00
minggo
74af3b5232
merge v3.11 back to v3
2016-05-12 09:50:03 +08:00
CocosRobot
530d890c6c
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-10 02:41:22 +00:00
minggo
2a712a0c3b
set correct package name
2016-05-09 18:14:53 +08:00
zilongshanren
e4d91f5577
fix tizen videoplayer issue
2016-05-06 18:43:26 +08:00
minggo
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
CocosRobot
2184600565
[AUTO][ci skip]: updating cocos2dx_files.json
2016-05-04 01:24:01 +00:00
zilongshanren
c8d570c310
fix tizen template api-version issue
2016-05-03 11:22:34 +08:00
zilongshanren
675fe8e811
fix template project running
2016-05-03 11:02:22 +08:00
zilongshanren
b2b774b66b
fix tizen lua template
2016-04-29 17:59:10 +08:00
zilongshanren
915ea19e2e
fix tizen cpp template settings
2016-04-29 17:28:38 +08:00
Dale Stammen
8f37130569
added missing winrt template code for inplace EditBox
2016-04-28 08:37:55 -07:00
CocosRobot
011523cb56
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-28 01:52:35 +00:00
zilongshanren
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
Josh Bodily
614c3c47d7
Josh/winrt inplace editbox ( #15473 )
...
* WinRT in-place edit box
* Fix static analysis errors
2016-04-25 11:17:09 +08:00
minggo
7ccd05548e
Merge pull request #13936 from Shulepov/app_controller_synthesize_window
...
AppController: synthesize window #13285
2016-04-21 15:02:07 +08:00
mogemimi
85646b8d80
Fix warning C4305 while compiling AppDelegate with MSVC
2016-04-20 04:01:06 +09:00
Dale Stammen
4d7bf1f827
updated expiration dates of all winrt test app and template certificates
2016-04-19 09:07:30 -07:00
minggo
9c40277e48
Merge pull request #14980 from catinred2/dev
...
fix typo
2016-04-18 17:21:40 +08:00
CocosRobot
121e784484
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-18 07:48:59 +00:00
xpol
1e70fb5eb5
Remove include of cocos2d.h ( #15435 )
2016-04-18 15:09:21 +08:00
CocosRobot
f136e9d94e
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-18 01:43:40 +00:00
CocosRobot
d1ced49baa
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-14 01:57:22 +00:00
minggo
61a83aca2e
Merge pull request #15407 from minggo/sync-to-v3.11
...
Sync to v3.11
2016-04-11 12:53:52 +08:00
pandamicro
f9f9551645
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-11 11:11:34 +08:00
CocosRobot
02e3fca1fa
[AUTO][ci skip]: updating cocos2dx_files.json
2016-04-11 01:39:26 +00:00
pandamicro
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
pandamicro
1ada222c36
Fix some issues
...
1. Action extendable in JSB
2. Fix cc.CallFunc callback parameter issue
3. Fix arrivalOrder property of Node
4. Upgrade trick for QQ browser <6.2
2016-04-07 22:40:32 +08:00
zilongshanren
6e3d69dded
Merge pull request #15336 from cocos2d/v3.10
...
V3.10
2016-03-29 11:23:11 +08:00
zilongshanren
1eacab01fb
fix windows platform simpleaudioengine include
2016-03-28 20:15:06 +08:00
zilongshanren
b879dce607
add audio SimpleAudioEngine.h search path back
2016-03-28 14:35:59 +08:00
minggo
488930119d
fix compiling error in new JSB project
2016-03-28 10:37:35 +08:00
Dale Stammen
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
CocosRobot
970d5f09ff
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 12:55:27 +00:00
zilongshanren
8eb683310d
Merge pull request #15295 from CocosRobot/update_cocosfiles_1458635195
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 19:52:22 +08:00
CocosRobot
c7cbe2dda3
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-22 08:26:39 +00:00
Xpol Wan
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
Xpol Wan
d6b2f08b30
The CC_TARGET_OS_* in xcodeproj are now not needed.
2016-03-16 13:20:53 +08:00
zilongshanren
af5c5ae1e8
Merge pull request #14777 from raksa/v3.10
...
prevent recompile when run Android app on Android Studio to device or Emulator.
2016-03-11 09:34:59 +08:00
Vladimir Perminov
2a201a5c4e
WinRT support key repeat and implement dispatchControlKey
2016-03-07 14:43:44 +03:00
CocosRobot
8f6da161d1
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 20:56:11 +00:00
Ricardo Quesada
21cd5d08f7
Merge pull request #15177 from ricardoquesada/cmake_fixes
...
"cocos new" fixes for cmake
2016-03-04 12:38:13 -08:00
CocosRobot
836a6ffa42
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 03:45:48 +00:00
Ricardo Quesada
5b3942fcbb
"cocos new" fixes for cmake
...
cmake for mac compiles. doesn't link since it needs iconv.
2016-03-03 19:21:30 -08:00
CocosRobot
c50630fdef
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-04 02:28:59 +00:00
CocosRobot
efff69a08d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-03 07:52:55 +00:00
Ricardo Quesada
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
Ricardo Quesada
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 16:54:04 2016 -0800
Merge branch 'v3' into cmake_android
commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:34:46 2016 -0800
Fix module name in Android template to match CMake project.
commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
Author: Chaoren Lin <chaorenl@google.com>
Date: Thu Feb 11 18:27:45 2016 -0800
Add missing platform specific source file to CMake project.
commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:21:12 2016 -0800
Find AndroidNdkModules.cmake relative to android.toolchain.cmake.
commit a10075e2cb30af2e1f9a30da99efac880658ad6b
Author: Chaoren Lin <chaorenl@google.com>
Date: Wed Feb 10 19:03:11 2016 -0800
Remove cpp-empty-test from project templates.
commit e070fcbf210b8628f75785e738202a80a95ac0ff
Author: WenhaiLin <wenhai.lin@chukong-inc.com>
Date: Mon Aug 31 09:56:03 2015 +0800
Fix CMake for Android Target
2016-03-02 16:51:54 -08:00
CocosRobot
fe979c6fdd
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-01 01:37:51 +00:00
CocosRobot
e6b727d94d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-03-01 00:23:18 +00:00
CocosRobot
a95a4f49f8
[AUTO][ci skip]: updating cocos2dx_files.json
2016-02-24 07:43:24 +00:00
CocosRobot
303cce24e3
[AUTO][ci skip]: updating cocos2dx_files.json
2016-02-21 15:03:26 +00:00
CocosRobot
5d1cc4aad2
[AUTO][ci skip]: updating cocos2dx_files.json
2016-02-11 13:36:10 +00:00
xming
2ebe511a06
fix typo
2016-01-27 17:59:30 +08:00
CocosRobot
f3cd516926
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-21 02:33:41 +00:00
CocosRobot
309a6de467
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-20 10:26:00 +00:00
CocosRobot
f882d26a07
[AUTO][ci skip]: updating cocos2dx_files.json
2016-01-20 10:17:49 +00:00
zilongshanren
7467611daf
Merge pull request #14810 from GuoLunHao/v3.10_templates
...
fix compile error in visual studio 2015
2015-12-30 11:39:00 +08:00
lunhao.guo
d3387f5ab2
change the resolution size of js template to (960 * 640) ,consistent with other templates
2015-12-29 15:24:21 +08:00
lunhao.guo
d216785f43
fix compile error in visual studio 2015
2015-12-29 15:02:22 +08:00
raksa
9b5b87b505
reprepare assets on rebuild
2015-12-22 13:56:21 +07:00
raksa
341bf1aff8
reprepare assets on rebuild
2015-12-22 13:54:09 +07:00
Dale Stammen
908d872a0e
updated winrt template files with typo fixes
2015-12-09 17:33:50 -08:00
lunhao.guo
ae980c19d2
fix the link error and compile error in windows and android platform
2015-12-09 20:18:37 +08:00
CocosRobot
ddb0fc91b2
[AUTO][ci skip]: updating cocos2dx_files.json
2015-12-04 08:07:09 +00:00
pandamicro
c304348c34
Merge pull request #14565 from pandamicro/v3
...
Add js test case for fix, improve template
2015-12-03 18:48:34 +08:00
pandamicro
e7dca08df9
Add js test case for fix, improve template
2015-12-03 16:55:15 +08:00
CocosRobot
55f1a2c466
[AUTO][ci skip]: updating cocos2dx_files.json
2015-12-02 23:56:05 +00:00
CocosRobot
c0393ece7d
[AUTO][ci skip]: updating cocos2dx_files.json
2015-12-01 15:37:14 +00:00
XiaoFeng
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +08:00
XiaoFeng
167aa9b648
Update console sub-module, update project template.json to meet file position change
2015-12-01 15:00:45 +08:00
pandamicro
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
CocosRobot
467177f45c
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-28 06:31:21 +00:00
CocosRobot
390a37e123
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-26 05:56:34 +00:00
CocosRobot
82feb314f6
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-25 09:21:44 +00:00
pandamicro
a6fdd9aa09
Improve js template documentation
2015-11-24 16:31:14 +08:00
CocosRobot
74050b6595
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-19 09:07:54 +00:00
zilongshanren
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
CocosRobot
be36cd73b7
[AUTO][ci skip]: updating cocos2dx_files.json
2015-11-11 06:11:58 +00:00
yinjimmy
7f10d6d894
Template: keep compatibility
2015-11-04 18:26:59 +08:00