chuanweizhang2013
|
bad371fbf0
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-07-04 02:33:51 -07:00 |
chuanweizhang2013
|
d7bf9598f1
|
version1.2
|
2014-07-04 02:31:13 -07: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
|
eb7523e0c6
|
version.json
|
2014-07-03 19:56:21 -07:00 |
chuanweizhang2013
|
c1e8cc974b
|
add call encript lua function
|
2014-07-03 19:53:17 -07:00 |
chuanweizhang2013
|
d8f01215f0
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-07-03 16:30:51 +08:00 |
chuanweizhang2013
|
10595394e3
|
copy res when update resource
|
2014-07-03 01:00:24 -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
|
0be6d27271
|
Merge pull request #7295 from minggo/support-regular-expression
Support regular expression
|
2014-07-03 15:20:06 +08:00 |
chuanweizhang2013
|
b88b5e4c3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-03 11:13:59 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
CocosRobot
|
0b0b9ccdf3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-02 08:21:52 +00:00 |
chuanweizhang2013
|
7eec8fbb3a
|
add arm64 bit support
|
2014-07-02 11:55:20 +08:00 |
GS
|
8a4fab2b1f
|
add another possible GLFW header location
|
2014-07-02 10:11:51 +08:00 |
CocosRobot
|
32c88f6189
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-01 10:04:00 +00:00 |
CocosRobot
|
5ab6d5557b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-01 07:52:35 +00:00 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
chuanweizhang2013
|
4481149a30
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-30 17:53:46 +08:00 |
CocosRobot
|
6eb0d3cc86
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-30 09:26:15 +00:00 |
CocosRobot
|
f06061dfec
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-30 01:42:06 +00:00 |
CocosRobot
|
c52fe48484
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-29 08:42:40 +00:00 |
minggo
|
7f28e81d09
|
Merge pull request #7226 from super626/v3
Animation3D
|
2014-06-29 16:41:13 +08:00 |
chuanweizhang2013
|
a8f4dcb59f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-28 18:10:17 +08:00 |
chuanweizhang2013
|
e57ea32e58
|
1.2 template
|
2014-06-28 18:08:40 +08:00 |
chuanweizhang2013
|
618682def4
|
add ios search path
|
2014-06-27 18:15:39 +08:00 |
yangxiao
|
f38f0b00aa
|
fix templates
|
2014-06-27 18:01:39 +08:00 |
CocosRobot
|
054f8c5d11
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-27 08:38:35 +00:00 |
samuele3hu
|
cfb992e7cf
|
Upate templates project setting
|
2014-06-27 14:52:32 +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 |
CocosRobot
|
a3de7c00c8
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-26 06:40:58 +00:00 |
Dale Stammen
|
33e39b5786
|
added source files for component to be consistent with other platforms templates
|
2014-06-25 09:51:32 -07:00 |
Dale Stammen
|
97d126d300
|
added source files for component to be consistent with other platforms templates
|
2014-06-25 09:50:40 -07:00 |
chuanweizhang2013
|
cee5754db4
|
modify mac out file
|
2014-06-25 19:33:38 +08:00 |
CocosRobot
|
486bf9ad12
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-25 09:21:01 +00:00 |
chuanweizhang2013
|
0c84dc3e6e
|
modify debug output file to runtime mac folder
|
2014-06-25 01:11:14 -07:00 |
chuanweizhang2013
|
90bd722bd2
|
remove rtres
|
2014-06-25 13:42:33 +08:00 |
chuanweizhang2013
|
ac539131e2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-25 11:39:17 +08:00 |
chuanweizhang2013
|
ec0eb7b6d6
|
modify filetime save formate
|
2014-06-25 11:36:59 +08:00 |
CocosRobot
|
7f104f4bf7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 02:47:56 +00:00 |
CocosRobot
|
cb9e5c2d77
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 02:31:03 +00: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 |
CocosRobot
|
2c04d00425
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-20 16:25:25 +00:00 |
chuanweizhang2013
|
a45056dbd7
|
add protobuf
|
2014-06-20 11:32:22 +08:00 |
CocosRobot
|
ffb96092fd
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 13:57:10 +00:00 |
CocosRobot
|
54b2a15886
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-19 13:24:14 +00: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
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09: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 |
zhangbin
|
3b19b07915
|
Modify the lua runtime template for prebuilt engine.
|
2014-06-19 11:33:39 +08:00 |
chuanweizhang2013
|
e1d7871089
|
add mac android support
|
2014-06-19 11:27:31 +08:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
chuanweizhang2013
|
69a55e2cfa
|
add protobuf-lite source
|
2014-06-18 15:43:38 +08:00 |
CocosRobot
|
9aeb1510ed
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-18 05:36:54 +00:00 |
CocosRobot
|
a292f7d063
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 13:09:25 +00:00 |
minggo
|
26cca348cb
|
Merge pull request #7085 from super626/v3
Sprite3D animation
|
2014-06-17 21:05:58 +08:00 |
bofeng-song
|
d97b28db76
|
modify copy script & modify release version`s outfile addr
|
2014-06-17 18:17:35 +08:00 |
CocosRobot
|
7f9c86ab44
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 05:58:26 +00:00 |
minggo
|
a2a6a4e70a
|
Merge pull request #7087 from MSOpenTech/wp8-v3-template
Wp8 v3 template and missing texture after app switch fixes
|
2014-06-17 13:49:24 +08:00 |
CocosRobot
|
0bbce49012
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 05:38:36 +00:00 |
Huabing.Xu
|
f0fd7897be
|
update template
|
2014-06-17 13:25:05 +08:00 |
Dhilan007
|
648e7767d4
|
fixed can't move app to SD card after installed on android.
|
2014-06-17 12:03:20 +08:00 |
Dale Stammen
|
1a5d148d8e
|
updated template code
|
2014-06-16 10:29:40 -07:00 |
Dale Stammen
|
753167b5f2
|
updated xaml resources
|
2014-06-16 09:25:35 -07: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 |
Dale Stammen
|
2d913470a0
|
updated fast resume code for app
|
2014-06-12 16:36:53 -07:00 |
Dhilan007
|
5cd7ab97d9
|
fixed wrong WP8 project name when create project by console.
|
2014-06-09 16:17:19 +08:00 |
CocosRobot
|
70a4fd173c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 03:12:43 +00:00 |
minggo
|
24f7c9019a
|
Merge pull request #7005 from andyque/refactorUITouchEvent
refactor UI framework touch handling
|
2014-06-09 11:11:40 +08:00 |
CocosRobot
|
b2ca17e00b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-09 02:53:03 +00:00 |
andyque
|
1a933807b5
|
remove UIInterface.h header file
|
2014-06-09 10:35:54 +08:00 |
chuanweizhang2013
|
ddaf8f9ec5
|
modify play action
|
2014-06-06 16:24:09 +08:00 |
Dhilan007
|
fd4e233432
|
fixed WP8 project:compile error,missing files,wrong file path.
|
2014-06-06 15:41:17 +08:00 |
chuanweizhang2013
|
f9b747cf1f
|
modify runtime
|
2014-06-05 18:03:38 +08:00 |
CocosRobot
|
b218f8ec13
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-05 03:51:15 +00:00 |
minggo
|
366beedbb2
|
Merge pull request #6955 from samuele3hu/v3_fix
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-05 11:49:40 +08:00 |
CocosRobot
|
bd018ea645
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-04 09:18:03 +00:00 |
minggo
|
7a4d46dc1b
|
Merge pull request #6965 from Dhilan007/v3-wp8fix
Support Fast App Resume and fixed black screen may arise when using third sdk.
|
2014-06-04 17:15:13 +08:00 |
andyque
|
ab8a68f53b
|
fix template
|
2014-06-04 15:55:52 +08:00 |
andyque
|
d089b251db
|
fix other platform compile error
|
2014-06-04 14:56:34 +08:00 |
Dhilan007
|
3fcb75c82f
|
Fixed black screen may arise when using third SDK.
|
2014-06-04 13:54:44 +08:00 |
samuele3hu
|
c785d64ba1
|
Adjust the xxtea directory structure and modify configs files for platforms
|
2014-06-04 11:50:04 +08:00 |
Dhilan007
|
52ad2063bd
|
Support Fast App Resume.
|
2014-06-04 11:19:53 +08:00 |
samuele3hu
|
55bb9a7d09
|
Update setting for different platform
|
2014-06-03 17:15:28 +08:00 |
cw
|
9d14a179db
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-06-03 11:28:18 +08:00 |
cw
|
521fa3118d
|
config template
|
2014-06-03 11:25:16 +08:00 |