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

13356 Commits

Author SHA1 Message Date
samuele3 ee815c8e9a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 15:57:14 +08:00
samuele3 b281a2f06f Hot fix:repalce unsigned int/int type of params with long to solve tableview bug 2013-11-18 15:55:58 +08:00
minggo 946fd16adc Merge pull request #4295 from samuele3hu/developCCS 
[ci skip]hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
 2013-11-17 23:10:01 -08:00
minggo 5c41130083 Merge pull request #4293 from 2youyouo2/develop 
[ci skip]fixed BatchNode's _children is empty, draw will crash
 2013-11-17 23:01:32 -08:00
minggo bbb579faad Merge pull request #4298 from boyu0/fix_keypadtest_crash 
[ci skip]fix keypad test crash bug
 2013-11-17 23:01:10 -08:00
minggo ce828d4bf2 Merge pull request #4294 from natural-law/develop 
[ci skip]Update the JS binding code & samples for latest cocos2d engine.
 2013-11-17 23:00:37 -08:00
boyu0 eea09d60f7 fix keypad test crash bug 2013-11-18 14:33:24 +08:00
zhangbin f54cbfde06 Update the JS binding code & samples for latest cocos2d engine. 2013-11-18 14:13:46 +08:00
samuele3 e6ed691e7c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-18 14:13:05 +08:00
samuele3 5c8d24a11e hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in 2013-11-18 14:12:07 +08:00
2youyou2 4f2603f69c fixed BatchNode's _children is empty, draw will crash 2013-11-18 13:23:38 +08:00
minggo 5e4b3c6919 Merge pull request #4291 from dabingnn/develop_hotFix 
[ci skip]HotFix: remove Mac platform Image::saveToFile assert
 2013-11-17 20:57:47 -08:00
minggo 4c6aa04e98 Merge pull request #4288 from nutty898/develop_nutty_modify_bugfixed 
[ci skip]Develop nutty modify bugfixed
 2013-11-17 20:56:18 -08:00
minggo d3eab6d282 Merge pull request #4275 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-11-17 20:00:07 -08:00
boyu0 90f07f680f Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical 2013-11-18 11:22:20 +08:00
minggo 95e7373dad Merge pull request #4290 from boyu0/delete_initTest_in_testcpp 
[ci skip]fix bugs: delete initTest functions in TestCpp.
 2013-11-17 19:00:42 -08:00
CaiWenzhi 2f3e922a98 Fixed crash of reader 2013-11-18 10:19:40 +08:00
boyu0 af65a59e5f issue #2771: fix indent 2013-11-18 10:15:50 +08:00
Huabing.Xu 09f27f1d16 HotFix: remove Mac platform Image::saveToFile assert 2013-11-18 10:14:57 +08:00
boyu0 a7d884a63f issue #2771: change debug draw defines to class static const variable 2013-11-18 10:10:37 +08:00
CaiWenzhi e63ef05c30 Merge branch 'develop' into develop_nutty_modify_bugfixed 2013-11-18 09:57:35 +08:00
boyu0 8c949c3441 fix bugs: delete initTest functions. 2013-11-18 03:43:32 +08:00
boyu0 8ab64c9fa8 issue #2771: fix some api name and code style 2013-11-18 03:10:13 +08:00
boyu0 0710cfa526 issue #2771: delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs 2013-11-18 02:16:20 +08:00
minggo bac14ab3e5 Merge pull request #4280 from lite3/develop 
[ci skip]fix path for windows
 2013-11-16 05:22:09 -08:00
minggo 2235c833a3 Merge pull request #4283 from minggo/fix-warning-hungaria 
[ci skip]apply cocos2dx coding style
 2013-11-16 05:21:00 -08:00
minggo 982a23af3d fix some hungarial 2013-11-16 21:08:00 +08:00
minggo db804891ed fix some warnings 2013-11-16 20:02:49 +08:00
CaiWenzhi 71ff8fef9c Fixed crash 2013-11-15 22:25:29 +08:00
lite3 8d24960bb2 fix path for windows 2013-11-15 18:05:24 +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