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

14606 Commits

Author SHA1 Message Date
James Chen 4e70156caf Merge pull request #4686 from dumganhar/develop 
Renames: IntValueMap —> ValueMapIntKey
 2013-12-26 06:42:54 -08:00
James Chen 31188710a0 Updates Bindings-generator. 2013-12-26 22:14:48 +08:00
James Chen 17ff6ef764 Renames: IntValueMap —> ValueMapIntKey 2013-12-26 22:07:20 +08:00
James Chen a73991dcc1 Merge pull request #4685 from dumganhar/develop 
Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`.
 2013-12-26 06:03:11 -08:00
James Chen a8d93ddf72 Restricts the element type for Vector<T> and Map<K, V>, it has to be `Object*` or `ObjectSubClass*`. 2013-12-26 21:49:40 +08:00
James Chen fbdcefadfa Merge pull request #4684 from nutty898/develop_nutty_modify_framework_addnewreader 
Develop nutty modify framework addnewreader
 2013-12-26 05:30:22 -08:00
CaiWenzhi 26a7f3474c Modify reader 2013-12-26 21:02:47 +08:00
CaiWenzhi a8ab58d8d8 Merge branch 'develop' into develop_nutty_modify_framework_addnewreader 2013-12-26 20:32:50 +08:00
James Chen 98f0587886 Merge pull request #4683 from dumganhar/linux-fix 
Two fixes for Linux
Generates execute file in cocos root_dir/bin folder for HelloCpp.
long --> ssize_t for TableView callback.
 2013-12-26 04:24:20 -08:00
James Chen 93ed5a4f0f long --> ssize_t for TableView callback. 2013-12-26 04:09:24 -08:00
James Chen 902490c79a Generates execute file in cocos root_dir/bin folder for HelloCpp. 2013-12-26 04:09:03 -08:00
samuele3hu 756a72cbca Reconstruct the operation of handling lua script event 2013-12-26 19:43:49 +08:00
CaiWenzhi ad535e2fcb Add listview and pageview reader 2013-12-26 17:53:22 +08:00
CaiWenzhi f0eb5d28c1 Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 17:32:08 +08:00
James Chen dcde5ec50c Merge pull request #4681 from CocosRobot/updategeneratedsubmodule_1388048641 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-26 01:22:20 -08:00
CocosRobot 50a379b8f0 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 09:04:04 +00:00
CaiWenzhi 3206727b9c Modify actionnode 2013-12-26 17:01:31 +08:00
James Chen 8dfc428599 Merge pull request #4671 from nutty898/develop_nutty_modify_framework_newrender_modify_projectfiles 
Add refresh layout method and uses Range loop for GUI codes
 2013-12-26 00:49:49 -08:00
yinkaile 891d8c3a38 change comment 2013-12-26 16:48:19 +08:00
CaiWenzhi a2e873d12a Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 16:45:48 +08:00
James Chen 9d4a84c40c Merge pull request #4679 from dabingnn/develop_FixTestCase_labelTestNew 
Develop fix test case label test new
 2013-12-26 00:27:59 -08:00
James Chen ef713e11da Merge pull request #4680 from CocosRobot/updategeneratedsubmodule_1388046023 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-26 00:21:00 -08:00
CocosRobot 09996ea82c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-26 08:20:26 +00:00
yinkaile f0d4f3f9bf Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-26 16:19:21 +08:00
CaiWenzhi 7b6e022388 Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 16:19:12 +08:00
CaiWenzhi 067af2fb93 optimize loop 2013-12-26 16:17:52 +08:00
James Chen 517f3991ef Merge pull request #4678 from dumganhar/compile-fix 
Compilation fixes after merge PR #4669
 2013-12-26 00:15:24 -08:00
Huabing.Xu 35fbbdaaf5 Merge branch 'develop' into develop_FixTestCase_labelTestNew 
* develop:
 2013-12-26 16:12:54 +08:00
Huabing.Xu 706d0e185a fix LabelTestNew 2013-12-26 16:11:06 +08:00
James Chen 5dfb7f321a Compilation fixes after merge PR #4669 https://github.com/cocos2d/cocos2d-x/pull/4669 2013-12-26 16:03:30 +08:00
minggo 24b2b7e692 Merge pull request #4677 from dabingnn/develop_FixTestCase_Box2dView 
Develop fix test case box2d view
 2013-12-25 23:59:20 -08:00
Huabing.Xu 984c53a74e Merge branch 'develop' into develop_FixTestCase_Box2dView 
* develop:
 2013-12-26 15:55:32 +08:00
yinkaile 7027587542 fixed armature update 2013-12-26 15:49:20 +08:00
Huabing.Xu 69a490ef08 Fix box2dView 2013-12-26 15:48:26 +08:00
minggo 0ad192e2cc Merge pull request #4676 from dabingnn/develop_FixTestCase_ClippingNodeTest 
Develop fix test case clipping node test
 2013-12-25 23:37:27 -08:00
Huabing.Xu 5faf89c183 change rendering callback from public to protected 2013-12-26 15:34:22 +08:00
Huabing.Xu 04fec6e95b Merge branch 'develop' into develop_FixTestCase_ClippingNodeTest 
* develop:
 2013-12-26 15:32:28 +08:00
Huabing.Xu c28f3fb0e9 fix clippingNodeTest 2013-12-26 15:30:13 +08:00
James Chen beced4897e Merge pull request #4675 from dabingnn/develop_FixTestCase_TilemapTest 
Develop fix test case tilemap test
 2013-12-25 22:58:52 -08:00
CaiWenzhi 4d8e3a423c Merge branch 'develop' into develop_nutty_modify_framework_newrender_modify_projectfiles 2013-12-26 14:58:44 +08:00
yinkaile c096743325 change comment 2013-12-26 14:57:38 +08:00
CaiWenzhi 530f82ee27 Add refresh layout method 2013-12-26 14:57:30 +08:00
Huabing.Xu 3cdc20612b Merge branch 'develop' into develop_FixTestCase_TilemapTest 
* develop:
  Update CHANGELOG [ci skip]
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [GUI] Updates Mac project.
  Remove C cast
  Fixed bugs about color and opacity
  Remove "_renderer" from widget
  Fixed bugs
  Remove CCDictionary from GUIReader
  Add samples
  Remove NodeRGBA inherit
 2013-12-26 14:57:10 +08:00
minggo 03c4b57f5b Merge pull request #4668 from dabingnn/develop_FixTestCase_Texture2dTest 
Develop fix test case texture2d test
 2013-12-25 22:42:20 -08:00
James Chen df690e8f8b Updates bindings config files. 2013-12-26 12:50:37 +08:00
CaiWenzhi 946dab0b34 Modify android mk 2013-12-26 12:23:58 +08:00
CaiWenzhi 7be4d07b7f Fixed build error 2013-12-26 11:56:48 +08:00
CaiWenzhi 8215e90870 Modify build files 2013-12-26 11:44:55 +08:00
CaiWenzhi 30cc579f0c Modify Test CMakeList 2013-12-26 11:36:18 +08:00
CaiWenzhi b1d2aa9b79 Modify CMakeList 2013-12-26 11:25:49 +08:00