Commit Graph

14482 Commits

Author SHA1 Message Date
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
James Chen 1e09952e97 Merge pull request #4241 from rablwupei/color_bug_fix
closed #3132: Wrong convention to jsval in cccolor4f_to_jsval and cccolor3b_to_jsval.
2013-11-13 20:18:18 -08:00
rablwupei 96462eb81f fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +08:00
minggo 063bc6b833 [ci skip] 2013-11-14 11:54:54 +08:00
minggo 13756b7558 [ci skip] 2013-11-14 11:52:52 +08:00
minggo 996be7502a Merge pull request #4129 from michaelcontento/color-convenience
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo 5c58a8224c Merge pull request #4168 from xhcnb/fix_ccb_nodeloader
[ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...
2013-11-13 19:46:08 -08:00
CaiWenzhi 611ba9e9f5 Modify code criterion 2013-11-14 11:37:46 +08:00
minggo a2bfc31ea0 [ci skip] 2013-11-14 11:27:26 +08:00
minggo 4b9215708c [ci skip] 2013-11-14 11:25:39 +08:00
minggo f56cf9b8bf Merge pull request #4222 from HoGarfield/Scale9SpriteLoader
[ci skip]To set anchor point to 0,0 when created by loader
2013-11-13 19:23:49 -08:00
minggo 0f3cb95f58 Merge pull request #4028 from lite3/develop
[ci skip]add options for android_mk_generator
2013-11-13 19:21:58 -08:00
minggo 95effc0207 Merge pull request #4234 from xhcnb/dev_fix_ccuserdefalut
[ci skip]Fix: UserDefault::createXMLFile with correct XML definition.
2013-11-13 19:16:34 -08:00
minggo 6b07ee4d08 [ci skip] 2013-11-14 11:15:02 +08:00
Jason Xu f4425f5db2 C++11: NULL -> nullptr 2013-11-14 11:08:50 +08:00
minggo c1ccfc5cea [ci skip] 2013-11-14 10:41:09 +08:00
Jason Xu dee3bffcdc Fix: UserDefault::createXMLFile with correct XML definition. 2013-11-14 10:40:06 +08:00
minggo 23b2bdb6eb Merge pull request #4137 from HoGarfield/AssetsManager.uncompress
[ci skip]Adding test whether the file directory exists when uncompressing file entry,if does not exist then create directory
2013-11-13 18:39:42 -08:00
minggo ed83a0b374 Merge pull request #4205 from bmanGH/fix_touch_retain
[ci skip]fix direct delete touch object without use release crash bug;
2013-11-13 18:30:21 -08:00
minggo e6653e133b Merge pull request #4193 from ricardoquesada/doxygen_markdown
[ci skip]Adds markdown comments in the doxstrings
2013-11-13 18:15:59 -08:00
minggo c51f0965aa [ci skip] 2013-11-14 10:12:25 +08:00
minggo 9b2da3b09f [ci skip] 2013-11-14 10:11:18 +08:00
minggo 97063dfe7d Merge pull request #4208 from bmanGH/feature/add_functions_to_glprogram
[ci skip]add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed into GLProgram class
2013-11-13 18:10:10 -08:00
minggo 71ca09d041 [ci skip] 2013-11-14 10:09:32 +08:00
minggo a34011c682 Merge pull request #4229 from dabingnn/develop_fix_zFighting_TransitionScenePageTurn
[ci skip]Fix bug: Z fighting on TransitionScenePageTurn
2013-11-13 18:08:25 -08:00