kaile.yin
42f2302866
fixed call Bone::setRotation has no effect
2014-07-10 17:50:38 +08:00
huangshiwu
2a65b7d98e
change "const static" to "static const"
2014-07-10 16:50:25 +08:00
andyque
f76f71eb5d
fix win32 & win8 compile error
2014-07-10 16:37:15 +08:00
andyque
41ccd5e465
add v1.4 tests
2014-07-10 16:37:15 +08:00
minggo
831b0b332b
Merge pull request #7371 from minggo/enumerateChildren-fix
...
Node::enumerateChildren just searches from itself
2014-07-10 15:46:04 +08:00
minggo
c7856b21fd
Merge pull request #7366 from Dhilan007/v3-fixed-warn
...
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
joshuastray
30574af6c5
move JumoTo's copy constuctor and operator= to private
2014-07-10 14:30:08 +08:00
minggo
0ba3f6c1c9
Merge pull request #7376 from joshuastray/v3
...
use CC_CONSTRUCTOR_ACCESS to replace protected/private
2014-07-10 14:14:08 +08:00
joshuastray
6b22870e27
use CC_CONSTRUCTOR_ACCESS to replace protected
2014-07-10 14:00:23 +08:00
minggo
cdc02aea7c
Merge pull request #7368 from CocosRobot/update_lua_bindings_1404957724
...
[AUTO]: updating luabinding automatically
2014-07-10 13:54:21 +08:00
minggo
316564d58a
Node::enumerateChildren just searches from itself
2014-07-10 11:07:39 +08:00
yangxiao
0b4c6b7f7a
comment
2014-07-10 11:05:48 +08:00
yangxiao
d7b88e86ff
add comment
2014-07-10 10:56:52 +08:00
yangxiao
ef1f6892e1
deprecated Mesh::create use less parameter ones instead
2014-07-10 10:54:37 +08:00
CocosRobot
af460a1530
[AUTO]: updating luabinding automatically
2014-07-10 02:03:40 +00:00
minggo
345fb040e7
Merge pull request #7352 from super626/v3
...
adjust api according feedback
2014-07-10 09:53:27 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
samuele3hu
2bc1cd0486
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
...
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
2014-07-09 22:31:05 +08:00
minggo
7d74be3158
Merge pull request #7356 from 2youyouo2/v3
...
fixed Armature blend func effect
2014-07-09 18:37:15 +08:00
samuele3hu
243fa49c09
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-09 18:08:09 +08:00
samuele3hu
3546c131dd
Add Lua bindings for controller and related test case project
2014-07-09 18:05:02 +08:00
kaile.yin
c53cb42e83
fixed Armature blend func effect
2014-07-09 14:25:51 +08:00
yangxiao
dbea3a4d04
deprecated functions
2014-07-09 14:07:33 +08:00
CocosRobot
ae12030745
[AUTO]: updating luabinding automatically
2014-07-09 05:42:06 +00:00
yangxiao
0c28106b48
init playreverse
2014-07-09 09:59:18 +08:00
yangxiao
7b35f36ba3
Merge branch 'newcode' into v3
2014-07-09 09:56:23 +08:00
yangxiao
90b6841e25
adjust api according feedback
2014-07-09 09:53:15 +08:00
zhangcheng
af0613cf32
1、fixes warning.
2014-07-09 00:09:35 +08:00
minggo
0f7968de89
Merge pull request #7339 from super626/v3
...
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
minggo
f7af8938bd
Merge pull request #7277 from darkdukey/fix_rotation3D
...
Fix setRotation3D
2014-07-08 22:05:27 +08:00
minggo
eba1735d04
Merge pull request #7347 from Dhilan007/v3-memory-leak
...
fixed memory leak cause by singleton.
2014-07-08 21:13:56 +08:00
minggo
c2474ea7c0
Merge pull request #7262 from pandamicro/origin_v3
...
Indicate correct button and cursor position infomation in mouse move event
2014-07-08 21:07:09 +08:00
minggo
36ef5dd3e8
Merge pull request #7346 from CocosRobot/update_lua_bindings_1404813827
...
[AUTO]: updating luabinding automatically
2014-07-08 20:19:22 +08:00
minggo
4f42df3cea
Merge pull request #7336 from andyque/addMoreUITests
...
fix opacity issue when replace Widget textures
2014-07-08 20:15:21 +08:00
Dhilan007
10defddc2e
fixed memory leak cause by singleton.
2014-07-08 18:22:48 +08:00
CocosRobot
5838370b31
[AUTO]: updating luabinding automatically
2014-07-08 10:05:47 +00:00
minggo
2398f6b8f0
Merge pull request #7341 from samuele3hu/v3_3
...
Fix some type conversion error and add manual lua binding for Node::enumerateChildren
2014-07-08 18:00:23 +08:00
yangxiao
ae97d6ebc6
Bone conflict
2014-07-08 15:48:55 +08:00
minggo
5ec2f76a68
Merge pull request #7340 from Dhilan007/v3-opacity-issue
...
fixed opacity issue in SpriteBatchNode.
2014-07-08 15:29:48 +08:00
minggo
0e5e2cbe5e
Merge pull request #7338 from Dhilan007/v3
...
fixed duplicate definition.
2014-07-08 15:29:02 +08:00
samuele3hu
521f805219
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
2014-07-08 14:57:19 +08:00
samuele3hu
f7c8674584
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
2014-07-08 14:25:10 +08:00
samuele3hu
7095298735
Add manual lua binding for Node::enumerateChildren
2014-07-08 14:22:05 +08:00
Dhilan007
e31abe3f54
fixed opacity issue in SpriteBatchNode.
2014-07-08 14:08:53 +08:00
minggo
2d20b282a4
Merge pull request #7334 from dabingnn/v3_rollBackTexture
...
change the logic of texture loading
2014-07-08 13:52:16 +08:00
yangxiao
e9d3bc1b76
remove unused code
2014-07-08 13:36:22 +08:00
Dhilan007
7d924d2b64
fixed duplicate definition.
2014-07-08 12:50:47 +08:00
lvlong
6de3309f90
have two GL_UNSIGNED_INT delete one
2014-07-08 20:13:57 +08:00
samuele3hu
c59ba7851e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
2014-07-08 12:03:04 +08:00
samuele3hu
a1615123a3
Fix some type conversion error
2014-07-08 12:01:35 +08:00
andyque
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
yangxiao
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
yangxiao
61f4a4d6b3
add 3d file to cocos2d.h
2014-07-08 11:02:29 +08:00
yangxiao
8b482fdfcd
remove gl_fixed
2014-07-08 11:02:00 +08:00
minggo
b0d260d293
Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9
...
Fix UITextField IME can't auto detach
2014-07-08 10:56:16 +08:00
minggo
4ef666ef8b
Merge pull request #7335 from Dhilan007/v3-labelttf-color
...
fixed can's set color for LabelTTF correctly on IOS.
2014-07-08 10:54:40 +08:00
Dhilan007
6e2caf1c78
fixed can's set color for LabelTTF correctly on IOS.
2014-07-08 10:31:14 +08:00
kaile.yin
f01b249880
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-08 10:21:00 +08:00
kaile.yin
d5a79f17ab
fixed set color to parent, it will effect its children
2014-07-08 10:13:15 +08:00
Huabing.Xu
9fb85e303f
change the logic of texture loading
2014-07-08 10:08:02 +08:00
Dale Stammen
021ee7d1e7
check if _itemsPerRow == 0 to avoid divide by zero
2014-07-07 11:17:05 -07:00
Dale Stammen
fa62f4273f
fixed missing zlib.h header path
2014-07-07 10:14:57 -07:00
XiaoYang
b0f5ce36ff
Merge pull request #48 from lvlonggame/v3
...
delete the cube model file and modify 3DBundle
2014-07-07 21:51:10 +08:00
minggo
e1b29a8ef6
Merge pull request #7329 from Dhilan007/v3-gc-refactor
...
issue #4689:Fixed lose disconnected event and incorrect device name/id.
2014-07-07 18:45:23 +08:00
Dhilan007
bbf0fead91
update API annotation.
2014-07-07 18:25:53 +08:00
minggo
38e74e7881
Merge pull request #7328 from dabingnn/v3_rollBackTexture
...
roll back initWithImage logic
2014-07-07 17:50:20 +08:00
Dhilan007
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
Huabing.Xu
d935b5db38
roll back initWithImage logic
2014-07-07 17:35:05 +08:00
minggo
3f262568a2
[ci skip: update version]
2014-07-07 17:24:14 +08:00
lvlong
e315ef527a
parseGLType bug
2014-07-07 17:22:46 +08:00
lvlong
a48d33ce31
Merge branch 'newcode' into v3
2014-07-07 17:06:37 +08:00
minggo
cd77690032
Merge pull request #7326 from Dhilan007/v3-gc-refactor
...
issue #4689 : support external key.
2014-07-07 17:04:27 +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
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
CocosRobot
4c1da7d89a
[AUTO]: updating luabinding automatically
2014-07-06 13:05:59 +00: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
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
yangxiao
4304d740b4
delete call back
2014-07-04 17:22:39 +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