CocosRobot
|
a3e15a3d29
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-31 01:59:46 +00:00 |
CocosRobot
|
cb7a63b413
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-30 10:34:54 +00:00 |
yinjimmy
|
2652a67040
|
cleanup
|
2014-12-30 16:02:05 +08:00 |
yinjimmy
|
d986c974d7
|
compatible code
|
2014-12-30 16:01:47 +08:00 |
yinjimmy
|
4c57a29455
|
fix: init config on all platform & stop runtime when exit
|
2014-12-30 15:59:52 +08:00 |
CocosRobot
|
e7a7ee750f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-29 05:48:30 +00:00 |
dualface
|
82c40ca5e8
|
add Cocos Studio support
|
2014-12-29 13:41:21 +08:00 |
dualface
|
653b15b4b8
|
add UIWidget support, fix typo
|
2014-12-29 13:37:20 +08:00 |
dualface
|
40acc98f14
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update_lua_templates
|
2014-12-29 10:58:42 +08:00 |
dualface
|
0acdd4f4a3
|
cleanup lua-template-runtime
|
2014-12-29 10:55:05 +08:00 |
CocosRobot
|
b385ce58d0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-29 02:31:59 +00:00 |
minggo
|
87a9039065
|
Merge pull request #9660 from yinjimmy/newLuaRuntime
add new lua runtime
|
2014-12-29 10:04:02 +08:00 |
minggo
|
212684fcd4
|
Merge pull request #9665 from andyque/fixLibpngWarning
Fix libpng warning
|
2014-12-29 10:00:43 +08:00 |
CocosRobot
|
0a4785d6fc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-29 01:45:01 +00:00 |
yinjimmy
|
e75d283455
|
1. do not setFrameSize when resetDesignResolution
2. read config.json when ConfigParser init
|
2014-12-29 09:16:07 +08:00 |
dualface
|
a4d17998d3
|
update lua-template-runtime
|
2014-12-29 05:55:56 +08:00 |
dualface
|
2ba25a473f
|
update lua-default-template
|
2014-12-29 05:51:49 +08:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
yinjimmy
|
4280ffcf58
|
add new lua runtime
|
2014-12-27 02:21:55 +08:00 |
CocosRobot
|
a8fedda82c
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-26 01:29:15 +00:00 |
CocosRobot
|
542b2b6bd2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-25 06:10:51 +00:00 |
youyou
|
f678d1027c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
|
2014-12-25 12:09:31 +08:00 |
Igor Mozharovsky
|
d0c223c3e0
|
Rewrite using already existing director's variable
|
2014-12-24 19:21:32 +02:00 |
CocosRobot
|
95df9ba145
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-24 09:37:39 +00:00 |
kaile.yin
|
942abfc654
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-12-24 10:53:09 +08:00 |
CocosRobot
|
94d96b5ad1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-23 04:01:55 +00:00 |
kaile.yin
|
b924dafe83
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
|
2014-12-22 11:14:31 +08:00 |
CocosRobot
|
7170e85a7a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-19 22:37:52 +00:00 |
honghui
|
3c3b190be8
|
update runtime version
|
2014-12-12 15:47:12 +08:00 |
honghui
|
ab162a01f4
|
runtime's setSearchPaths failed
|
2014-12-11 22:16:39 +08:00 |
minggo
|
73ece5ad09
|
Merge pull request #9385 from samuele3hu/v3_cocostudio
Remove useless copy about luasocket on the android platform
|
2014-12-09 18:28:08 +08:00 |
youyou
|
5bcc1c29d9
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
tests/lua-tests/src/CocoStudioTest/CocoStudioActionTimelineTest/CocoStudioActionTimelineTest.lua
|
2014-12-05 20:13:27 +08:00 |
honghui
|
61e13bf2a1
|
update runtime version to 1.6
|
2014-12-05 16:09:43 +08:00 |
samuele3hu
|
3e0852eb7a
|
Remove useless copy about luasocket on the android platform
|
2014-12-05 15:28:45 +08:00 |
kaile.yin
|
743166f50b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
|
2014-12-04 15:32:25 +08:00 |
CocosRobot
|
b7d553f5db
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 07:13:03 +00:00 |
minggo
|
3faeee66e3
|
Merge pull request #9358 from cocoscodeide/v3
merge runtime to v3
|
2014-12-04 14:00:17 +08:00 |
honghui
|
2aa05bff39
|
revert file commit by mistake
|
2014-12-04 13:53:55 +08:00 |
CocosRobot
|
918372556b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 02:08:20 +00:00 |
kaile.yin
|
9d49f82eb9
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
tools/tolua/cocos2dx.ini
|
2014-12-03 16:00:32 +08:00 |
honghui
|
118569c972
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-30 15:37:30 +08:00 |
honghui
|
047c36a270
|
update runtime template
|
2014-11-29 16:05:18 +08:00 |
Huabing.Xu
|
522a77e1a8
|
Merge pull request #9311 from andyque/fixLinuxTemplate
fix linux cpp and lua template
|
2014-11-29 09:20:22 +08:00 |
andyque
|
79918d789e
|
fix cocos2d root
|
2014-11-28 08:24:48 -08:00 |
andyque
|
bdd46f7e55
|
fix linux cpp and lua template
|
2014-11-28 08:20:02 -08:00 |
CocosRobot
|
ff8d2624eb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 08:54:16 +00:00 |
honghui
|
9fefad5f35
|
debugging lua code in package support
|
2014-11-28 15:40:12 +08:00 |
minggo
|
f3e53d7700
|
Merge pull request #9299 from CocosRobot/update_cocosfiles_1417117059
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 09:36:53 +08:00 |
CocosRobot
|
38c3bc7b4f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-27 19:37:40 +00:00 |
Dhilan007
|
3025e937f6
|
Fixed compiling and linking error of new lua projects when using NDK r10 above.
|
2014-11-27 21:56:06 +08:00 |