chuanweizhang2013
|
56a95a2e52
|
move setDisplayStats function
|
2014-07-12 11:42:39 +08:00 |
chuanweizhang2013
|
683ba200f5
|
move getIPAddress function
|
2014-07-11 11:34:15 +08:00 |
chuanweizhang2013
|
0c6383ecfe
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-07-11 10:42:44 +08:00 |
chuanweizhang2013
|
ca6bff963d
|
fixed transfor file error which size is 0
|
2014-07-11 10:38:55 +08:00 |
zhangbin
|
af5cf0a33f
|
Add configuration in templates to set the bundle identity of Mac & iOS project.
|
2014-07-08 10:22:08 +08:00 |
chuanweizhang2013
|
39b03de8a9
|
revert Android.mk
|
2014-07-04 15:39:07 +08:00 |
chuanweizhang2013
|
04a9b5c2c6
|
add setXXTEAKeyAndSign
|
2014-07-04 13:40:49 +08:00 |
chuanweizhang2013
|
e32eadc364
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-04 13:36:51 +08:00 |
chuanweizhang2013
|
c1e8cc974b
|
add call encript lua function
|
2014-07-03 19:53:17 -07:00 |
chuanweizhang2013
|
9b1771d60e
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-07-03 00:55:26 -07:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
chuanweizhang2013
|
7eec8fbb3a
|
add arm64 bit support
|
2014-07-02 11:55:20 +08:00 |
chuanweizhang2013
|
618682def4
|
add ios search path
|
2014-06-27 18:15:39 +08:00 |
chuanweizhang2013
|
09d1ee8fcf
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-06-26 05:02:34 -07:00 |
chuanweizhang2013
|
b80d825421
|
commit
|
2014-06-26 04:41:54 -07:00 |
chuanweizhang2013
|
cee5754db4
|
modify mac out file
|
2014-06-25 19:33:38 +08:00 |
chuanweizhang2013
|
0c84dc3e6e
|
modify debug output file to runtime mac folder
|
2014-06-25 01:11:14 -07:00 |
chuanweizhang2013
|
ec0eb7b6d6
|
modify filetime save formate
|
2014-06-25 11:36:59 +08:00 |
chuanweizhang2013
|
7f75b58acf
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
|
2014-06-23 17:30:33 +08:00 |
chuanweizhang2013
|
a170342f01
|
modify release output
|
2014-06-23 16:56:23 +08:00 |
zhangbin
|
dd49c4ccbc
|
Solve the error in Xcode project of lua runtime template.
|
2014-06-23 15:41:58 +08:00 |
chuanweizhang2013
|
e1333da7e4
|
add stubs head
|
2014-06-23 15:07:49 +08:00 |
chuanweizhang2013
|
f283ec69a1
|
add head
|
2014-06-23 15:04:28 +08:00 |
chuanweizhang2013
|
a45056dbd7
|
add protobuf
|
2014-06-20 11:32:22 +08:00 |
minggo
|
7553060ba7
|
Merge pull request #7146 from gin0606/addNewLineAtTheEndOfFileCpp
[ci skip]Add new line at the end of a file to *.[cpp|h]
|
2014-06-19 20:47:17 +08:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
gin0606
|
2c837b0960
|
add new line at the end of a file to *.mk
|
2014-06-19 20:43:27 +09:00 |
chuanweizhang2013
|
9e62cc9c31
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:28:25 +08:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
chuanweizhang2013
|
1153531448
|
add response error
|
2014-06-19 16:50:16 +08:00 |
chuanweizhang2013
|
e1d7871089
|
add mac android support
|
2014-06-19 11:27:31 +08:00 |
chuanweizhang2013
|
69a55e2cfa
|
add protobuf-lite source
|
2014-06-18 15:43:38 +08:00 |
bofeng-song
|
d97b28db76
|
modify copy script & modify release version`s outfile addr
|
2014-06-17 18:17:35 +08:00 |
Dhilan007
|
648e7767d4
|
fixed can't move app to SD card after installed on android.
|
2014-06-17 12:03:20 +08:00 |
bofeng-song
|
64f517a1b8
|
redirect function: setSearchPaths
|
2014-06-16 14:47:14 +08:00 |
bofeng-song
|
b3fe030b90
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3
|
2014-06-16 10:07:24 +08:00 |
bofeng-song
|
bca578c2f8
|
fix can`t debug vs project normally
|
2014-06-13 16:34:39 +08:00 |
cocoscodeide
|
2d4297d14e
|
Merge pull request #34 from cocos2d/v3
merge from cocos2d-x
|
2014-06-13 14:14:25 +08:00 |
chuanweizhang2013
|
2eac73cde3
|
add protobuf win32
|
2014-06-13 11:19:04 +08:00 |
chuanweizhang2013
|
ddaf8f9ec5
|
modify play action
|
2014-06-06 16:24:09 +08:00 |
chuanweizhang2013
|
f9b747cf1f
|
modify runtime
|
2014-06-05 18:03:38 +08:00 |
chuanweizhang2013
|
72ce393d60
|
remove rtres floder
|
2014-05-30 14:25:37 +08:00 |
cw
|
3807c7cffc
|
resource to binary
|
2014-05-30 13:53:49 +08:00 |
chuanweizhang2013
|
4b812f8b80
|
modify runtime folder
|
2014-05-30 11:00:26 +08:00 |
chuanweizhang2013
|
29cc2905f4
|
add tip
|
2014-05-30 09:43:39 +08:00 |
chuanweizhang2013
|
188f4ddcca
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-05-29 18:19:30 +08:00 |
chuanweizhang2013
|
201900e110
|
action
|
2014-05-29 18:19:19 +08:00 |
cocoscodeide
|
672ff4f7b3
|
Merge pull request #29 from bofeng-song/v3
add lock to get file name
|
2014-05-29 18:17:57 +08:00 |
minggo
|
c5dd99edd1
|
Merge pull request #6911 from cocoscodeide/v3
fixed win no log
|
2014-05-27 18:43:10 +08:00 |
cw
|
f2b243dff5
|
fixed win no log
|
2014-05-27 18:21:54 +08:00 |