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
Frank.Xu
5db9fa6e4b
Add getChildByName method for get a node that can be cast to Type T
2014-07-08 15:58:34 +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
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
chuanweizhang2013
39b03de8a9
revert Android.mk
2014-07-04 15:39:07 +08:00
LinWenhai
992245e744
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
2014-07-04 15:29:40 +08:00
Dhilan007
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
minggo
8b00e72f33
Merge pull request #7311 from andyque/fixWindowsError
...
fix windows compile and running error
2014-07-04 13:44:55 +08:00
chuanweizhang2013
e32eadc364
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-04 13:36:51 +08:00
andyque
c8165bb2d9
fix indent problems
2014-07-04 11:53:06 +08:00
andyque
a429182765
fix windows compile and running error
2014-07-04 11:22:36 +08:00
yangxiao
d2cd2449d8
adjust code
2014-07-04 10:42:02 +08:00
minggo
95fe74a34b
Merge pull request #7299 from dabingnn/fast_tmx
...
Fast tmx
2014-07-04 09:49:30 +08:00
yangxiao
05d20d59d4
change position attributes to vec3
2014-07-04 09:25:06 +08:00
mannewalis
4b1f2ccc91
prefixing ivars
2014-07-03 10:16:10 -07:00
mannewalis
96605f801c
prefixing ivars
2014-07-03 10:13:46 -07:00
mannewalis
69341095fe
adding accessors to the on*Callback variables
2014-07-03 09:13:52 -07:00
mannewalis
92e08265cd
changes needed for swift bindings to work
2014-07-03 08:42:06 -07: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
minggo
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
andyque
32724e559d
fix container default color issue
2014-07-03 14:38:45 +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
2cfea323b0
Merge pull request #7300 from 2youyouo2/v3
...
fixed add relative data bug
2014-07-03 13:56:04 +08:00
minggo
6cc600ccce
fix compiling warnings
2014-07-03 11:43:56 +08:00
chuanweizhang2013
b88b5e4c3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-03 11:13:59 +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
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
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
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
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
andyque
6e64714331
fix scroll
2014-07-02 11:48:28 +08:00
yangxiao
91cb18389c
Merge branch 'newcode' into v3
2014-07-02 10:55:38 +08:00
zhangcheng
cf9b049926
1. fixes same name warning.
2014-07-02 10:53:35 +08:00
tangnan
dd81e009f8
could add seach path and resolution order path in front.
2014-07-02 10:29:09 +08:00
CocosRobot
2821a23640
[AUTO]: updating luabinding automatically
2014-07-02 02:15:26 +00:00
minggo
5b282e338f
Merge pull request #7279 from andyque/fixTextReader
...
fix Text reader font name
2014-07-02 10:04:00 +08:00
andyque
fb3e499d9d
fix Text reader font name
2014-07-02 10:08:04 +08:00
minggo
d9a1f76755
fix effect of spine
2014-07-02 09:58:07 +08:00
Nite Luo
4cb59683e4
Add Sprite3DRotation test
2014-07-01 12:36:53 -07:00
Nite Luo
a81bea886e
Rotate around anchor point
2014-07-01 10:26:47 -07:00
minggo
aff1e3e1d2
fix compiling error
2014-07-01 22:26:15 +08:00
andyque
7d2685ba02
fix content Size
2014-07-01 21:02:37 +08:00
geron-cn
17c320f1e2
fix
2014-07-01 19:06:51 +08:00
geron-cn
c561f4e2f4
fix win can not compile
2014-07-01 18:55:09 +08:00
Dhilan007
0fbcbec9de
Add missing file for game controller support.
...
Fix using incorrect library project.
2014-07-01 16:44:10 +08:00
zhangcheng
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +08:00
zhangcheng
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +08:00
minggo
05ca61d62b
Merge pull request #7269 from minggo/fix-crash
...
Fix crash
2014-07-01 16:30:50 +08:00
geron-cn
dfdc4f6b66
fix bug: did not addarmature to the relativedata
2014-07-01 16:24:59 +08:00
minggo
6654bf1129
Merge pull request #7265 from visiblelight/beta_test
...
Fix the crash when capturing screen on WP8
2014-07-01 16:19:45 +08:00
minggo
cc3a9d0737
fix crash caused by std::regex()
2014-07-01 16:09:25 +08:00
minggo
e15d563219
Merge pull request #7247 from andyque/fixFocus
...
fix focus functions
2014-07-01 16:02:23 +08:00
minggo
d130bf84e5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash
2014-07-01 15:59:43 +08:00
minggo
daa5e257df
Merge pull request #7259 from Dhilan007/v3-gc0627
...
issue #4895:split controller adapter[android]
2014-07-01 15:51:21 +08:00
pandamicro
81df54b82e
Fixed #5635 : Correction of mouse event's cursor position
2014-07-01 15:14:41 +08:00
Dhilan007
66673d88fa
split controller adapter[android]
2014-07-01 15:08:51 +08:00
Dhilan007
abeeb9a0c7
fixing incorrect optimization
2014-07-01 14:57:10 +08:00
Dhilan007
584e90c097
Rotate the frame buffer for WP8 during the snapshot
2014-07-01 14:48:43 +08:00
田矢 慎太朗
39040540fc
Remove redundant comment in ccConfig.h
2014-07-01 15:12:29 +09:00
andyque
fefdc70af9
add default value to widget reader
2014-07-01 14:01:27 +08:00
minggo
80204e3048
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
...
Cleanup binary loader add scene binary parse
2014-07-01 13:47:35 +08:00
pandamicro
abfbc4bffb
Fixed #5632 : Indicate the correct button in mouse move event
2014-07-01 13:01:04 +08:00
lvlong
ff908d771a
add a space to test pushing
2014-07-01 11:26:29 +08:00
lvlong
e44dee6607
merge
2014-07-01 11:08:37 +08:00
lvlong
e3cc234cfb
Revert "modify BundleReader and the version read"
...
This reverts commit 660c80fac7
.
2014-07-01 11:05:48 +08:00
andyque
b9a968680f
add default value to widgets reader
2014-07-01 10:57:12 +08:00
lvlong
660c80fac7
modify BundleReader and the version read
2014-07-01 10:45:01 +08:00
andyque
4e63a3da7d
modify nodeReader to support LabelAtlas and LabelBMFont
2014-07-01 10:11:36 +08:00
minggo
eb6ddea26e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash
2014-07-01 10:01:24 +08:00
samuele3hu
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
lvlong
c1afd7133a
modify BundleReader and the version read
2014-07-01 09:30:14 +08:00
lvlong
df7ab50062
modify BundleReader and the version read
2014-07-01 09:26:21 +08:00
minggo
00695eed49
Merge pull request #7261 from boyu0/fix_pvr_bgra8888_crash
...
fix crash when load pvr bgra8888 image on android.
2014-06-30 21:39:20 +08:00
minggo
3f4cbffa43
Merge pull request #7260 from visiblelight/beta_test
...
fix that FastTileMapTest crashes on WP8
2014-06-30 21:21:08 +08:00
Dhilan007
3eea298428
unbind the VAO anyway to for safety.
2014-06-30 21:08:43 +08:00
boyu0
6db8ec8aad
fix crash when load pvr bgra8888 image in android.
2014-06-30 20:58:26 +08:00
Dhilan007
79264daf1e
fix the crash on WP8 for FastTileMapTest
2014-06-30 20:56:59 +08:00
minggo
9bcc66912a
fix crash cause by std::regex
2014-06-30 20:45:01 +08:00
Dhilan007
83f4e536c5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
...
Conflicts:
tests/game-controller-test/proj.android/project.properties
2014-06-30 19:27:01 +08:00
Dhilan007
afac6b86ff
move controller support to 'libcontrollerdeleate' project.
2014-06-30 18:41:47 +08:00
minggo
d7cbc2872e
Merge pull request #7250 from minggo/fix-compiling
...
fix compiling error
2014-06-30 18:06:54 +08:00
chuanweizhang2013
4481149a30
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-30 17:53:46 +08:00
minggo
a01b305b64
Merge pull request #7257 from CocosRobot/update_lua_bindings_1404121406
...
[AUTO]: updating luabinding automatically
2014-06-30 17:47:52 +08:00
CocosRobot
774c851dcb
[AUTO]: updating luabinding automatically
2014-06-30 09:45:03 +00:00
minggo
f39fa108bb
Merge pull request #7242 from joshuastray/scrollview_fix
...
fix scrollview crashes on win32 because of variable returned without ini...
2014-06-30 17:43:26 +08:00
minggo
36e864552e
Merge pull request #7253 from super626/v3
...
c3b loader bug
2014-06-30 17:33:13 +08:00
minggo
40e88ab6eb
Merge pull request #7251 from 2youyouo2/v3_current_frame_index
...
add gotoFrameAndPlay and setCurrentFrame interface
2014-06-30 17:32:24 +08:00
minggo
f85d84f2ef
Merge pull request #7252 from visiblelight/beta_test
...
Fixing compile errors on WP8
2014-06-30 17:24:08 +08:00
minggo
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
zhangcheng
a3fcddde39
1. NULL->nullptr.
...
2. bRet->ret.
2014-06-30 17:15:55 +08:00
lvlong
701a2b60c2
sub-version > 0
2014-06-30 17:14:47 +08:00
lvlong
42aaf38468
modify reader-64bit bug
2014-06-30 17:10:07 +08:00
Dhilan007
26f3445311
add missing files for the projects
2014-06-30 17:07:55 +08:00
2youyou2
b76127231c
add gotoFrameAndPlay and setCurrentFrame interface
2014-06-30 15:53:12 +08:00
andyque
60ea37cabc
fix focus functions
2014-06-30 14:09:27 +08:00
Dhilan007
2a9e10be2c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
2014-06-30 13:41:55 +08:00
Dhilan007
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
pandamicro
bee41712ad
Fix Travis CI compilation issue
2014-06-30 11:58:15 +08:00
minggo
dc1018e7e2
Merge pull request #7244 from 2youyouo2/v3
...
update armature
2014-06-30 11:33:46 +08:00
minggo
dfe69cdfd8
Merge pull request #7243 from dabingnn/fast_tmx
...
fix bug for tileset searching
2014-06-30 11:14:23 +08:00
Huabing.Xu
d506cf613a
fix bug for tileset searching
2014-06-30 11:08:57 +08:00
2youyou2
30a13c05c9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-30 11:08:22 +08:00
joshuastray
99b127ba5d
fix scrollview crashes on win32 because of variable returned without initialization
2014-06-30 10:19:00 +08:00
2youyou2
aba7421ef6
fixed crashed when remove armature in frame event.
2014-06-30 10:14:31 +08:00
2youyou2
1a9e42ef85
fixed armature blend func has no effect
2014-06-30 10:11:43 +08:00
minggo
ef44e96ff3
Merge pull request #7211 from dabingnn/fast_tmx
...
Fast tmx (added culling for Tile Map)
2014-06-30 09:36:05 +08:00
Dhilan007
74579f19f5
issue #4895:Get events from controller to engine[android]
2014-06-30 03:23:51 +08:00
Dhilan007
5ed581758e
issue #4895:Get events from controller to engine[android]
2014-06-30 03:20:22 +08:00
Dhilan007
3c614d5670
issue #4895:Get events from controller to engine[ios]
2014-06-30 00:31:45 +08:00
Dhilan007
7cd7b9e054
issue #4892:Implement logical codes of game controller
2014-06-30 00:28:21 +08:00
Huabing.Xu
c50394c4f3
fix merge conflitcts on windows
2014-06-29 20:30:26 +08:00
Huabing.Xu
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
CocosRobot
bb9df773a9
[AUTO]: updating luabinding automatically
2014-06-29 09:28:33 +00:00
minggo
4f79176da2
Merge pull request #7234 from boyu0/iss5614_physics_transform
...
closed #5614 : add transform support for physics
2014-06-29 17:23:20 +08:00
CocosRobot
afe11ca435
[AUTO]: updating luabinding automatically
2014-06-29 08:45:14 +00:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
chuanweizhang2013
a8f4dcb59f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-28 18:10:17 +08:00
yangxiao
58e9fcc741
remove unused code
2014-06-27 22:11:29 +08:00
Huabing.Xu
9227c4f30a
refactor updateTiles
2014-06-27 19:41:34 +08:00
Huabing.Xu
46e5b8e5bd
refactor FastTMXTiledMap::tilesetForLayer to a more elegant implementation
2014-06-27 18:28:59 +08:00
samuele3hu
67423e0dd2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bu_fix
2014-06-27 18:00:34 +08:00
Huabing.Xu
3771654e66
remove deprecated function
...
rename enum to static const member of class
remove hex tile map(we do not support it yet)
2014-06-27 18:00:06 +08:00
samuele3hu
318e39a6d2
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
2014-06-27 17:58:59 +08:00
boyu0
91126341bd
fix transform for physics.
2014-06-27 17:30:21 +08:00
yangxiao
fd41f33165
unused code
2014-06-27 17:21:39 +08:00
Huabing.Xu
33a8b6563f
windows works for fast tmx
2014-06-27 16:56:26 +08:00