minggo
|
c1e56e62c1
|
fix compiling error
|
2014-06-30 15:51:35 +08:00 |
CocosRobot
|
d92ee7ad0a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-30 07:35:27 +00:00 |
minggo
|
467bba136a
|
Merge pull request #7227 from Dhilan007/v3-gc0627
Don't merge--issue #4689:Game controller support
|
2014-06-30 15:33:54 +08:00 |
Dhilan007
|
6ed0ac8762
|
remove unnecessary file
|
2014-06-30 14:14:43 +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 |
minggo
|
a2d220ced8
|
Merge pull request #7246 from pandamicro/origin_v3
Fix Travis CI compilation issue
|
2014-06-30 13:40:45 +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
|
41379fb551
|
[ci skip]
|
2014-06-30 11:35:03 +08:00 |
minggo
|
dc1018e7e2
|
Merge pull request #7244 from 2youyouo2/v3
update armature
|
2014-06-30 11:33:46 +08:00 |
Huabing.Xu
|
98d3e22777
|
re add commented test case back
|
2014-06-30 11:23:41 +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 |
minggo
|
c85c6928b4
|
[ci skip]
|
2014-06-30 11:09:00 +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 |
minggo
|
707f5c2c93
|
[ci skip]
|
2014-06-30 11:08:13 +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
|
0afe015259
|
Merge pull request #7241 from CocosRobot/update_cocosfiles_1404092525
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-30 09:57:39 +08:00 |
minggo
|
26db31ebc6
|
[ci skip]
|
2014-06-30 09:44:50 +08:00 |
CocosRobot
|
f06061dfec
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-30 01:42:06 +00:00 |
minggo
|
496de72d6e
|
[ci skip]
|
2014-06-30 09:39:38 +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 |
minggo
|
4639ad1006
|
Merge pull request #7240 from CocosRobot/update_lua_bindings_1404033989
[AUTO]: updating luabinding automatically
|
2014-06-30 09:35:42 +08:00 |
Dhilan007
|
a63216d97b
|
issue #4895:Add test case
|
2014-06-30 03:25:49 +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
|
bde1887b28
|
issue #4892:Implement logical codes of game controller
|
2014-06-30 00:30:46 +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 |
minggo
|
a4253bd45b
|
Merge pull request #7238 from CocosRobot/update_cocosfiles_1404031359
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-29 16:47:52 +08:00 |
minggo
|
e8a7563cb1
|
Merge pull request #7239 from CocosRobot/update_lua_bindings_1404031428
[AUTO]: updating luabinding automatically
|
2014-06-29 16:47:34 +08:00 |
CocosRobot
|
afe11ca435
|
[AUTO]: updating luabinding automatically
|
2014-06-29 08:45:14 +00:00 |
CocosRobot
|
c52fe48484
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-29 08:42:40 +00:00 |
minggo
|
7f28e81d09
|
Merge pull request #7226 from super626/v3
Animation3D
|
2014-06-29 16:41:13 +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 |
minggo
|
fcde912273
|
[ci skip]
|
2014-06-27 18:09:57 +08:00 |
minggo
|
7f3749dba5
|
Merge pull request #7235 from samuele3hu/v3_bu_fix
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
|
2014-06-27 18:07:49 +08:00 |
yangxiao
|
f38f0b00aa
|
fix templates
|
2014-06-27 18:01:39 +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 |