zilongshanren
|
1ecec7bdd8
|
fix jsb travis script
|
2016-09-01 18:39:49 +08:00 |
|
zilongshanren
|
2e00a5158c
|
fix travis binidngs generator
|
2016-09-01 18:21:49 +08:00 |
|
natural-law
|
a240bef9bc
|
Add dragonbones project for win32.
|
2016-08-30 15:21:48 +08:00 |
|
yanli.huang
|
20e981f64e
|
update cocos2d-console commit id :fix cocos package can't update
|
2016-08-30 13:59:45 +08:00 |
|
zhangbin
|
36bdf9aac7
|
Update the version of rapid json.
|
2016-08-30 11:48:57 +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 |
|
Wang Nan
|
789320bbe3
|
Merge pull request #269 from natural-law/issue3120
Support show the object group in TiledMap.
|
2016-08-26 20:15:22 +08:00 |
|
pandamicro
|
2763b53ac1
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
Conflicts:
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoHelper.java
|
2016-08-26 19:11:51 +08:00 |
|
pandamicro
|
26117d82b3
|
Fix compilation issues on iOS
|
2016-08-26 18:52:25 +08:00 |
|
zhangbin
|
f97b23514b
|
Use java reflection to avoid API level dependent, Use API Level 10.
|
2016-08-25 09:56:32 +08:00 |
|
yanli.huang
|
17bba052e5
|
update cocos2d-console commit id :add cocospackage.pyc
|
2016-08-22 16:46:10 +08:00 |
|
yanli.huang
|
0df076d508
|
update cocos2d-console commit id : cocos package so change pyc
|
2016-08-22 16:29:13 +08:00 |
|
yanli.huang
|
15515c3d2d
|
update cocos2d-console commit: add --env param to cocos package
|
2016-08-16 11:48:52 +08:00 |
|
yanli.huang
|
c31ae1fe2c
|
update cocos2d-console commit :add --env param to cocos package
|
2016-08-16 11:43:11 +08:00 |
|
pandamicro
|
6713fd2d11
|
Fix js-bindings project compilation issues
|
2016-08-15 19:08:58 +08:00 |
|
pandamicro
|
32b4f63d45
|
Fix Creator module memory not controlled by cpp
|
2016-08-15 01:11:32 +08:00 |
|
zhangbin
|
4e8915ecd8
|
Solve the error is generated js bindings.
|
2016-08-12 15:56:52 +08:00 |
|
pandamicro
|
f06b057a3e
|
Update bindings configurations
|
2016-08-11 13:59:38 +08:00 |
|
yanli.huang
|
4f08f963e5
|
update cocos2d-console commit
1.add mode param when call cocos package encrypt
2.fault-tolerant. call encrypt if and only if used cocos package to import plugin
|
2016-07-29 18:40:58 +08:00 |
|
yanli.huang
|
1931d6e2e1
|
update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
|
2016-07-26 18:30:41 +08:00 |
|
yanli.huang
|
ed3f9618ee
|
update coco2d-console commit
|
2016-07-22 17:42:42 +08:00 |
|
yanli.huang
|
c2427763e9
|
update console commit
|
2016-07-22 11:35:23 +08:00 |
|
minggo
|
835acc20c8
|
fix crash
|
2016-07-20 10:40:09 +08:00 |
|
minggo
|
5f74ad1981
|
revert correct search path
|
2016-07-20 10:23:05 +08:00 |
|
Wang Nan
|
9c9cc23bcf
|
Merge pull request #209 from cocos-creator/v1.1
merge V1.1
|
2016-07-18 10:21:42 +08:00 |
|
zhangbin
|
b397ac686e
|
Solve the errors in simulator project.
|
2016-07-12 14:00:09 +08:00 |
|
2youyouo2
|
c4fc8d0e84
|
add graphics
|
2016-06-30 14:56:31 +08:00 |
|
2youyouo2
|
ea3f6634e0
|
fixed simulator http request
|
2016-06-24 17:52:33 +08:00 |
|
2youyouo2
|
47f7f34117
|
default support resize window in simulator desktop
|
2016-06-06 11:54:08 +08:00 |
|
pandamicro
|
a21cbcdc72
|
Merge pull request #150 from pandamicro/develop
Fix bindings issues with AssetsManager
|
2016-05-27 13:59:43 +08:00 |
|
pandamicro
|
c7a975f8d1
|
Fix bindings issues with AssetsManager
|
2016-05-27 11:11:54 +08:00 |
|
zhangbin
|
590f4576d1
|
Update the reference of submodule cocos2d-console.
1. Change the Tracker ID of GA in console.
2. Disable the BI Data Statistic.
|
2016-05-26 10:46:20 +08:00 |
|
zhangbin
|
343c14f86c
|
Update the reference of submodule cocos2d-console.
1. Support absolute path in config `ndk-module-paths`.
2. Support absolute path & environment variable in copy files config.
|
2016-05-24 18:32:18 +08:00 |
|
zilongshanren
|
c3fb81d456
|
fix gen cocos files script
|
2016-05-23 17:49:38 +08:00 |
|
pandamicro
|
87ca37f50f
|
Add AssetsManagerEx to extension
|
2016-05-18 14:19:55 +08:00 |
|
Nan Wang
|
b47e5bf5ea
|
add prebult mk to output
|
2016-05-12 17:59:42 +08:00 |
|
Nan Wang
|
6672a614fa
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-05-12 17:31:42 +08:00 |
|
zilongshanren
|
b6f19dfde6
|
use osx to generate bindings
|
2016-05-11 17:33:08 +08:00 |
|
zilongshanren
|
1f2e6e9f48
|
use linux to generate bindings
|
2016-05-11 12:02:33 +08:00 |
|
zilongshanren
|
6ffebc4f03
|
[Dont' Merge!] It's just a dummy PR.
|
2016-05-11 11:54:20 +08:00 |
|
zilongshanren
|
0cc145d991
|
add -q option to unzip
|
2016-05-11 11:47:57 +08:00 |
|
zilongshanren
|
d0b79965ac
|
change ndk version from r9d to r11c
|
2016-05-11 11:39:35 +08:00 |
|
zilongshanren
|
7c283ccd63
|
fix gen bindings and cocos files script
|
2016-05-11 11:02:08 +08:00 |
|
zilongshanren
|
66f12204fd
|
remove unused comments
|
2016-05-10 17:43:08 +08:00 |
|
zilongshanren
|
5b608c2198
|
fix travis linux install deps
|
2016-05-10 17:34:58 +08:00 |
|
zilongshanren
|
052e25f2d6
|
add bindings code
|
2016-05-10 17:20:42 +08:00 |
|
zilongshanren
|
fb56f45e0a
|
only setup two build slaves for push event
|
2016-05-10 17:00:22 +08:00 |
|
zilongshanren
|
350cddd916
|
fix mac travis build
|
2016-05-10 16:40:12 +08:00 |
|
zilongshanren
|
cdb8af157c
|
add multiple build to travis
|
2016-05-10 16:35:23 +08:00 |
|
zilongshanren
|
f7f5d9a899
|
cleanup ci scripts
|
2016-05-10 16:19:46 +08:00 |
|