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 |
andyque
|
4d82673760
|
issue #5161, replace _size with _contentSize
|
2014-06-24 15:08:58 +08:00 |
pandamicro
|
9d450d6513
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
|
2014-06-24 14:57:12 +08:00 |
XiaoYang
|
b9c523f66b
|
Merge pull request #41 from lvlonggame/v3
recommit for tony!!
|
2014-06-24 14:54:53 +08:00 |
minggo
|
742421766d
|
Merge pull request #7187 from minggo/performance-improve
use reference instead
|
2014-06-24 14:53:56 +08:00 |
minggo
|
3336f7edad
|
use reference instead
|
2014-06-24 14:53:02 +08:00 |
pandamicro
|
415f97b00f
|
Refactor #5580: Add test case for FileUtils' file and directory manipulations
|
2014-06-24 14:51:35 +08:00 |
pandamicro
|
d5bed908d3
|
Refactor #5580: Fix some issues
|
2014-06-24 14:51:01 +08:00 |
lvlong
|
dc0101737c
|
test for tony
|
2014-06-24 14:43:20 +08:00 |
lvlong
|
431378a41e
|
commit for tony test
|
2014-06-24 14:10:03 +08:00 |
lvlong
|
2de28eea89
|
for tony
|
2014-06-24 13:40:04 +08:00 |
samuele3hu
|
6319a3d646
|
Update bindings-generator submodule
|
2014-06-24 11:09:36 +08:00 |
samuele3hu
|
03a4e014e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-24 11:04:38 +08:00 |
Huabing.Xu
|
740372ceb3
|
new version of rendering for tile map
|
2014-06-24 11:04:17 +08:00 |
minggo
|
aa7e48794b
|
[ci skip]
|
2014-06-24 10:50:09 +08:00 |
minggo
|
76e2540fd7
|
Merge pull request #7163 from darkdukey/fixNodeReader
Fix NodeReader crash
|
2014-06-24 10:49:10 +08:00 |
minggo
|
8f0d23df60
|
Merge pull request #7185 from CocosRobot/update_cocosfiles_1403578075
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 10:48:41 +08:00 |
CocosRobot
|
7f104f4bf7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 02:47:56 +00:00 |
minggo
|
d9c99e6251
|
[ci skip]
|
2014-06-24 10:47:50 +08:00 |
minggo
|
4bb6545250
|
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
closed #5541: Add rotation action support for physics.
|
2014-06-24 10:46:10 +08:00 |
minggo
|
375f01b6cc
|
Merge pull request #7183 from CocosRobot/update_lua_bindings_1403577263
[AUTO]: updating luabinding automatically
|
2014-06-24 10:43:03 +08:00 |
minggo
|
ad64cf7e94
|
Merge pull request #7176 from CocosRobot/update_cocosfiles_1403520184
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 10:42:51 +08:00 |
CocosRobot
|
879862b993
|
[AUTO]: updating luabinding automatically
|
2014-06-24 02:35:55 +00:00 |
boyu0
|
f2ecb31958
|
closed #5541: add more warning for unsupported functions.
|
2014-06-24 10:33:21 +08:00 |
minggo
|
66763bd400
|
Merge pull request #7180 from MSOpenTech/wp8-v3
WP8 v3 broken build fix
|
2014-06-24 10:31:56 +08:00 |
minggo
|
9c130e7aa2
|
Merge pull request #7181 from CocosRobot/update_cocosfiles_1403577062
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-24 10:31:39 +08:00 |