CocosRobot
|
14f096002b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-27 01:45:09 +00:00 |
|
Wang Nan
|
3ecc73e462
|
Merge pull request #538 from hylthink/v1.4
fix https://github.com/cocos-creator/fireball/issues/5249
|
2017-02-27 09:37:33 +08:00 |
|
yanli.huang
|
2d6c6d60e7
|
fix https://github.com/cocos-creator/fireball/issues/5249
|
2017-02-17 16:00:41 +08:00 |
|
CocosRobot
|
fdf97be719
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-02-10 12:29:35 +00:00 |
|
zhangbin
|
4caac936ae
|
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-08 14:22:34 +08:00 |
|
CocosRobot
|
90e611f0d2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-01-16 06:31:43 +00:00 |
|
CocosRobot
|
c12ae2a4c7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-01-13 06:31:53 +00:00 |
|
CocosRobot
|
5014f78fd8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-01-10 10:21:13 +00:00 |
|
CocosRobot
|
38e52ca782
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2017-01-05 06:47:52 +00:00 |
|
zhangbin
|
118a806995
|
Solve the error when running project on iOS device with release mode.
|
2016-12-26 17:38:35 +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 |
|
Wang Nan
|
3bcfa13098
|
Merge pull request #429 from cocos-creator/v1.3
merge V1.3
|
2016-12-09 09:47:34 +08:00 |
|
CocosRobot
|
a180aa28d0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-12-06 08:57:16 +00: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 |
|
CocosRobot
|
4774895ce0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-11-04 06:32:53 +00:00 |
|
CocosRobot
|
fe440cc79e
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-10-21 06:55:13 +00:00 |
|
pandamicro
|
359e57bdd6
|
Revert "Update cocos2dx_files"
|
2016-10-21 11:36:30 +08:00 |
|
pandamicro
|
73db7414ed
|
Update cocos2dx_files
|
2016-10-21 11:14:39 +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 |
|
zhangbin
|
1e8ea4ee58
|
Solve the error on platform win32.
|
2016-09-27 15:14:12 +08:00 |
|
2youyouo2
|
ba0c01341c
|
support binary android-studio
|
2016-09-23 16:00:17 +08:00 |
|
Wang Nan
|
a3f0e38d22
|
Merge pull request #335 from hylthink/develop
fix built-in android project compiled failed
|
2016-09-23 13:43:27 +08:00 |
|
yanli.huang
|
19bf2d5ee5
|
fix built-in android project compiled failed
|
2016-09-23 12:04:24 +08:00 |
|
CocosRobot
|
b7bf21810d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-22 10:32:11 +00: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 |
|
CocosRobot
|
a25e733024
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-07 08:16:07 +00:00 |
|
CocosRobot
|
91eef2d236
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-02 09:40:45 +00:00 |
|
CocosRobot
|
f32aa372a5
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-02 01:52:39 +00:00 |
|
CocosRobot
|
57a0e11044
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-09-01 07:27:33 +00: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 |
|
CocosRobot
|
71fe83284b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-08-26 12:15:44 +00: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 |
|
CocosRobot
|
62f4151c05
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-07-29 08:24:50 +00:00 |
|
yanli.huang
|
af7ff67577
|
fix: proj.android-studio compiled failed
|
2016-07-28 22:18:18 +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 |
|