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

13327 Commits

Author SHA1 Message Date
boyu0 0710cfa526 issue #2771: delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs 2013-11-18 02:16:20 +08:00
boyu0 02e5d44955 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into iss2771_physical 2013-11-15 16:54:02 +08:00
boyu0 988630c12f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-15 16:38:58 +08:00
boyu0 0cb45e50f1 issue #2771: fix bugs 2013-11-15 16:27:43 +08:00
minggo 425ce40a67 Merge pull request #4274 from Dhilan007/helloLuaConf 
[ci skip]fix Incomplete helloLua project configuration.
 2013-11-15 00:06:49 -08:00
Dhilan007 6db31508cc fix Incomplete helloLua project configuration. 2013-11-15 16:01:03 +08:00
minggo 8b5068d4c5 Merge pull request #4273 from boyu0/fix_ccbreader_magic_bits_compare_bug 
[ci skip]fix CCBReader magic bytes compare bug.
 2013-11-14 23:45:33 -08:00
minggo 5870a69bb7 Merge pull request #4269 from Dhilan007/di2854 
[ci skip]issue #2854:Disable CDT Builder on Eclipse
 2013-11-14 23:45:13 -08:00
minggo 2923b1c1ed Merge pull request #4271 from nutty898/develop_nutty_modify_relativelayout 
[ci skip]Modify relative layout
 2013-11-14 23:43:30 -08:00
boyu0 0c309acbe7 fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black 2013-11-15 15:41:43 +08:00
minggo b9e5cadeba Merge pull request #4272 from samuele3hu/developCCS 
[ci skip]Modify template of lua ios_mac config and some bugs
 2013-11-14 23:21:56 -08:00
samuele3 63d4014586 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-15 14:52:17 +08:00
CaiWenzhi 75d9bde459 Modify relative layout 2013-11-15 14:37:34 +08:00
Dhilan007 050a47c4eb issue #2854:Disable CDT Builder on Eclipse 2013-11-15 14:35:55 +08:00
minggo 2617fe1a74 Merge pull request #4268 from nutty898/develop_nutty_modify_layout 
[ci skip]Modify layout
 2013-11-14 22:27:32 -08:00
samuele3 c1bdd8ad3c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-15 13:49:19 +08:00
samuele3 ec9bc0069f Modify template of lua ios_mac config and some bugs 2013-11-15 13:48:34 +08:00
CaiWenzhi 1730fcddcb Modify layout 2013-11-15 13:29:39 +08:00
minggo 6a9dd64547 Merge pull request #4262 from dabingnn/free_instead_of_delete 
[ci skip]Free instead of delete
 2013-11-14 18:49:58 -08:00
Huabing.Xu e14295c404 Merge branch 'develop' into free_instead_of_delete 2013-11-15 09:45:03 +08:00
Huabing.Xu 022b5c7b9a Merge branch 'develop' into free_instead_of_delete 
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
  fix asynchronize loading bug
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fixed #3185 support for html5.
  fixed bug of widget
  fixed bugs of widget
  fixed #3185  ComponentTest and SceneTest NULL to nullptr.
  Add deprecated functions of class TextureCache
  fix warning
  set z order after reorder
  fixed #3185 replace NULL to nullptr.
  add "override"
  fixed #3185
  Modify code criterion

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-11-15 09:44:29 +08:00
minggo 9b746d22f5 Merge pull request #4259 from minggo/async-loading-fix 
[ci skip]fix asynchronize loading bug
 2013-11-14 02:40:44 -08:00
minggo 2f7f05d1d7 fix asynchronize loading bug 2013-11-14 18:39:23 +08:00
minggo f06d71dd49 Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-14 02:26:45 -08:00
CocosRobot 523cb2e8d9 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 09:39:25 +00:00
minggo c594a673fc Merge pull request #4244 from chengstory/#3185 
[ci skip]fixed #3185
 2013-11-14 01:33:26 -08:00
Huabing.Xu 4894632467 Fix bug: add android, fix android can not compile 2013-11-14 17:14:35 +08:00
chengstory 6acf422f3b fixed #3185 support for html5. 2013-11-14 17:03:45 +08:00
minggo cd2db9448a Merge pull request #4251 from nutty898/develop_nutty_code_criterion 
[ci skip]Develop nutty code criterion
 2013-11-14 00:14:47 -08:00
CaiWenzhi 19c605eb51 Merge branch 'develop' into develop_nutty_code_criterion 2013-11-14 15:46:52 +08:00
CaiWenzhi 5f22edf095 fixed bug of widget 2013-11-14 15:42:59 +08:00
minggo e0076cbdf3 Merge pull request #4246 from minggo/zorder-fix 
[ci skip]Zorder fix
 2013-11-13 23:26:05 -08:00
minggo e2c4c18e3b Merge pull request #4247 from samuele3hu/developCCS 
[ci skip]Add deprecated functions of class TextureCache
 2013-11-13 23:25:49 -08:00
Huabing.Xu 03c8c8f4fc Fix bug: use free() in imageCommon_cpp.h 2013-11-14 14:48:16 +08:00
Huabing.Xu bc55d3246b Merge branch 'develop' into free_instead_of_delete 
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Update CHANGELOG[ci skip]
  Update AUTHORS [ci skip]
  fix bug: cccolor to jsval function has error in jsb
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  [ci skip]
  C++11: NULL -> nullptr
  [ci skip]
  Fix: UserDefault::createXMLFile with correct XML definition.
  [ci skip]
  [ci skip]
  [ci skip]
  Fix bug: rename const with under line seperator
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Fix bug: Z fighting on TransitionScenePageTurn
  Fixed bugs
  Modify reader and fixed bugs
  ...

Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
 2013-11-14 14:47:01 +08:00
CaiWenzhi dee5305f7b fixed bugs of widget 2013-11-14 14:46:44 +08:00
CaiWenzhi ccaa8f7310 Merge branch 'develop' into develop_nutty_code_criterion 2013-11-14 14:31:04 +08:00
chengstory 41975ba445 fixed #3185 ComponentTest and SceneTest NULL to nullptr. 2013-11-14 14:16:14 +08:00
samuele3 a20620c185 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-14 14:14:52 +08:00
samuele3 babc985409 Add deprecated functions of class TextureCache 2013-11-14 14:12:25 +08:00
minggo 38eabaf315 fix warning 2013-11-14 14:09:12 +08:00
minggo a057274115 set z order after reorder 2013-11-14 14:08:50 +08:00
chengstory e9f5e889d6 fixed #3185 replace NULL to nullptr. 2013-11-14 14:05:24 +08:00
CaiWenzhi 2432e6e40d add "override" 2013-11-14 13:42:10 +08:00
Huabing.Xu 46ef7a7fbc Fix bug: deprecate old interface 2013-11-14 13:35:17 +08:00
chengstory 14d51f9f35 fixed #3185 2013-11-14 13:28:42 +08:00
James Chen f528126d5a Merge pull request #4243 from CocosRobot/updategeneratedsubmodule_1384403566 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-11-13 20:37:03 -08:00
CocosRobot 515d20d863 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 04:32:48 +00:00
James Chen 1d0e42deac Update CHANGELOG[ci skip] 2013-11-14 12:30:38 +08:00
James Chen 6602e78168 Update AUTHORS [ci skip] 2013-11-14 12:22:47 +08:00