cocoscodeide
|
5af25b280c
|
Merge pull request #44 from chuanweizhang2013/v3luaruntime
update runtime template
|
2014-07-03 18:06:06 +08:00 |
minggo
|
eb97b9ad45
|
Merge pull request #7305 from andyque/fixLayoutReader
fix layout background image default color & opacity
|
2014-07-03 17:16:56 +08:00 |
andyque
|
f82e96daf0
|
fix layout background image default color & opacity
|
2014-07-03 16:56:05 +08:00 |
chuanweizhang2013
|
d8f01215f0
|
Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime
|
2014-07-03 16:30:51 +08:00 |
heliclei
|
3e75a10362
|
merge upstream/v3
|
2014-07-03 16:15:01 +08:00 |
heliclei
|
1f768f80aa
|
update curl test url
|
2014-07-03 16:08:34 +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 |
minggo
|
a2d5244284
|
revert release note
|
2014-07-03 15:19:06 +08:00 |
minggo
|
13ab8cdf03
|
revert release note
|
2014-07-03 15:15:16 +08:00 |
samuele3hu
|
c57fd4aa45
|
Merge branch 'support-regular-expression' of https://github.com/minggo/cocos2d-x into v3_animation3D
|
2014-07-03 15:07:14 +08:00 |
minggo
|
3fd73d70c0
|
Merge pull request #7302 from andyque/fixBinaryOptimization
fix container default color issue
|
2014-07-03 14:56:01 +08:00 |
andyque
|
32724e559d
|
fix container default color issue
|
2014-07-03 14:38:45 +08:00 |
minggo
|
f525500a41
|
[ci skip]
|
2014-07-03 14:20:31 +08:00 |
minggo
|
6e711c0e63
|
Merge pull request #7301 from samuele3hu/v3_animation3D
Update ini files for Lua bindings to support ndk-r9d
|
2014-07-03 14:09:28 +08:00 |
minggo
|
fffdfb3711
|
Merge pull request #7290 from chengstory/v3_OpBinaryParse
V3 op binary parse
|
2014-07-03 14:00:01 +08:00 |
minggo
|
0b8f15dc2e
|
Merge pull request #7298 from heliclei/update-ndk-r9d
[ci skip]update travis ci to use ndk-r9d
|
2014-07-03 13:56:29 +08:00 |
minggo
|
2cfea323b0
|
Merge pull request #7300 from 2youyouo2/v3
fixed add relative data bug
|
2014-07-03 13:56:04 +08:00 |
samuele3hu
|
4aeaa715e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-03 12:44:44 +08:00 |
samuele3hu
|
7b0126cdb7
|
Update ini files for Lua bindings
|
2014-07-03 12:02:48 +08:00 |
minggo
|
6cc600ccce
|
fix compiling warnings
|
2014-07-03 11:43:56 +08:00 |
Huabing.Xu
|
f3863eb072
|
add hex tile map test back
|
2014-07-03 11:31:30 +08:00 |
chuanweizhang2013
|
b88b5e4c3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-03 11:13:59 +08:00 |
heliclei
|
ec92f81446
|
[ci skip]update travis ci to use ndk-r9d
|
2014-07-03 11:02:04 +08:00 |
minggo
|
30c8f42217
|
Merge pull request #7294 from samuele3hu/v3_animation3D
Update Sprite3D test cases for Lua
|
2014-07-02 17:33:20 +08:00 |
Huabing.Xu
|
0214131bb2
|
optimise tile map rendering
|
2014-07-02 17:16:03 +08:00 |
minggo
|
d8c9f6a0a6
|
add regular support in Node::enumerateChildren()
|
2014-07-02 17:07:36 +08:00 |
samuele3hu
|
ff79be2d3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
|
2014-07-02 17:01:14 +08:00 |
samuele3hu
|
320dc4737b
|
Update Sprite3D test cases for Lua
|
2014-07-02 17:00:31 +08:00 |
zhangcheng
|
1551854c30
|
revert submodule res-ccs
|
2014-07-02 17:00:30 +08:00 |
minggo
|
1a089f4a18
|
Merge pull request #7286 from Dhilan007/v3-gc0702
fixed can't get valid value from trigger button.
|
2014-07-02 16:24:24 +08:00 |
minggo
|
8fa1283021
|
Merge pull request #7292 from CocosRobot/update_cocosfiles_1404289312
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-02 16:23:34 +08:00 |
CocosRobot
|
0b0b9ccdf3
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-07-02 08:21:52 +00:00 |
minggo
|
666b0e3a2e
|
Merge pull request #7289 from boyu0/lua_xcode6_support
add lua Xcode6 iphone 5s simulator support.
|
2014-07-02 16:17:33 +08:00 |
minggo
|
c2d39605e3
|
Merge pull request #7288 from Dhilan007/v3-gc-removeAutoAdapter
remove ControllerAutoAdapter project.
|
2014-07-02 16:16:46 +08:00 |
zhangcheng
|
d1db470cf2
|
Merge branch 'macLoader' into v3_OpBinaryParse
|
2014-07-02 16:11:02 +08:00 |
zhangcheng
|
2b1ef55ea9
|
1. fixes scene parse crash.
|
2014-07-02 15:58:42 +08:00 |
zhangcheng
|
9204ac28df
|
1. merge v3
|
2014-07-02 15:37:15 +08:00 |
Dhilan007
|
e1bb1158bc
|
update test case.
|
2014-07-02 15:25:18 +08:00 |
Huabing.Xu
|
efa452e0c4
|
support for fast tmx hex
|
2014-07-02 15:19:11 +08:00 |
Dhilan007
|
097f782c38
|
remove ControllerAutoAdapter project.
|
2014-07-02 15:17:29 +08:00 |
boyu0
|
35ff23fa6d
|
support for Xcode6 iphone 5s simulator
|
2014-07-02 15:16:06 +08:00 |
Dhilan007
|
adfc010555
|
fixed can't get valid value from trigger button[Moga]
|
2014-07-02 15:09:24 +08:00 |
samuele3hu
|
1271c1b62e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
|
2014-07-02 14:29:33 +08:00 |
samuele3hu
|
2aee9ed35d
|
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
|
2014-07-02 14:26:56 +08:00 |
Dhilan007
|
c5dc7b9cd0
|
fixed can't get valid value from trigger button.
|
2014-07-02 14:19:10 +08:00 |
minggo
|
f49e230e97
|
Merge pull request #7284 from chengstory/v3_fixesWarning
1. fixes same name warning.
|
2014-07-02 13:40:07 +08:00 |
minggo
|
c4423d6848
|
Merge pull request #7285 from andyque/fixScrollChildren
fix scroll
|
2014-07-02 11:55:48 +08:00 |
chuanweizhang2013
|
7eec8fbb3a
|
add arm64 bit support
|
2014-07-02 11:55:20 +08:00 |