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

21884 Commits

Author SHA1 Message Date
minggo 4c6d32c958 Merge pull request #7255 from CocosRobot/update_cocosfiles_1404120374 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-30 17:26:58 +08:00
CocosRobot 6eb0d3cc86 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-30 09:26:15 +00:00
minggo 100968e4e5 Merge pull request #7254 from dabingnn/v3_fix 
fix outline bug
 2014-06-30 17:26:11 +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
Huabing.Xu 395e61f977 fix outline bug 2014-06-30 17:21:04 +08:00
minggo 3b13855374 fix compiling error on iOS 2014-06-30 17:20:13 +08:00
XiaoYang e51828eb28 Merge pull request #46 from lvlonggame/v3 
reader bug about 64bits.
 2014-06-30 17:17:46 +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
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
samuele3hu 148039fbfb Update bindings-generator submodule 2014-06-29 18:53:35 +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