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

23970 Commits

Author SHA1 Message Date
minggo 38fdef614a Merge pull request #7797 from andyque/addOptionsForWidgetEventHandling 
add swallow touch and propagation to parent widgets customization
 2014-08-18 23:16:22 +08:00
minggo 02593a0efe Merge pull request #7812 from CocosRobot/update_cocosfiles_1408373738 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 22:57:33 +08:00
minggo 36113c65ac [ci skip] 2014-08-18 22:56:47 +08:00
CocosRobot 218cee5e05 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:55:40 +00:00
minggo fae0ba41ec Merge pull request #7811 from CocosRobot/update_lua_bindings_1408373119 
[AUTO]: updating luabinding automatically
 2014-08-18 22:50:13 +08:00
minggo ea5c07fba4 Merge pull request #7810 from CocosRobot/update_cocosfiles_1408373019 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 22:48:27 +08:00
CocosRobot 85d505b427 [AUTO]: updating luabinding automatically 2014-08-18 14:47:35 +00:00
CocosRobot 94b45d55ef [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-18 14:43:41 +00:00
minggo 22fa650bbf Merge pull request #7807 from samuele3hu/v3_3_3d_module 
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
 2014-08-18 22:38:58 +08:00
XiaoYang 638e8e7f5a Merge pull request #103 from lvlonggame/merge-bundle 
Merge bundle
 2014-08-18 20:30:17 +08:00
lvlong 43bc54b134 delete empty line 2014-08-18 20:28:59 +08:00
lvlong 2b70cf3dd8 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-18 20:22:56 +08:00
lvlong 9c25139895 animation & animations 2014-08-18 20:22:18 +08:00
samuele3hu f36e7c6617 Add register_cocos3d_module for lua template 2014-08-18 19:46:11 +08:00
samuele3hu 22a48fb760 Update cpp and lua template to support cocos3d lib 2014-08-18 19:23:03 +08:00
yangxiao d5df1f3ab2 forget return true 2014-08-18 18:56:01 +08:00
yangxiao d6ed1af1f7 compute submesh aabb error 2014-08-18 18:34:18 +08:00
minggo 2f2ee43b21 Merge pull request #7808 from 2youyouo2/v3 
fixed ArmatureAnimation::setSpeedScale
 2014-08-18 18:19:23 +08:00
lvlong da26fa3ca5 Merge branch 'v3' of https://github.com/super626/cocos2d-x into merge-bundle 2014-08-18 18:04:44 +08:00
lvlong 7311d5139b add VERTEX_ATTRIB_TEX_COORD1 2014-08-18 18:02:58 +08:00
yangxiao 3fd122391c reset sprite3dtest 2014-08-18 18:01:57 +08:00
yangxiao b9c28dd8d7 return true 2014-08-18 17:57:14 +08:00
yangxiao 2f600f8af4 fix bundle mac 2014-08-18 17:52:27 +08:00
XiaoYang 62cc890abe Merge pull request #102 from liuliang2004/Meshv3 
Modified binary load model, compatible with the old format
 2014-08-18 17:39:48 +08:00
liuliang ee4e4ca455 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 
Conflicts:
	cocos/3d/CCBundle3D.cpp
 2014-08-18 17:39:28 +08:00
liuliang e151b207a4 Modified binary load model, compatible with the old format 2014-08-18 17:31:04 +08:00
yangxiao 01c1691a4f deal aabb 2014-08-18 17:02:13 +08:00
minggo e2829cd68a Merge pull request #7802 from SmartCat/v3 
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32
 2014-08-18 16:56:15 +08:00
kaile.yin 6abaf27b14 fixed ArmatureAnimation::setSpeedScale 2014-08-18 16:19:54 +08:00
samuele3hu 91fd40dd3a Add a newline for some files 2014-08-18 15:27:54 +08:00
samuele3hu cb3f20ed47 Remove lib search paths for libcocos3d 2014-08-18 15:16:57 +08:00
samuele3hu 2d8ae3a917 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_3d_module 2014-08-18 15:08:04 +08:00
samuele3hu e0168c373c Add manual lua bindings for 3d and adjust related test case on different platform 2014-08-18 15:04:32 +08:00
samuele3hu e3149ce41a Split lua bindings for 3D from cocos2d 2014-08-18 15:00:40 +08:00
samuele3hu 7596a8a831 Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-18 14:58:57 +08:00
yangxiao 30ce92f677 obj work, make code clean 2014-08-18 14:16:34 +08:00
yangxiao 219404bd7d change tex param 2014-08-18 11:42:41 +08:00
yangxiao cd4da73beb merge, obj not work now 2014-08-18 11:28:57 +08:00
yangxiao 79a55286ce refactor to new model 2014-08-18 11:13:08 +08:00
minggo eb408591d7 Merge pull request #7799 from CocosRobot/update_cocosfiles_1408088163 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-18 11:08:56 +08:00
minggo 7f43c212c9 Merge pull request #7801 from CocosRobot/update_lua_bindings_1408088565 
[AUTO]: updating luabinding automatically
 2014-08-18 11:08:23 +08:00
XiaoYang 619af3efbc Merge pull request #101 from liuliang2004/Meshv3 
Modified load static model
 2014-08-18 10:32:41 +08:00
liuliang 2f816aea2c Modified load static model 2014-08-18 10:32:23 +08:00
samuele3hu 6259aebdab Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project 2014-08-17 23:45:56 +08:00
yangxiao 1e961e00b7 obj loader work 2014-08-17 22:49:53 +08:00
XiaoYang 05b13b8c38 Merge pull request #100 from lvlonggame/merge-bundle 
draw sub mesh bug
 2014-08-16 23:48:47 +08:00
samuele3hu 85ef11ae56 Split cocos3d from cocos2d on the iOS/Mac platform and adjust the related iOS/Mac test project 2014-08-16 21:51:39 +08:00
lvlong da63032a46 draw sub mesh bug 2014-08-16 20:38:00 +08:00
XiaoYang 58aa6eee3f Merge pull request #99 from lvlonggame/merge-bundle 
Merge bundle
 2014-08-16 19:53:46 +08:00
lvlong b1c9fb99e3 animation is ok. 2014-08-16 19:51:59 +08:00