zhangcheng
|
bdf7be6fa0
|
1. add classname = "" log.
|
2014-06-25 14:32:38 +08:00 |
minggo
|
5f569cb423
|
Merge pull request #7193 from samuele3hu/v3_ui_binary
Add UI Editor test cases for Lua
|
2014-06-25 14:30:34 +08:00 |
minggo
|
71f92a41b5
|
Merge pull request #7198 from CocosRobot/update_lua_bindings_1403676931
[AUTO]: updating luabinding automatically
|
2014-06-25 14:29:40 +08:00 |
CocosRobot
|
515f967f96
|
[AUTO]: updating luabinding automatically
|
2014-06-25 06:17:41 +00:00 |
minggo
|
5dcc6e6707
|
[ci skip]
|
2014-06-25 14:13:50 +08:00 |
minggo
|
e90e7699a6
|
Merge pull request #7195 from minggo/addChild-override
override addChild by name
|
2014-06-25 14:12:10 +08:00 |
minggo
|
7eb6ed75b8
|
Merge pull request #7197 from andyque/dimissListViewFocus
dimiss ListView focus tests
|
2014-06-25 14:11:36 +08:00 |
minggo
|
cd2d56f5d9
|
[ci skip]
|
2014-06-25 14:11:16 +08:00 |
andyque
|
634f1b58c4
|
add todo to reminder me
|
2014-06-25 14:10:53 +08:00 |
minggo
|
728fab706e
|
Merge pull request #7194 from andyque/fixTouchEvent
fix touch related issue
|
2014-06-25 14:05:16 +08:00 |
andyque
|
1902fdc9f4
|
dimiss ListView focus tests
|
2014-06-25 14:04:32 +08:00 |
XiaoYang
|
118d325284
|
Merge pull request #43 from lvlonggame/v3
modify binary loader and add boss.c3b model.
|
2014-06-25 14:02:47 +08:00 |
minggo
|
e2fd768989
|
[ci skip]
|
2014-06-25 13:59:41 +08:00 |
minggo
|
85671fb586
|
Merge pull request #7196 from andyque/issue5591
closed #5591, fix UIButton setTitleColor & getTitleColor not match
|
2014-06-25 13:57:06 +08:00 |
andyque
|
6df8079fd7
|
closed #5591, fix UIButton setTitleColor & getTitleColor not match
|
2014-06-25 13:47:29 +08:00 |
cocoscodeide
|
9585f543bf
|
Merge pull request #41 from chuanweizhang2013/v3luaruntime
remove rtres
|
2014-06-24 22:46:14 -07:00 |
chuanweizhang2013
|
90bd722bd2
|
remove rtres
|
2014-06-25 13:42:33 +08:00 |
lvlong
|
7331ef49b6
|
don't rotate girl model
|
2014-06-25 13:29:45 +08:00 |
lvlong
|
8cc4520deb
|
add boss.c3b
|
2014-06-25 13:22:04 +08:00 |
lvlong
|
658a955e36
|
modify skindata binary reading
|
2014-06-25 13:20:42 +08:00 |
XiaoYang
|
3b06c8e398
|
Merge pull request #42 from lvlonggame/v3
modify bundle3D
|
2014-06-25 12:49:40 +08:00 |
zhangcheng
|
644b61e261
|
1. add SceneBinary to 2.x
|
2014-06-25 11:58:36 +08:00 |
cocoscodeide
|
b5965c68e4
|
Merge pull request #40 from chuanweizhang2013/v3luaruntime
modify save file format
|
2014-06-24 20:48:10 -07: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 |
lvlong
|
da835cb837
|
modify origin-pos stuff
|
2014-06-25 11:35:55 +08:00 |
minggo
|
66703addb2
|
fixed #4693: override addChild by name
|
2014-06-25 11:27:48 +08:00 |
andyque
|
78e119ef56
|
Merge branch 'v3' into fixTouchEvent
Conflicts:
cocos/ui/UIWidget.cpp
|
2014-06-25 11:10:51 +08:00 |
Huabing.Xu
|
c1b5984ce8
|
using stable sort for quads
|
2014-06-25 11:08:47 +08:00 |
Huabing.Xu
|
1919ebc61f
|
add fast tmx files to Xcode project file
|
2014-06-25 11:08:28 +08:00 |
andyque
|
693ec0be29
|
fix listView Item move respond to click event
|
2014-06-25 10:50:18 +08:00 |
andyque
|
65e4c6f4d5
|
fix listView item click move
|
2014-06-25 10:45:08 +08:00 |
yangxiao
|
db60512c4b
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-25 10:24:28 +08:00 |
lvlong
|
984e9079a7
|
modify bundle3d
|
2014-06-25 10:13:11 +08:00 |
Huabing.Xu
|
290897af14
|
Merge branch 'v3' into fast_tmx
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-25 10:10:08 +08:00 |
Huabing.Xu
|
bda9708206
|
clean up Fast TMX code2
|
2014-06-25 10:06:37 +08:00 |
Huabing.Xu
|
67f83f43b0
|
clean up Fast TMX code
|
2014-06-25 10:04:20 +08:00 |
samuele3hu
|
617e2bc592
|
Add a newline
|
2014-06-25 09:36:34 +08:00 |
samuele3hu
|
ea99c08d0e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_binary
|
2014-06-25 09:31:57 +08:00 |
samuele3hu
|
300821e61f
|
Add UI Editor test case for Lua
|
2014-06-25 09:29:06 +08:00 |
lvlong
|
ab910dfe19
|
reader test
|
2014-06-25 09:13:24 +08:00 |
yangxiao
|
2e4c801b2f
|
load originpose
|
2014-06-24 23:33:30 +08:00 |
minggo
|
4ce61b94b9
|
Merge pull request #7191 from CocosRobot/update_lua_bindings_1403606774
[AUTO]: updating luabinding automatically
|
2014-06-24 20:15:29 +08:00 |
yangxiao
|
697f0d4796
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-24 19:46:22 +08:00 |
yangxiao
|
617ec1dcf9
|
support vao
|
2014-06-24 19:45:51 +08:00 |
CocosRobot
|
2cd212b1b0
|
[AUTO]: updating luabinding automatically
|
2014-06-24 10:48:02 +00:00 |
minggo
|
63d0f66553
|
Merge pull request #7189 from andyque/feature5161
replace size with contentSize
|
2014-06-24 18:43:33 +08:00 |
minggo
|
75245cb99e
|
Merge pull request #7190 from minggo/perf-improve
use reference instead
|
2014-06-24 18:25:53 +08:00 |
minggo
|
7155eb4ebb
|
use reference instead
|
2014-06-24 18:23:10 +08:00 |
andyque
|
547ad379ae
|
closed #5589
|
2014-06-24 15:51:14 +08:00 |