Commit Graph

68 Commits

Author SHA1 Message Date
James Chen 070c1aabb7 Fixes binary template compilation fairlure.
https://github.com/cocos-creator/fireball/issues/6028
2017-07-14 17:36:26 +08:00
2youyouo2 d0f80a3a46 update template for anysdk 2017-07-06 10:36:48 +08:00
Wang Nan e9617ca0a6 Merge pull request #685 from dumganhar/fix/socketrocket
Uses SocketRocket to implement WebSocket for iOS
2017-07-05 17:55:46 +08:00
James Chen 4ee7a5f3e9 Updates template for ios/mac 2017-07-05 16:43:22 +08:00
pandamicro 99206af737 Remove useless module and preprocess macros 2017-07-04 16:35:17 +08:00
pandamicro 154e3cf863 Support windows Spidermonkey v52 2017-06-30 18:02:08 +08:00
pandamicro c774cb9791 Upgrade to Spidermonkey v52. pass 9: Fix compilation warnings 2017-06-30 18:02:01 +08:00
pandamicro 024451216f Upgrade to Spidermonkey v52. pass 5: Compilation passed on v52 2017-06-30 18:01:56 +08:00
Wang Nan 9392c162e5 Merge pull request #635 from pandamicro/develop
Support multi touch on iOS (the correct way)
2017-05-18 14:37:41 +08:00
pandamicro 5394abb9bf Support multi touch on iOS (the correct way) 2017-05-18 14:28:03 +08:00
2youyouo2 61c76e0d8b support vs 2017 2017-05-17 18:02:57 +08:00
2youyouo2 f873d7f7b4 update game.rc 2017-05-17 17:58:01 +08:00
2youyou2 8bd5d110b1 add box2d lib dependency to binary win32 template 2017-05-11 11:03:41 +08:00
Wang Nan 496eedb1b0 Merge pull request #613 from 2youyou2/android
fixed android studio compile error
2017-05-04 11:38:03 +08:00
2youyouo2 992bb2724c fixed .so not compile to apk 2017-05-04 11:01:45 +08:00
Wang Nan 2ea1bd86a3 Merge pull request #609 from 2youyou2/android
set ndk_out for android-studio project
2017-05-02 14:02:02 +08:00
2youyouo2 524c511ca5 set ndk_out for android-studio project 2017-05-02 13:54:49 +08:00
Wang Nan 5635ab2957 Merge pull request #607 from zilongshanren/syncCodeFromCocosV3_path1
Sync code from cocos v3
2017-05-02 13:53:10 +08:00
2youyouo2 d7b3bc096b fixed windows commands char length too long 2017-04-27 17:31:32 +08:00
zilongshanren 5c25d799d3 update binary template 2017-04-26 17:24:44 +08:00
2youyouo2 678e5ba92e fixed binary android-studio project 2017-04-21 09:41:47 +08:00
2youyouo2 4ebcc72f19 update android-studio project 2017-04-21 09:37:40 +08:00
Wang Nan 54505ece06 Merge pull request #536 from natural-law/issue5210
Solve the warning in NDK build with binary/link template.
2017-02-27 09:37:00 +08:00
James Chen 18537b6a8a Updates project configuration for win32 and assert logic fix for HttpClient. 2017-02-16 11:13:31 +08:00
zhangbin d5cd326059 Solve the warning in NDK build with binary/link template. 2017-02-13 11:58:21 +08:00
zhangbin 4caac936ae Set the default APP_ABI with armeabi-v7a for binary template.. 2017-02-08 14:22:34 +08:00
Wang Nan c3de6d4152 Merge pull request #448 from cocos-creator/v1.3
merge V1.3
2016-12-21 14:32:08 +08:00
knoxHuang 8812ead9bf add semicolon import android.os.Bundle for AppActivity 2016-12-20 18:10:18 +08:00
knoxHuang 871732c527 add android.os.Bundle for AppActivity 2016-12-20 17:29:41 +08:00
Nan Wang 563a2621ab merged v1.3 2016-12-16 13:54:56 +08:00
knoxHuang 1223dd2592 rm extra code for AppActivity 2016-12-16 10:35:50 +08:00
Nan Wang 384cfa8b6b fix CocosDenshion namespace compile error 2016-12-01 13:45:51 +08:00
Nan Wang 9ff81c656b fix CocosDenshion namespace compile error 2016-12-01 09:58:33 +08:00
Wang Nan 6a85ff24a1 Merge pull request #420 from cocos-creator/v1.3
merge V1.3
2016-11-29 10:10:54 +08:00
James Chen 5996fe0866 Don’t invoke simple audio engine stuff in AppDelegate. And send missing game_on_hide & game_on_show event for Appdelegate in Simulator. 2016-11-28 11:51:37 +08:00
zhangbin a70c941f59 Update the icon of Android Studio project in templates. 2016-11-11 11:46:31 +08:00
zhangbin ddda30122d Solve the error application name of Android Studio project. 2016-10-10 13:44:38 +08:00
zhangbin ad9593f9b6 Solve the error in binary template. 2016-09-27 16:17:11 +08:00
2youyouo2 ba0c01341c support binary android-studio 2016-09-23 16:00:17 +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
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
2youyouo2 034aa113cf fixed mac templates 2016-08-03 14:11:15 +08:00
yanli.huang 44796089f7 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-07-28 13:57:19 +08:00
yanli.huang 4fb94eef21 strip anysdk from template.add anysdk by copy way 2016-07-28 13:56:06 +08:00
2youyouo2 b90fa73948 upload missed files 2016-07-27 16:26:10 +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