Commit Graph

34 Commits

Author SHA1 Message Date
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
zhangbin 1e8ea4ee58 Solve the error on platform win32. 2016-09-27 15:14:12 +08:00
yanli.huang 19bf2d5ee5 fix built-in android project compiled failed 2016-09-23 12:04:24 +08:00
yanli.huang 6606b2ec23 update AnySDK 2.2.3 2016-09-20 16:37:23 +08:00
zhangbin b4cd99204e Remove unused files. 2016-09-08 10:36:46 +08:00
pandamicro 86ae89f85f Fix win32 compilation issues 2016-09-01 10:38:54 +08:00
pandamicro 66a38aa3a4 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	cocos/2d/CCFastTMXTiledMap.cpp
2016-08-26 20:48:38 +08:00
zhangbin f97b23514b Use java reflection to avoid API level dependent, Use API Level 10. 2016-08-25 09:56:32 +08:00
pandamicro b742058510 Fix all compilation and linking issues 2016-08-16 16:09:39 +08:00
yanli.huang 4fb94eef21 strip anysdk from template.add anysdk by copy way 2016-07-28 13:56:06 +08:00
yanli.huang 1b0f781b81 add extensions/anysdk/js-bindings
remove anysdk js-binding files
2016-07-22 14:09:56 +08:00
yanli.huang 9f916841fe Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
	templates/js-template-binary/frameworks/runtime-src/Classes/AppDelegate.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/Android.mk
	templates/js-template-binary/frameworks/runtime-src/proj.android/jni/hellojavascript/main.cpp
	templates/js-template-binary/frameworks/runtime-src/proj.android/src/org/cocos2dx/javascript/AppActivity.java
	templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2016-07-21 16:11:50 +08:00
minggo 73e93fddc1 fix compiling error with Xcode7.3 caused by libpng 2016-07-18 17:55:21 +08:00
yanli.huang 0aaab3fa5e add anysdk to templates 2016-07-13 16:37:07 +08:00
2youyouo2 259fc314a1 remove runtime files from binary template 2016-07-13 15:11:09 +08:00
2youyouo2 4aadc944c3 add project.properties 2016-06-29 18:36:09 +08:00
Nan Wang 9ae1360be9 update info.plist to add app transport security setting to allow http connection 2016-06-29 15:39:50 +08:00
子龙山人 498bdd79d8 Merge pull request #165 from zilongshanren/add-system-font-overflow
Add system font overflow
2016-06-14 11:15:16 +08:00
knoxHuang 048266e40b add JS and JAVA reflection test tips for AppActivity.java 2016-06-13 18:06:18 +08:00
knoxHuang fb6d6d7b8a update CCJavascriptJavaBridge 2016-06-13 17:39:33 +08:00
zilongshanren 0733fe707c fix template settings 2016-06-12 18:30:04 +08:00
2youyouo2 d45928a655 reset build.gradle 2016-06-01 17:40:12 +08:00
2youyouo2 4a991bd642 update android-studio templates 2016-05-26 18:42:54 +08:00
2youyou2 f0d947d66f update android template sdk level 2016-05-24 18:29:05 +08:00
2youyouo2 1cb724543e update android.mk 2016-05-18 00:10:07 +08:00
2youyouo2 006a757287 fixed xcode iOS project 2016-05-03 11:56:28 +08:00
2youyou2 68efc67897 fixed default-template release build on windows 2016-04-20 16:02:58 +08:00
2youyou2 4cabfc4e45 update win32 project 2016-04-14 18:56:00 +08:00
2youyouo2 adc68fc806 fixed js-template-default 2016-04-14 13:19:34 +08:00
2youyouo2 eb0785bf50 add js-template-default project.properties 2016-04-13 19:50:29 +08:00
2youyouo2 6d965cbef9 update templates 2016-04-13 15:39:33 +08:00
2youyouo2 54f91df786 update templates 2016-04-12 10:32:10 +08:00
Wenhai Lin 94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin b3441f7981 Add template project 2016-03-30 21:12:14 +08:00