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

21906 Commits

Author SHA1 Message Date
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
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
chuanweizhang2013 a8f4dcb59f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime 2014-06-28 18:10:17 +08:00
chuanweizhang2013 e57ea32e58 1.2 template 2014-06-28 18:08:40 +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
chuanweizhang2013 1c36170999 Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-27 18:16:21 +08:00
chuanweizhang2013 618682def4 add ios search path 2014-06-27 18:15:39 +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
boyu0 fccc517eef add test for physics transform. 2014-06-27 17:30:50 +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
yangxiao 4685a8654e Animate3D transition 2014-06-27 17:02:08 +08:00
Huabing.Xu 33a8b6563f windows works for fast tmx 2014-06-27 16:56:26 +08:00
minggo a85f522dd1 Merge pull request #7233 from CocosRobot/update_cocosfiles_1403858314 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-27 16:41:33 +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 145ae387c9 [ci skip] 2014-06-27 16:38:41 +08:00
CocosRobot 054f8c5d11 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-27 08:38:35 +00: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