andyque
9a77ea9d57
add nested layout
2014-07-07 15:48:50 +08:00
andyque
6f33e4b84f
add UIPageView button tests
2014-07-07 15:31:06 +08:00
andyque
037a7dc882
fix TextReader TTF font Reader issue
2014-07-07 15:22:14 +08:00
andyque
0483c64286
fix widget ignoreContentSize issue
2014-07-07 15:21:14 +08:00
Dhilan007
ddfe82ae08
Replace log with CCLOG
2014-07-07 15:04:29 +08:00
Dhilan007
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
minggo
fb580539fa
Merge pull request #7325 from natural-law/v3
...
Update the reference of submodule cocos2d-console.
2014-07-07 10:35:28 +08:00
zhangbin
ac4a8b1960
Update the reference of submodule cocos2d-console.
2014-07-07 10:11:46 +08:00
lvlong
0a9e96bfdf
modify Bundle3D::parseGLType add other type
2014-07-07 09:16:08 +08:00
minggo
2d504dcc9b
Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig
...
Remove redundant comment in ccConfig.h
2014-07-06 21:09:39 +08:00
minggo
7df668a675
Merge pull request #7323 from CocosRobot/update_lua_bindings_1404651855
...
[AUTO]: updating luabinding automatically
2014-07-06 21:08:39 +08:00
CocosRobot
4c1da7d89a
[AUTO]: updating luabinding automatically
2014-07-06 13:05:59 +00:00
minggo
b214ea9a34
Merge pull request #7322 from minggo/update-release-note
...
Update release note
2014-07-06 21:01:17 +08:00
minggo
4d8ea7ca2d
Update RELEASE_NOTES.md
2014-07-06 20:59:34 +08:00
minggo
f52a9bfa8e
update release note
2014-07-06 20:53:17 +08:00
minggo
5ff83d1a2b
Merge pull request #7309 from mannewalis/v3
...
changes needed for swift bindings to work
2014-07-06 17:10:26 +08:00
minggo
982d7441a0
Merge pull request #7310 from boyu0/lua_SceneEditorTest
...
Add SceneEditorTest for lua
2014-07-06 16:01:49 +08:00
mannewalis
f238593bfb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x : (78 commits)
fix ui::Helper::seekWigetByName can not find pages in pageview
[AUTO][ci skip]: updating cocos2dx_files.json
add const for getter. fixed redefinition of 'registerListeners'
Update CCController-android.cpp
fixed missing function
issue #4689 : Refactoring game controller API[ios]
Add resources
version1.2
Remove useless codes
Refactoring game controller API
should not include android cpp files in win/wp project
Remove useless codes
Remove useless codes
Add Lua bindings for utils and CaptureScreen test case
revert Android.mk
issue #4689 : Refactor controller API.
add setXXTEAKeyAndSign
fix indent problems
initialize member variable
fix windows compile and running error
...
2014-07-05 12:26:44 -07:00
yangxiao
c7ad436d8a
Merge branch 'newcode' into v3
2014-07-05 13:57:51 +08:00
minggo
9d6c5748dc
Merge pull request #7320 from andyque/fixSeekFile
...
fix ui::Helper::seekWigetByName can not find pages in pageview
2014-07-05 13:44:35 +08:00
andyque
841efea783
fix ui::Helper::seekWigetByName can not find pages in pageview
2014-07-05 12:53:56 +08:00
minggo
9c747adbb5
Merge pull request #7319 from CocosRobot/update_cocosfiles_1404493623
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-05 01:11:18 +08:00
CocosRobot
142ac9a413
[AUTO][ci skip]: updating cocos2dx_files.json
2014-07-04 17:07:04 +00:00
minggo
9db0f36c33
Merge pull request #7313 from Dhilan007/v3-gc-refactor
...
issue #4689 : Refactoring game controller API.
2014-07-05 01:05:48 +08:00
Dhilan007
2b3de76819
add const for getter.
...
fixed redefinition of 'registerListeners'
2014-07-04 23:07:48 +08:00
Dhilan007
e6c4bb454b
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass
2014-07-04 22:53:33 +08:00
LinWenhai
46435952f8
Update CCController-android.cpp
2014-07-04 21:31:10 +08:00
Dhilan007
eee26b5029
fixed missing function
2014-07-04 21:29:30 +08:00
LinWenhai
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
minggo
a942aae84f
Merge pull request #7316 from cocoscodeide/v3
...
lua runtime template 1.2
2014-07-04 18:33:36 +08:00
minggo
b710dc590b
Merge pull request #7315 from samuele3hu/v3_animation3D
...
Add Lua bindings for utils and CaptureScreen test case
2014-07-04 17:58:18 +08:00
LinWenhai
27bc3dc640
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
2014-07-04 17:56:22 +08:00
Dhilan007
c73a88c4a5
Add resources
2014-07-04 17:55:20 +08:00
cocoscodeide
32b8e02370
Merge pull request #46 from chuanweizhang2013/v3luaruntime
...
runtime/config.json zip_file_size
2014-07-04 17:36:22 +08:00
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
yangxiao
4304d740b4
delete call back
2014-07-04 17:22:39 +08:00
samuele3hu
b68ee428b0
Remove useless codes
2014-07-04 17:15:34 +08:00
LinWenhai
3fb02acbde
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
2014-07-04 17:03:48 +08:00
Dhilan007
6d48cd9523
Refactoring game controller API
2014-07-04 17:01:41 +08:00
minggo
83b7dccdfc
Merge pull request #7314 from joshuastray/fix_win_proj
...
should not include android cpp files in win/wp project
2014-07-04 16:51:27 +08:00
joshuastray
8ab8caf751
should not include android cpp files in win/wp project
2014-07-04 16:44:10 +08:00
samuele3hu
4725388646
Remove useless codes
2014-07-04 16:43:33 +08:00
yangxiao
e2a49ca9c4
Merge branch 'newcode' into v3
2014-07-04 16:36:38 +08:00
samuele3hu
3b23b0c1ff
Remove useless codes
2014-07-04 16:30:22 +08:00
samuele3hu
d9ffa33601
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
2014-07-04 16:25:53 +08:00
samuele3hu
85dd2e55bf
Add Lua bindings for utils and CaptureScreen test case
2014-07-04 16:24:00 +08:00
yangxiao
0af286c3be
fix android background to foreground
2014-07-04 16:10:43 +08:00
cocoscodeide
265ed74649
Merge pull request #45 from chuanweizhang2013/v3luaruntime
...
V3luaruntime
2014-07-04 15:55:41 +08:00
chuanweizhang2013
39b03de8a9
revert Android.mk
2014-07-04 15:39:07 +08:00