Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,321 Commits 2 Branches 33 Tags 1.1 GiB
Commit Graph

4555 Commits

Author SHA1 Message Date
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
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
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
minggo 5c0a1b2248 Merge pull request #7232 from CocosRobot/update_lua_bindings_1403857751 
[AUTO]: updating luabinding automatically
 2014-06-27 16:41:16 +08:00
minggo 26292b3e63 Merge pull request #7231 from andyque/fixUIMargin 
fix ui Margin
 2014-06-27 16:37:24 +08:00
yangxiao 2a6ce26335 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-27 16:36:36 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
CocosRobot 9393777c22 [AUTO]: updating luabinding automatically 2014-06-27 08:31:17 +00:00
minggo af0b8e5195 Merge pull request #7065 from Teivaz/v3 
Custom uniform search optimization
 2014-06-27 16:26:07 +08:00
Huabing.Xu 9126819941 linux work now for bundleReader 2014-06-27 01:22:41 -07:00
andyque 94e311bebb fix platform compile error 2014-06-27 16:11:35 +08:00