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 |
|
zilongshanren
|
cfb0b36343
|
fix generate templates json file scripts
|
2016-05-10 14:57:43 +08:00 |
|
zilongshanren
|
c647536c0c
|
Merge branch 'develop' into syncMasterBranch
# Conflicts:
# gulpfile.js
# package.json
|
2016-05-10 14:12:59 +08:00 |
|
zilongshanren
|
a45d0f5772
|
add travis build status to develop branch
|
2016-05-06 16:22:28 +08:00 |
|
zilongshanren
|
d366a8d1bb
|
make travis working
|
2016-05-06 16:10:43 +08:00 |
|
zilongshanren
|
4f42d3a5ca
|
add travis scripts back.
1. it also fix generate cocos files and bindings code
|
2016-05-06 14:54:19 +08:00 |
|
Nan Wang
|
dd000ca571
|
tweaked title for resolution option
|
2016-05-04 09:54:28 +08:00 |
|
Nan Wang
|
946e4ba516
|
fix comma
|
2016-05-04 09:50:21 +08:00 |
|
Nan Wang
|
9690cf55c9
|
add iphone 6 resolution
|
2016-05-04 09:50:02 +08:00 |
|
2youyouo2
|
4a7b42fc3f
|
update simulator config.json
|
2016-05-03 14:33:33 +08:00 |
|
Wenhai Lin
|
94501cc8f1
|
Bug fix and stability improvements
|
2016-04-25 15:56:03 +08:00 |
|
Wenhai Lin
|
1c5f974d78
|
Fixed generate error code for constructor
|
2016-04-22 14:10:02 +08:00 |
|
Wenhai Lin
|
f1d7d03ab5
|
Update the submodule bindings-generator
|
2016-04-22 11:43:17 +08:00 |
|
Wenhai Lin
|
a4bdfa270c
|
Fixed warns in JS bindings
|
2016-04-22 11:31:32 +08:00 |
|
Wenhai Lin
|
0abea90927
|
Update the submodule bindings-generator
|
2016-04-19 14:50:46 +08:00 |
|
Wenhai Lin
|
7bf60cb53e
|
Update JS bindings and support generate JS bindings by NDK r11+.
|
2016-04-19 14:36:00 +08:00 |
|
2youyouo2
|
1402d72199
|
update cocos console
|
2016-04-18 10:03:20 +08:00 |
|
2youyouo2
|
fd876c82f9
|
fixed mac simulator
|
2016-04-15 10:36:44 +08:00 |
|
2youyou2
|
4cabfc4e45
|
update win32 project
|
2016-04-14 18:56:00 +08:00 |
|
2youyou2
|
5f83d4a2e3
|
update win32 config
|
2016-04-14 11:46:16 +08:00 |
|
2youyouo2
|
fa4b9cae89
|
update creator js binding
|
2016-04-13 21:42:14 +08:00 |
|
2youyouo2
|
d2cc58eb56
|
add make-package
|
2016-04-13 18:36:51 +08:00 |
|
2youyouo2
|
6ca97fef49
|
add simulator
|
2016-04-13 16:43:49 +08:00 |
|
2youyouo2
|
ce4f78f312
|
add creator files
|
2016-04-13 15:35:27 +08:00 |
|
2youyouo2
|
a4d8f0ba8c
|
add binding generator
|
2016-04-13 15:33:39 +08:00 |
|