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

12514 Commits

Author SHA1 Message Date
samuele3 3ed7a79a84 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-20 13:01:07 +08:00
CocosRobot 54ef1d6c15 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-20 04:24:55 +00:00
samuele3 8a408f9951 Add doxygen comments for the CocoStudio 2013-11-20 12:04:47 +08:00
James Chen 59c2647bd6 Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function. 2013-11-20 11:35:04 +08:00
James Chen da8c34d994 Fix of unsigned / signed mismatch in UIPageView.cpp. 2013-11-20 11:20:35 +08:00
James Chen 6b579ebe5e Don't deprecate callback functions in Layer. Reason: 
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
 2013-11-20 11:19:51 +08:00
James Chen 93333ad252 Merge pull request #4340 from Dhilan007/jssubmodule 
recover controller on layer.
 2013-11-19 18:49:07 -08:00
James Chen 3c783d2e28 Merge pull request #4344 from dumganhar/develop 
Fixing warning generated by VS2012.
 2013-11-19 18:43:14 -08:00
Dhilan007 bd3789e0b5 add miss api 2013-11-20 10:40:43 +08:00
James Chen 424431690a Fixing warning generated by VS2012. 2013-11-20 10:39:30 +08:00
Dhilan007 0646e59bf3 resolve conflict 2013-11-20 10:26:00 +08:00
boyu0 c945fbd42c issue #2771: add some warning log 2013-11-20 10:25:43 +08:00
James Chen 60ed1dcd3a Merge pull request #4341 from Dhilan007/touchfix 
fix touches not working in cocosbuilder
 2013-11-19 18:20:42 -08:00
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -08:00
Dhilan007 02c69a5c6a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-20 09:57:50 +08:00
Ricardo Quesada 0d750cdbaf Adds virtual destructors on Interfaces 
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to  Interface classes

And also enables  'warn on  missing virtual destructors'
 2013-11-19 16:57:23 -08:00
Nite Luo 8ce16e1e12 Finish DrawNode 2013-11-19 13:57:39 -08:00
Ricardo Quesada 27b09a2b3b Merge branch 'develop' into constructors_are_protected 2013-11-19 13:54:34 -08:00
Ricardo Quesada 582afe3b61 Fixes warnings in CCLabel 
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
 2013-11-19 13:51:40 -08:00
Ricardo Quesada 5c74c938ee Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-19 13:13:57 -08:00
Nite Luo a3725c2394 Merge branch 'develop' into newRenderer 2013-11-19 11:08:26 -08:00
Nite Luo 7ad64ece36 Add Transform to DrawNode 2013-11-19 11:06:26 -08:00
Dhilan007 948410c7b5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-19 19:33:26 +08:00
Dhilan007 23f36e0406 fix touches not working in cocosbuilder 2013-11-19 19:24:04 +08:00
boyu0 aec514e3a2 issue #2771: fix collision bug cause by dynamic/static cast. 2013-11-19 18:30:12 +08:00
CocosRobot d8ec58831a [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 09:40:27 +00:00
Dhilan007 dc42645afe Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio 2013-11-19 16:49:28 +08:00
Dhilan007 3929e6070d fix error form overrides a 'final' function 2013-11-19 16:27:09 +08:00
Dhilan007 c307d83b35 add miss Deprecated api 2013-11-19 16:06:27 +08:00
Dhilan007 1a65af9d1a fix warn 2013-11-19 15:54:54 +08:00
Dhilan007 f0ab3f9ca1 fix some error in layer controller code 2013-11-19 15:41:22 +08:00
Dhilan007 0586c4d275 recover controller on layer. 2013-11-19 13:56:30 +08:00
minggo 594450e3f7 Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 19:52:09 -08:00
CocosRobot 0855ff0841 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 03:50:57 +00:00
minggo 2848e0dc3e Merge pull request #4328 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-18 19:46:29 -08:00
2youyou2 d5478f1ca2 fix if last frame has tween effect, armature may display wrong 2013-11-19 11:44:17 +08:00
minggo bd00e6fabb Merge pull request #4326 from dabingnn/develop_hotFix 
[ci skip]Develop hot fix
 2013-11-18 19:33:07 -08:00
Huabing.Xu 1fc928df41 HotFix: use static cast for format conversion 2013-11-19 11:32:12 +08:00
yinkaile f308f2f95a fix CCArmature display wrong on mac version 2013-11-19 11:22:40 +08:00
Huabing.Xu 49f34c5339 HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture 2013-11-19 11:19:12 +08:00
Huabing.Xu fff851a8aa HotFix: change tab to space 2013-11-19 11:17:02 +08:00
Huabing.Xu 458b9b53da HotFix: fix CCB particle alpha blend 2013-11-19 11:16:14 +08:00
minggo 1e8a3fc92f Merge pull request #4322 from dabingnn/develop_hotFix 
[ci skip]HotFix: fix bug spine alpha blend error
 2013-11-18 18:54:16 -08:00
minggo fb2c2ec7f2 Merge pull request #4323 from Dhilan007/jssubmodule 
[ci skip]fix miss bind setGrid\getGrid for JS.
 2013-11-18 18:53:51 -08:00
minggo 8e7cce8cea Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 18:53:06 -08:00
Huabing.Xu 69b38f6e40 HotFix: change tab to space 2013-11-19 10:42:37 +08:00
CocosRobot 186b6fd98b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-19 02:40:44 +00:00
minggo 78f2e0982e Merge pull request #4319 from liamcindy/develop 
[ci skip]fixed ui anmation crash when stop animation for develop branch
 2013-11-18 18:34:16 -08:00
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +08:00
Huabing.Xu d9681150fc HotFix: fix bug spine alpha blend error 2013-11-19 10:15:12 +08:00
Nite Luo abb011f0ef Test clipping node with alpha 2013-11-18 15:52:47 -08:00
Nite Luo c288e5ef9c Fix Clipping Node 2013-11-18 14:58:41 -08:00
Ricardo Quesada c943702bc8 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/editor-support/cocostudio/CCActionObject.cpp
	samples/Cpp/TestCpp/Classes/PhysicsTest/PhysicsTest.h
 2013-11-18 11:07:15 -08:00
Nite Luo e5ebcb2845 Merge branch 'develop' into newRenderer 2013-11-18 10:22:16 -08:00
Liam c7932b6181 fixed ui anmation crash when stop animation 2013-11-19 00:57:22 +08:00
James Chen 91a57c614d closed #3224: The subthread of CCHttpClient interrupts main thread if timeout signal comes. 2013-11-19 00:19:57 +08:00
minggo 1ed8cfee7c Merge pull request #4297 from liamcindy/develop 
[ci skip]Shielded unusefull log for develop branch
 2013-11-18 07:10:40 -08:00
minggo 27f35ac3e3 Merge pull request #4312 from samuele3hu/developTableView 
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
 2013-11-18 07:09:57 -08:00
minggo 0e2ea2971d Merge pull request #4313 from minggo/develop 
[ci skip]fix compiling error of js template
 2013-11-18 06:33:23 -08:00
minggo 2028cde015 fix compiling error of js template 2013-11-18 22:32:13 +08:00
minggo 62bd6453fc Merge pull request #4310 from boyu0/iss2771_physical 
[ci skip]issue #2771 physical fix crashes
 2013-11-18 06:19:49 -08:00
samuele3 6c88dd34c0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-18 22:17:47 +08:00
samuele3 a2e9920288 Hot fix:Repair some lua test samples and modify layer touch listener functions 2013-11-18 22:16:49 +08:00
minggo fc56d9234e Merge pull request #4309 from dabingnn/develop_hotFix 
[ci skip]HotFix: fix bug callback retain release error
 2013-11-18 05:14:41 -08:00
Huabing.Xu 699dd9518b HotFix: fix bug callback retain release error 2013-11-18 21:12:47 +08:00
boyu0 68b98fc84f issue #2771: change PhysicsContact::create to construct 2013-11-18 21:06:05 +08:00
CocosRobot 853a895c69 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:57:00 +00:00
James Chen 060e8413dd Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-18 02:51:11 -08:00
CocosRobot 7afb8877c5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-18 10:40:18 +00:00
minggo 593c0f8946 Merge pull request #4304 from Dhilan007/di3223 
[ci skip]issue #3223:bind gui and studio
 2013-11-18 02:28:53 -08:00
Dhilan007 8b14575d7e bind gui and studio. 2013-11-18 16:54:52 +08:00
minggo da2158de20 Merge pull request #4303 from boyu0/iss2771_physical 
[ci skip]issue #2771: physics.  rename resetForce to resetForces
 2013-11-18 00:32:06 -08:00
boyu0 23c477f15d issue #2771: rename resetForce to resetForces 2013-11-18 16:27:23 +08:00
minggo c7971bcaad Merge pull request #4300 from minggo/textinput-crash 
[ci skip]fix crash of textinput test case
 2013-11-18 00:23:51 -08:00
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 30b7ac8dd1 fix crash of textinput test case 2013-11-18 15:14:48 +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
boyu0 eea09d60f7 fix keypad test crash bug 2013-11-18 14:33:24 +08:00
Liam 66443255a6 Shielded unusefull log 2013-11-18 14:20:50 +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
boyu0 90f07f680f Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical 2013-11-18 11:22:20 +08:00
CaiWenzhi 2f3e922a98 Fixed crash of reader 2013-11-18 10:19:40 +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 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 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
Nite Luo f5a8c1d02c Fix NewClipNodeTest 2013-11-15 17:32:29 -08:00
Ricardo Quesada a3fabd6b6d TiledMap uses std::string 2013-11-15 16:37:57 -08:00
Ricardo Quesada 7c2ed2743c Menu + MenuItem 
`Menu` and `MenuItem` have protected constructors
 2013-11-15 13:14:12 -08:00
Ricardo Quesada 208d25bdff ControlSwitch compies 
Uses procted constructor
 2013-11-15 12:04:47 -08:00
Nite Luo c5f9434331 Merge branch 'develop' into newRenderer 2013-11-15 11:33:38 -08:00
Nite Luo 566767da60 Add NewDrawNode 2013-11-15 11:29:11 -08:00
Ricardo Quesada 417657b5a9 Merge branch 'develop' into constructors_are_protected 2013-11-15 10:11:49 -08:00
CaiWenzhi 71ff8fef9c Fixed crash 2013-11-15 22:25:29 +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 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 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
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
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
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
Ricardo Quesada a583ad461f CCControlButton has protected constructor 2013-11-14 17:19:16 -08:00
Nite Luo 7ad93d8a94 Create new clippingNode 2013-11-14 16:39:03 -08:00
Ricardo Quesada 17a6575bd3 more protected constructors 
Adds protected constructors for:

* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
 2013-11-14 16:33:43 -08:00
Ricardo Quesada dd68eb4796 ParticleSystem uses protected constructors 2013-11-14 16:21:49 -08:00
Ricardo Quesada b87684c022 fixes Sprite::setTexture() 
Sprite::setTexture(std::string&)  works as expected.
It sets the texture rect of the sprite
 2013-11-14 15:37:43 -08:00
Nite Luo 8d63faa0de New Renderer working with RenderStack 2013-11-14 12:17:54 -08:00
Ricardo Quesada cd0ba6850c Merge branch 'develop' into constructors_are_protected 2013-11-14 11:57:18 -08:00
Nite Luo a70cad8c97 Merge branch 'develop' into newRenderer 2013-11-14 10:36:43 -08:00
Nite Luo 4f1858fa8a Crate NewClipping Node 2013-11-14 10:35:28 -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
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
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
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 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
CocosRobot 515d20d863 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 04:32:48 +00:00
rablwupei 96462eb81f fix bug: cccolor to jsval function has error in jsb 2013-11-14 12:03:44 +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 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 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
Jason Xu f4425f5db2 C++11: NULL -> nullptr 2013-11-14 11:08:50 +08:00
Jason Xu dee3bffcdc Fix: UserDefault::createXMLFile with correct XML definition. 2013-11-14 10:40:06 +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 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 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
Huabing.Xu b4b4e99522 Fix bug: rename const with under line seperator 2013-11-14 10:00:59 +08:00
minggo 84689e0121 Merge pull request #4206 from boyu0/iss2770_fix_warnings 
[ci skip]issue #2770: fix warnings
 2013-11-13 17:57:25 -08:00
minggo 7b61a34d71 Merge pull request #4230 from CocosRobot/updategeneratedsubmodule_1384393975 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-13 17:55:15 -08:00
CocosRobot dff9c6a5b5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-14 01:52:57 +00:00
minggo 87fd45a6a4 Merge pull request #4226 from nutty898/develop_nutty_addfunctiontoguireader_3 
[ci skip]Develop nutty addfunctiontoguireader 3
 2013-11-13 17:51:35 -08:00
minggo 408ab94eba Merge pull request #4215 from liamcindy/develop 
[ci skip]fixed ui animation play error
 2013-11-13 17:47:39 -08:00
minggo 4abf5b50dd Merge pull request #4214 from samuele3hu/developCCS 
[ci skip]issue #2868:Add CocoStudio UI lua binding and some releated test samples
 2013-11-13 17:45:34 -08:00
Huabing.Xu ccbbff3c22 Fix bug: Z fighting on TransitionScenePageTurn 2013-11-14 09:44:35 +08:00
Nite Luo f17af1f319 Add group command 2013-11-13 17:31:12 -08:00
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -08:00
Nite Luo d5f651deee Merge branch 'develop' into newRenderer 2013-11-13 10:27:30 -08:00
Nite Luo 05bc444ccb Add some optimization tips 2013-11-13 10:26:26 -08:00
CaiWenzhi 9c1bd673ff Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-13 20:43:57 +08:00
CaiWenzhi 3ac054edbd Fixed bugs 2013-11-13 20:38:18 +08:00
CaiWenzhi 5f68e028b5 Modify reader and fixed bugs 2013-11-13 20:01:57 +08:00
samuele3 17f74eeb17 issue #2868:Modify armature test samples and add more armature test samples 2013-11-13 18:18:29 +08:00
minggo 304b09527b Merge pull request #4207 from bmanGH/feature/configuration_VAO_runtime 
[ci skip]Configuration of VAO in runtime
 2013-11-12 22:55:29 -08:00
bmanGH 2687ee8915 put '{' in a new line to follow cocos2d-x coding style 2013-11-13 14:52:16 +08:00
garfield_ho fbb4d02251 When anchor point is 0,0 , CocosBuilder will not output anchor point param setting request.Although the Scale9Sprite`s anchor point is default to 0, 0, but when calling function "initWithBatchNode", the anchor point will be set to 0.5, 0.5. 2013-11-13 14:38:01 +08:00
boyu0 ca4c289fd8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-13 11:24:19 +08:00
boyu0 fb04c9e574 issue #2770: fix some warning 2013-11-13 11:22:34 +08:00
CaiWenzhi 0665d6c9bc Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-13 10:19:09 +08:00
CaiWenzhi 03b3d583e8 Modify scenereader 2013-11-13 10:16:16 +08:00
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
samuele3 062fb85943 issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class 2013-11-13 10:12:44 +08:00
Ricardo Quesada 4848e3d3bb correct size for Listener ID 2013-11-12 17:14:51 -08:00
Nite Luo 37d3601fd0 Merge branch 'develop' into newRenderer 2013-11-12 11:56:17 -08:00
Nite Luo 0c0c11be5c Finish NewSpriteBatchTest 2013-11-12 11:53:53 -08:00
Nite Luo 8c972d96a8 Create new test for NewRenderer 2013-11-12 11:19:18 -08:00
Nite Luo ab8b61aaec Create NewSpriteBatchNode to use NewRender 2013-11-12 11:18:49 -08:00
bmanGH 683ce1692d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into feature/configuration_VAO_runtime 
Conflicts:
	cocos2dx/CCConfiguration.cpp
	cocos2dx/draw_nodes/CCDrawNode.cpp
	cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	cocos2dx/platform/android/CCEGLView.cpp
	cocos2dx/platform/ios/EAGLView.mm
	cocos2dx/textures/CCTextureAtlas.cpp
	cocos2dx/textures/CCTextureAtlas.h
 2013-11-12 20:18:04 +08:00
bmanGH 9893fbc514 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into fix_touch_retain 
Conflicts:
	cocos2dx/platform/CCEGLViewProtocol.cpp
 2013-11-12 19:24:09 +08:00
bmanGH f540131320 add setUniformLocationWithMatrix2fv, setUniformLocationWithMatrix3fv mothed in GLProgram class. 2013-11-12 18:59:37 +08:00
boyu0 15c8c04f3a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-12 18:22:26 +08:00
boyu0 0aa140a6e5 issue #2771: add comments 2013-11-12 18:13:44 +08:00
samuele3 f429c4c632 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-12 17:51:33 +08:00
CocosRobot 0acaa1f76e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-12 09:50:13 +00:00
samuele3 ae6597dbaa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 
Conflicts:
	tools/bindings-generator
 2013-11-12 17:23:41 +08:00
samuele3 18bc96096c Resolve some warning and modify uint32_t to long 2013-11-12 17:18:51 +08:00
samuele3 c1d256c159 issue #2868:modify ccs lua test samples 2013-11-12 16:52:03 +08:00
minggo 8d79e67ecf Merge pull request #4165 from 2youyouo2/develop 
[ci skip]update armature
 2013-11-11 23:57:30 -08:00
samuele3 cfb1cfdf65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.h
 2013-11-12 15:30:36 +08:00
boyu0 9eac5c4a41 issue #2771: add comment and improve API 2013-11-12 15:28:07 +08:00
samuele3 482ee5d47f issue #2868:Add more ccs lua test samples 2013-11-12 15:25:47 +08:00
Ricardo Quesada 6b29391212 Adds markdown comments in the doxstrings 
Since Doxygen 1.8.0 (we are already using it), it is possible to
add markdown comments in the doxygen strings.

This will make our comments easier to read.

This patch  only adds markdown to CCNode.h as a test.

If you like, I'll keep adding markdown comments as I see them.
Please, encourage the rest of the team to do the same.
 2013-11-11 20:21:01 -08:00
Liam f0ca796da1 merge from develop 2013-11-12 11:20:29 +08:00
James Chen 42ca4f6122 Merge pull request #4187 from dumganhar/develop 
#include <algorithm> for std::max, std::min on VS2013.
 2013-11-11 18:52:16 -08:00
James Chen db07c781ab #include <algorithm> for std::max, std::min on VS2013. 2013-11-12 10:35:50 +08:00
James Chen cfd82a26bb Merge pull request #4156 from bopohaa/patch-1 
closed #3159: Webp Test Crashes.
 2013-11-11 18:31:03 -08:00
Ricardo Quesada be64dd97cf replaces `delete[]` with `free()` in C-based API 
API that returns a newly allocated buffer as an output argument (not return value) are error-prone.

- Users forget to release the newly allocated buffer
- Or the call `delete` instead of `delete[]`

But some of those API need to call `realloc` on the buffer.
But `realloc` is only valid if the buffer was previously allocated with `malloc`.
If a buffer needs to be re-allocated using a C++ API, then `std::vector<char*>` should be used instead...

So, this patch does:

- Migrates the API from  `new []` / `delete[]` to  `malloc()` / `free()`
- Fixes all the memory issues: incorrect deallocs and memory leaks
- Updates the documentation
- And fixes misc issues with the API: removes `cc` from the ZipUtils class.
 2013-11-11 18:09:47 -08:00
boyu0 dbafd9af2b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2770_fix_warnings 2013-11-12 10:07:26 +08:00
James Chen cc3a6ebda9 Merge pull request #4150 from ledyba/fix_ccdevice 
Close X Display
 2013-11-11 17:40:32 -08:00
minggo 44bed76c21 Merge pull request #4175 from nutty898/develop_nutty_optimizeguireader_3 
[ci skip]Develop nutty optimizeguireader 3
 2013-11-11 17:36:22 -08:00
Ricardo Quesada d6446e9b14 calls `delete[]` instead of `delete` 
calls `delete[]` instead of `delete`
 2013-11-11 16:07:46 -08:00
Nite Luo a28f3f6f03 Merge branch 'develop' into newRenderer 2013-11-11 12:04:28 -08:00
Nite Luo f6fb48ba56 Fix crashing bug 2013-11-11 11:54:08 -08:00
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop 
[Win32] fix compile error.
 2013-11-11 04:42:42 -08:00
CocosRobot 3472d7ad50 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 10:57:57 +00:00
boyu0 d75c96443d issue #2770: fix some warning 2013-11-11 18:28:59 +08:00
CaiWenzhi b688e39584 Merge branch 'develop' into develop_nutty_optimizeguireader_3 2013-11-11 18:23:21 +08:00
CaiWenzhi 4f76141c41 optimize guireader 2013-11-11 18:22:14 +08:00
minggo b868c3f1dc Merge pull request #4173 from minggo/remove-makefile 
[ci skip]remove makefiles
 2013-11-11 02:19:16 -08:00
minggo d3cf36ba37 Merge pull request #4171 from dumganhar/jsb-64bit-fix 
[ci skip]Jsb 64bit fix
 2013-11-11 02:17:42 -08:00
CaiWenzhi 782c26bc37 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-11 17:57:43 +08:00
2youyou2 cdae8f51bc Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-11-11 17:30:52 +08:00
2youyou2 528c257497 add setUserObject method to CCArmatureAnimation 2013-11-11 17:30:37 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
samuele3 7cfe890d5d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-11 17:04:37 +08:00
samuele3 06c7d3e96d issue #2868:Add ccd lua test samples 2013-11-11 17:03:43 +08:00
minggo 2a31ff04c2 Merge pull request #4166 from dabingnn/iss3025_TextureCache 
[ci skip]issue #3025: move deprecated texture cache implementation to cpp file
 2013-11-11 00:46:46 -08:00
James Chen 49289d7576 Adding cc.TextureCache.getInstance() to jsb_deprecated.js. 2013-11-11 16:45:44 +08:00
James Chen 20b350a58b Removing cocosjs_manual_conversions.h(.cpp). Put all jsval <-> native value conversion codes to js_manual_conversions.h(.cpp). 2013-11-11 16:45:44 +08:00
James Chen 0151ac60ba fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08:00
boyu0 a54603390e issue #2771: change pointQuery implements 2013-11-11 16:23:42 +08:00
Nite Luo f68a2a47e7 Improved batching 2013-11-11 00:14:29 -08:00
CocosRobot 2e52dd4905 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-11 08:05:15 +00:00
Huabing.Xu dfcae4ed0d issue #3025: change TextureCache::purgeSharedTextureCache() and TextureCache::sharedTextureCache() to do not call deprecate function anymore 2013-11-11 16:04:34 +08:00
Jason Xu 891ddb5018 Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom properties to it, but when you create some nodes with the same custom_class , and they have different custom properties, as they are same class and the share one Loader, so in the loader _customProperties will be wrong. 
So, I dropped some lines to clear _customProperties before handle an new node.
 2013-11-11 15:45:07 +08:00
Huabing.Xu 3fc16256ab issue #3025: move deprecated texture cache implementation to cpp file 2013-11-11 15:40:12 +08:00
boyu0 b3f44a0805 issue #2771: edit assert message 2013-11-11 15:31:20 +08:00
yinkaile 677cf00355 fix compiler warning 2013-11-11 15:29:24 +08:00
yinkaile 50ab5783d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-11 15:16:13 +08:00
minggo cd22f5543b Merge pull request #3997 from ondesly/screen_size_change 
[ci skip]android & ios screen size change support
 2013-11-10 23:10:13 -08:00
minggo bbb2579114 Merge pull request #4160 from dabingnn/iss3025_TextureCache 
[ci skip]Iss3025 texture cache
 2013-11-10 23:08:01 -08:00
boyu0 13efb7e822 issue #2771: add pointQuery 2013-11-11 15:03:17 +08:00
yinkaile 9f67ea786e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-11 14:57:20 +08:00
yinkaile 0bb8714f86 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop 2013-11-11 14:53:18 +08:00
yinkaile 5ba1e4ce10 1.remove compiler wornings 
2.change void Bone::removeFromParent(bool recursion);  to void Bone::removeFromParent();
 2013-11-11 14:50:30 +08:00
James Chen 9d7a8c44f9 Reverts auto-generated. 2013-11-11 14:40:23 +08:00
James Chen 8f8d0f86d7 Updating Bindings-generator. 2013-11-11 14:38:12 +08:00
James Chen ff3bfbe8a2 Using std::unordered_map instead of UTHASH for js_type_class_t. 
Since xxx.hash_code() return size_t which is 8bytes on 64bit system, we should not use HASH_ADD_INT and HASH_FIND_INT for js_type_class_t.
 2013-11-11 14:36:43 +08:00
James Chen 55cf30b7c8 HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp. 2013-11-11 14:36:43 +08:00
James Chen 5a0df8d2e8 VS2012 doesn’t support invoke another constructor method in current constructor. 2013-11-11 14:36:43 +08:00
James Chen fe88f7c941 Fixing memory leak of JSStringWrapper::set . 2013-11-11 14:36:43 +08:00
James Chen 9d5813b7d9 Some fixes: 
1) Moving the implementation of JSStringWrapper to .cpp file. Removing override operator() which will be easy to make errors.
2) Deleting JSCallFuncWrapper since it isn’t needed after using std::function for MenuItem’s Callback.
3) Fixing ChipmunkTest crash sometimes on MAC platform(64bit).
 2013-11-11 14:36:42 +08:00
Huabing.Xu 55b9462b17 issue #3025: directly use _textureCache in Director 2013-11-11 14:21:41 +08:00
boyu0 9b99872067 issue #2770: fix some warning 2013-11-11 14:11:06 +08:00
minggo e193311e55 Merge pull request #4161 from boyu0/iss2770_fix_warnings 
[ci skip]issue #2770: fix warning
 2013-11-10 22:10:10 -08:00
2youyou2 0a72c3c1c2 1.when add a skin to last index, applay it's skindata to the previous skindata 
2.Do not retain target when regist frame event and movement event
 2013-11-11 13:33:47 +08:00
James Chen 707a6c246f Merge pull request #4157 from dumganhar/iss3137-fix-acc 
closed #3137: Device::setAccelerometerEnabled needs to be invoked before adding ACC listener
 2013-11-10 21:03:24 -08:00
boyu0 6c1144ee79 issue #2770: fix some warning 2013-11-11 12:49:38 +08:00
minggo e981dbf7e4 Merge pull request #4158 from dumganhar/remove-jsb-version 
[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
 2013-11-10 20:45:22 -08:00
minggo def560c811 Merge pull request #4159 from mlepage/develop 
[ci skip]Fix typos and other trivial cleanup
 2013-11-10 20:06:56 -08:00
Huabing.Xu 02da3a29cc issue #3025: deprecate TextureCache::reloadAllTextures, call VolatileTextureMgr::reloadAllTextures instead 2013-11-11 11:38:02 +08:00
Marc Lepage 27b82f8f67 Fix typos and other trivial cleanup 2013-11-10 22:00:50 -05:00
James Chen 0c4b6e7a37 Removing JSB Version since JSB source codes will be updated with cocos2d-x. 
Also, remove some unused codes.
 2013-11-11 10:40:51 +08:00
James Chen a6c85a3906 issue #3137: Disabling Accelerometer when layer is destroyed. 2013-11-11 10:23:05 +08:00
minggo 9a3d2e941e Merge pull request #3969 from dualface/develop 
[ci skip]fix tolua_fix, cleanup peertable after object deleted
 2013-11-10 17:44:24 -08:00
bopohaa ef92efcd79 Update CCImageCommon_cpp.h 
webp don't work for me
 2013-11-11 02:28:27 +03:00
James Chen deeaa4d1bc Merge pull request #4148 from dumganhar/touch-onebyone-available 
Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable.
 2013-11-10 00:39:30 -08:00
dualface c75c20de04 fix Lua 5.2 compatibility 2013-11-10 11:49:52 +08:00
CocosRobot 6e6c63e111 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-10 03:29:03 +00:00
samuele3 d4dbc7a442 Add conversion config for long type 2013-11-10 09:21:33 +08:00
dualface 2a2fc81f86 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-10 00:00:19 +08:00
samuele3 e26fe04deb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-09 23:04:11 +08:00
samuele3 286393d28e issue #2868:Add more manual lua binding functions 2013-11-09 22:58:40 +08:00
Lee, Jae-Hong e132142689 [Win32] Update libGUI project 
- Update files list.
 2013-11-09 23:57:18 +09:00
Lee, Jae-Hong 3d23ca328e [Win32] fix compile error. 
- fix C2552 error in VS2012.
 2013-11-09 23:56:24 +09:00
Lee, Jae-Hong 5e36021d54 [Win32] fix argument type. 
- argument of interface is a long type.
 2013-11-09 23:44:15 +09:00
psi c4e70387f7 Close display 2013-11-09 23:02:45 +09:00
James Chen f3a5245bfa Triggers an assert only onTouchBegan is nullptr for EventListenerTouchOneByOne. Fixes comments for checkAvailable. 2013-11-09 18:11:57 +08:00
Nite Luo 5a1d92cbf2 Merge branch 'develop' into newRenderer 
Conflicts:
	samples/Cpp/TestCpp/Classes/controller.cpp
 2013-11-08 14:01:08 -08:00
Nite Luo 050f3f705e minor code format fix 2013-11-08 13:57:21 -08:00
Nite Luo fa9d8fe077 Add CustomCommand 2013-11-08 12:06:39 -08:00
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -08:00
CaiWenzhi a0f794b7df optimize layout 2013-11-08 23:26:44 +08:00
CaiWenzhi 8a5084effa add list view event 2013-11-08 20:29:49 +08:00
CaiWenzhi 1f389d3779 Rename event interface 2013-11-08 18:43:06 +08:00
Huabing.Xu b726c6fd2c issue #3025: move VolatileTexture static function to VolatileTextureMgr 2013-11-08 16:47:33 +08:00
boyu0 4efacdbcf3 issue #2771: rename PhysicsWorld::create() to PhysicsWorld::construct(), fix some bugs 2013-11-08 16:17:56 +08:00
minggo 4553db492a Merge pull request #4141 from Dhilan007/m_c_jsb 
[ci skip]use float instead for create point object
 2013-11-07 23:57:14 -08:00
CaiWenzhi da27169d45 add "setUserObject" method 2013-11-08 14:58:20 +08:00
Liam 2aaa21255f fixed cocostudio action can not looping 2013-11-08 14:34:24 +08:00
boyu0 a56dedb41a issue #2771: add class PhysicsDebugDraw 2013-11-08 14:25:03 +08:00
Dhilan007 314f2ac62e use float instead for create point object 2013-11-08 14:13:39 +08:00
Huabing.Xu 6f1e98df34 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +08:00
CocosRobot fd37d3e973 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 04:17:15 +00:00
CaiWenzhi 18f411fd1e Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-08 11:36:59 +08:00
Huabing.Xu 935d472979 issue #3025: remove TextureCache::_sharedTextureCache 2013-11-08 11:36:27 +08:00
minggo 56d7da8933 Merge pull request #4130 from ricardoquesada/love_in_textfield 
[ci skip]More std::string& usage
 2013-11-07 19:14:35 -08:00
CocosRobot 240fc2ade1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-08 03:10:36 +00:00
minggo d2bb1c72cc Merge pull request #4117 from michaelcontento/add-missing-setscale-to-sprite 
[ci skip]add Sprite::setScale(float, float)
 2013-11-07 18:54:04 -08:00
minggo d1f94e0d9d Merge pull request #4111 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-11-07 18:51:15 -08:00
minggo 167242e540 Merge pull request #4127 from Dhilan007/ANCHOR_XXX 
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
 2013-11-07 18:45:50 -08:00
Nite Luo be71eb8626 Merge branch 'develop' into newRenderer 
Conflicts:
	.gitignore
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/2d/CCDirector.cpp
 2013-11-07 17:24:57 -08:00
Nite Luo 72828acaec Add some todo 2013-11-07 16:53:20 -08:00
Nite Luo 935d2bdebb Implement sprite batching 2013-11-07 16:50:53 -08:00
Nite Luo d7cb4ed219 First attempt for batching 2013-11-07 15:48:37 -08:00
Ricardo Quesada ffd4342548 Adds more strings 
and more `override`
and fixes some indetentation issues
 2013-11-07 12:42:16 -08:00
Ricardo Quesada e4662b371a TextField uses std::string& in the public API 
and uses std::string instead of std::string* internally
 2013-11-07 11:58:48 -08:00
Nite Luo 3421eb8e5d Cleanup the code a bit before implement sprite batching 2013-11-07 10:09:53 -08:00
Michael Contento 0160bec3ad Colors are now compare- and explicit convertible 2013-11-07 18:13:33 +01:00
Dhilan007 916361af3f Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc. 2013-11-07 23:40:33 +08:00
samuele3 f56269ce85 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-07 23:23:11 +08:00
samuele3 16d572c04f issue #2868:Add manual lua binding files 2013-11-07 23:22:11 +08:00
CaiWenzhi c69163559b Move some method from helper to reader 2013-11-07 21:26:56 +08:00
CaiWenzhi 9b4aa95b31 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 21:18:21 +08:00
Huabing.Xu 99bcca0532 issue #3025: replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in cocos folder 2013-11-07 19:11:09 +08:00
Huabing.Xu c8fe6077aa issue #3025: Deprecate TextureCache::getInstance() destroyInstance() 2013-11-07 19:10:14 +08:00
Huabing.Xu 99546cef46 issue #3025: add getTextureCache() in CCdirector() 2013-11-07 18:52:36 +08:00
minggo 237f7a7839 Merge pull request #4125 from minggo/fix-compiling-error 
[ci skip]fix compiling erros on Android
 2013-11-07 02:04:27 -08:00
boyu0 b6c98ab1eb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-07 17:59:01 +08:00
boyu0 e278ad66c8 issue #2771: change PhysicsJoint::create() to PhysicsJoint::construct() 2013-11-07 17:46:05 +08:00
CaiWenzhi b0a422eb09 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 17:40:13 +08:00
boyu0 7363be0697 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-07 17:37:33 +08:00
minggo b9b14571ac fix compiling erros on Android 2013-11-07 17:16:31 +08:00
CaiWenzhi e2249c8c3f Fixed crash 2013-11-07 17:15:52 +08:00
CocosRobot a116e7ec79 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-07 09:11:22 +00:00
CaiWenzhi 9f2297a5a6 add "retain" to listeners 2013-11-07 16:46:41 +08:00
samuele3 9f5095b9c3 Reslove the compiled error 2013-11-07 16:43:04 +08:00
boyu0 ef5440f738 issue #2771: change rayCast and rectQuery callback class to std::function 2013-11-07 16:23:50 +08:00
samuele3 e6fd1fece1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCheck 2013-11-07 15:28:48 +08:00
samuele3 8c025a2cee Reslove the linux compiled error 2013-11-07 15:12:19 +08:00
boyu0 eb508e4728 issue #2771: fix PhysicsWorld functions name readadd/removexxx -> doadd/removexxx delayTestAdd/Removexxx -> add/removexxxOrDelay 2013-11-07 15:12:13 +08:00
boyu0 a02fd7c6da issue #2771: fix PhysicsWorld some bugs 2013-11-07 14:40:09 +08:00
boyu0 f2cd5ca630 issue #2771: fix body and joint memory bugs. add removeFormWorld and destroy to PhysicsJoint, and add a destroy param to PhysicsWorld->removeJoint() 2013-11-07 14:17:57 +08:00
CaiWenzhi af5ab02bc7 temp commit 2013-11-07 14:00:51 +08:00
CaiWenzhi cf20ae03ee Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-07 10:01:00 +08:00
CaiWenzhi fa0011346e fixed linux build error 2013-11-07 09:58:24 +08:00
Ricardo Quesada ddb0111392 continue replacing `const char*` with `const std::string&` 
This patch includes:

* Continue replacing `const char*` with `const std::string&`  where it makes sense.
* It also removes some Hungarian notation from the code.
* It fixes some indentation issues in part of the code
* It replaces `int` or `unsigned int` with `long` where it makes sense.
 2013-11-06 17:05:13 -08:00
Nite Luo 21cd03bc13 Remove transform from QuadCommand, NewSprite using world coordinates 2013-11-06 16:39:20 -08:00
Nite Luo 63324db70d Subclass QuadCommand 2013-11-06 14:57:42 -08:00
Nite Luo 3108d499e5 use placeholder logic to generate material id 2013-11-06 14:24:56 -08:00
Michael Contento b7173cd60d add Sprite::setScale(float, float) 2013-11-06 14:42:31 +01:00
James Chen d6d041f561 issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00
CaiWenzhi e765eb1e7a Test commit 2013-11-06 18:30:09 +08:00
CaiWenzhi 7163dd4d76 Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 2013-11-06 18:13:51 +08:00
CocosRobot 8a836dc477 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 09:38:34 +00:00
CaiWenzhi 94896b5b74 Modify mk files 2013-11-06 17:20:14 +08:00
2youyou2 3ea0d2f12d change override function 2013-11-06 16:37:30 +08:00
2youyou2 73e5310bf6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-06 16:29:54 +08:00
CaiWenzhi 12570b5e8f temp commit 2013-11-06 16:20:01 +08:00
CaiWenzhi 7a207431cd Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch 
Conflicts:
	cocos/gui/UIHelper.h
 2013-11-06 16:13:10 +08:00
2youyou2 fcf0b1ef5f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-06 16:06:37 +08:00
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
CocosRobot d990699417 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 08:00:35 +00:00
James Chen 9d3716e964 Merge pull request #4109 from HoGarfield/JS_Call 
Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue
 2013-11-05 23:56:03 -08:00
boyu0 6c27a0df0b issue #2771: make api more friendly 2013-11-06 15:43:29 +08:00
garfield_ho f36fd002cd Remove duplicate 2013-11-06 15:40:23 +08:00
2youyou2 efd8f62992 add virtual 2013-11-06 15:40:06 +08:00
garfield_ho f6070406cd Missing add "JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET " before calling JS_CallFunctionValue 2013-11-06 15:31:58 +08:00
James Chen 2e80e95a37 [Linux] compilation fix for PR #4099 2013-11-06 15:26:33 +08:00
2youyou2 12d6bc1722 1. change CCARRAY_FOREACH to range-based loop 2013-11-06 15:25:44 +08:00
James Chen 4e4798fdcc Merge commit 'refs/pull/4099/head' of https://github.com/cocos2d/cocos2d-x into 64bit-fix 2013-11-06 15:15:47 +08:00
James Chen 33a243155f Merge pull request #4107 from dumganhar/cmake 
issue #3113: 32Bit fix and 13.10 32bit complication is ok.
 2013-11-05 23:09:23 -08:00
James Chen f3c40a3e7a issue #3113: 32Bit fix and 13.10 32bit complication is ok. 2013-11-06 14:54:35 +08:00
boyu0 a01fcc6f36 issue #2771: move header definition to first line 2013-11-06 14:51:56 +08:00
CocosRobot d7ed908818 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-06 06:20:17 +00:00
minggo a416a6b258 Merge pull request #4102 from ricardoquesada/uses_string 
Uses `const std::string&`
 2013-11-05 22:14:27 -08:00
2youyou2 f05c1590ae 1.fix particle kCCPositionTypeFree state bug 2013-11-06 11:20:16 +08:00
Ricardo Quesada 555f3609c8 Uses `const std::string&` 
... instead of const char*

* Because it is more robust
* and it is faster... yes faster.

It is faster because internally some of our classes use std::string
(like FileUtils and Dictionary) so converting back-and-forth from const
char * to std::string is very expensive.

It is faster to have everthing in std::string as soon as possible to
prevent further conversions.

There are still some parts of the code that require conversion, but
most of the code was converted.
 2013-11-05 19:02:03 -08:00
Ricardo Quesada 84a6aa29cd Adds more 64-bit fixes 
Replaces more `int` with `long` where it makes sense.

Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
 2013-11-05 17:36:44 -08:00
Nite Luo 51fb1edc0c Fix sorting bug 2013-11-05 17:00:34 -08:00
Chris Hannon 471dd07f3b [android] update nativeactivity.cpp to work with changes made in commit 0220f27 (AMD support), changing int to long int for the second argument in most touch callbacks 2013-11-05 15:54:31 -05:00
2youyou2 8b86373b08 1.Change to range-based loop 2013-11-05 20:33:29 +08:00
boyu0 af129e25f0 issue #2771: change some coding style 2013-11-05 20:02:58 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
CocosRobot 47e0d343ff [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 11:30:43 +00:00
James Chen 64b9cba5d5 Merge pull request #4092 from samuele3hu/developCCS 
issue 2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs'
 2013-11-05 03:24:20 -08:00
samuele3 66256e9ad7 issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccs' 2013-11-05 17:48:29 +08:00
samuele3 b9e5d4bc91 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 17:37:54 +08:00
samuele3 61d8f9673c issue #2868:Move armature related lua binding from namespace 'cc' to namespace 'ccd' 2013-11-05 17:34:25 +08:00
CocosRobot 8c75cd0dfa [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 08:07:15 +00:00
boyu0 8c62bf813f issue #2771: enhance API and add Slice demo 2013-11-05 15:54:33 +08:00
James Chen 963d7f3bd0 Changes the touch id declaration from int to long. 2013-11-05 15:49:58 +08:00
James Chen 11e6a277be Merge commit 'refs/pull/4086/head' of git://github.com/cocos2d/cocos2d-x into riq-arm64 2013-11-05 15:49:48 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null 
2. Remove CocoStudio/Armature files
 2013-11-05 15:32:13 +08:00
samuele3 b76865c692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-05 15:11:05 +08:00
samuele3 b445f0824a issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples 2013-11-05 15:09:51 +08:00
CocosRobot 5cecc93c3e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-05 06:31:26 +00:00
2youyou2 b076711b69 fix compile error 2013-11-05 13:42:27 +08:00
2youyou2 25196072f2 1. change color json format 
2. fix tween easing
3. fix CCBone crate bug
 2013-11-05 11:57:20 +08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
Ricardo Quesada 24ecbc426c removes Hungarian notation 
from CCACtionManager and fixes some 64-bit issues.
 2013-11-04 16:30:50 -08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
Nite Luo e4ffd250cb Simple implementation of RenderCommand and RenderQueue 2013-11-04 09:14:22 -08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen f17aa8b450 Move the library of fmod to external folder. 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 59adba1a6d Updating physics/CMakeLists.txt 2013-11-04 21:03:07 +08:00
James Chen c085412636 [CMake] TestLua and HelloLua is ok. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen e560de6e4e HelloCpp works. 2013-11-04 21:03:07 +08:00
James Chen 8676523433 Adding CMakeLists.txt 2013-11-04 21:03:07 +08:00
boyu0 46710c5f06 issue #2771: delay load 2013-11-04 19:26:34 +08:00
boyu0 00acd67ff3 issue #2771: finish OneWayPlatform demo and fix some bugs 2013-11-04 14:36:38 +08:00
CocosRobot 1cf0a926e1 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-04 02:46:22 +00:00
minggo 25b0ffe853 Merge pull request #4022 from boyu0/iss2771_physical 
issue #2771: physical
 2013-11-03 18:40:14 -08:00
James Chen a340f88477 Merge pull request #4073 from ledyba/fix_ccuserdefault 
closed #3107: When parsing XML using TinyXML, the data size has to be specified. Otherwise, XMLDocument::Parse(data) will treat data as a null-terminal string. It may cause potential issues.
 2013-11-03 00:34:48 -07:00
psi 5443fc0d07 pXmlBuffer is not null terminated 2013-11-03 11:17:04 +09:00
James Chen e1f821c25d Merge pull request #4068 from michaelcontento/trigger-onKeyPressed-while-down 
Trigger onKeyReleased only after the key has been released[ci skip]
 2013-11-02 07:12:40 -07:00
James Chen fd21e3ea38 closed #3106: fixed: EventListeners can't be removed sometimes. 2013-11-02 22:08:08 +08:00
James Chen a4b28353a7 Merge commit 'refs/pull/4069/head' of git://github.com/cocos2d/cocos2d-x into eventdispatcher-fix 2013-11-02 21:47:24 +08:00
psi 06f166f613 why not search _toAddedListeners?? 2013-11-02 16:03:54 +09:00
Michael Contento ffad18a1ed Trigger onKeyReleased only after the key has been released 2013-11-02 06:15:08 +01:00
boyu0 04c8e9f34e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-02 00:12:14 +08:00
CocosRobot 6360c40725 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 13:03:20 +00:00
James Chen e2f14635e8 Merge pull request #4065 from dumganhar/develop 
closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
 2013-11-01 05:55:32 -07:00
James Chen 50c4261092 closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter. 2013-11-01 20:53:51 +08:00
James Chen 84e8aaf016 Merge pull request #4012 from ledyba/fix_inclusion_phys 
include climits for UINT_MAX
 2013-11-01 04:55:51 -07:00
CocosRobot a272bcd6ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 10:02:54 +00:00
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07:00
boyu0 6d37aa8cd5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-01 17:39:09 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
boyu0 a2adbff2c8 issue #2771: fix some code style 2013-11-01 16:32:27 +08:00
boyu0 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
CocosRobot 8aac938531 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 07:42:11 +00:00
James Chen 9177f78e5e Merge pull request #4046 from dumganhar/ios-mac-project-fix 
iOS and Mac project fix[ci skip]
 2013-11-01 00:24:08 -07:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
CocosRobot 6eb6809b2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 06:52:31 +00:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +08:00
2youyou2 a9054ba14a 1.add method to set collider filter 2013-11-01 14:36:44 +08:00
James Chen db6bce4cf0 Merge pull request #4023 from samuele3hu/developHttp 
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
 2013-10-31 20:40:29 -07:00
James Chen 3a8c052ae5 Merge pull request #4039 from dumganhar/spv25 
issue #2826: Bug fix of 'js::IsInRequest'
 2013-10-31 19:56:09 -07:00
James Chen baccf828f3 closed #2826: Removing js::IsInRequest in ScriptingCore.cpp for win32. 2013-11-01 10:45:01 +08:00
minggo f684dc0ff7 Merge pull request #4025 from Dhilan007/di2893 
issues #2893:perfect new label
 2013-10-31 18:46:30 -07:00
minggo 0a9755bcc4 Merge pull request #4037 from samuele3hu/developLabelTTF 
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
 2013-10-31 18:45:42 -07:00
Ricardo Quesada 17af5b6850 Adds flags in GLProgram to prevent sending uneeded uniforms 2013-10-31 17:56:15 -07:00
James Chen 074f688d95 Merge pull request #4030 from dumganhar/spv25 
[sp v25] Updating SpiderMonkey library to FFv25.
 2013-10-31 07:08:09 -07:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +08:00
James Chen 8884c58ac1 issue #2826: Updating ScriptingCore.cpp. runScript small fix. 2013-10-31 21:03:06 +08:00
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +08:00
boyu0 dec749a692 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-31 18:20:32 +08:00
boyu0 2efef34144 issue #2771: fix vs compile errors 2013-10-31 18:18:02 +08:00
Dhilan007 b8faaeba59 issus #2893:improve new label 2013-10-31 17:52:22 +08:00
2youyou2 005d3c0121 1. fix if frame event is at the last frame, it may emit event several times 
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
 2013-10-31 17:28:14 +08:00
samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-31 17:22:14 +08:00
samuelhu 80c29b5a9c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLabelTTF 2013-10-31 17:01:43 +08:00
samuelhu 15cf519757 issue #2970:crash for CCLabelTTF when setting dimension width less than the font height 2013-10-31 16:59:55 +08:00
James Chen 4b2429186c closed #3093: The last test of OpenglTest crashes on Windows. 2013-10-31 16:27:00 +08:00
Nite Luo 771844fc58 Fix android build after adding MouseEvent and MouseTest 2013-10-31 00:40:38 -07:00
samuelhu de4b4dcc73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge 2013-10-31 15:23:25 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
James Chen f478e2d2a5 issue #2826: Bug fixes for win32. 2013-10-31 15:15:52 +08:00
James Chen 6f978c5cbd issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro. 2013-10-31 15:13:49 +08:00
Nite Luo 49a2acfbd4 Merge branch 'develop' into mousewheel_mac 2013-10-31 00:10:45 -07:00
Nite Luo a27975763f Add MouseEvent to win32 build 2013-10-31 00:04:39 -07:00
dingpinglv 7e8faed7af fixed #3048: rename some comments 2013-10-31 14:36:17 +08:00
dingpinglv f172abbc14 fixed #3048: add some comments for cc.rect 2013-10-31 14:31:25 +08:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
dingpinglv c116d070d3 Closed #3048: cc.rect can receiving different type parameters now 2013-10-31 14:16:42 +08:00
James Chen 0f7a99f898 [sp v25] Don't use 'using namespace std;' to make android build happy. 2013-10-31 11:15:18 +08:00
James Chen 541a0478ac [sp v25] Removing unused comments in main.js 2013-10-31 11:15:18 +08:00
James Chen d2fc29dbfa [sp v25] Updating Debugger script. 2013-10-31 11:15:17 +08:00
James Chen a81998ccf6 [sp v25] Debugger script, loading file is ok. 2013-10-31 11:15:17 +08:00
James Chen d1b88b0a78 [sp v25] Updating auto-generated and bindings-generated submodules. 2013-10-31 11:15:17 +08:00
James Chen 3b86d6398f [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
Dhilan007 12db6a32ab issues #2893: 
1.Texture atlas are create on demand, based on the characters used in the label.
  2.Create Quads (and not sprites) for each letter.
 2013-10-31 10:49:37 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
boyu0 e8d06496d0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-30 17:27:09 +08:00
boyu0 391cda44ef issue #2771: edit listener 2013-10-30 15:53:58 +08:00
yinkaile 80b97be6f4 update develop 2013-10-30 11:34:16 +08:00
samuelhu c08a09a7e0 #3049:Add LICENSE_JSON4LUA and some constant values. 2013-10-30 10:52:04 +08:00
yinkaile 8fa8b9f844 update develop 2013-10-30 09:41:40 +08:00
samuelhu 471bbb8af9 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:21:15 +08:00
samuelhu 663b27d1e7 #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:06:02 +08:00
samuelhu b611177a65 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-10-29 17:58:00 +08:00
samuelhu 70082ddc29 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
boyu0 cae9a3e54f issue #2771: add physics pump demo and fix bugs 2013-10-29 17:31:35 +08:00
yinkaile 2d3df69982 fix add display 2013-10-29 16:57:06 +08:00
James Chen 5c8424423e issue #3069: Update ios/CCDevice.mm. 2013-10-29 16:29:29 +08:00
James Chen e2ce714463 issue #3069: Update device.mm for iOS. 2013-10-29 16:20:42 +08:00
James Chen ca598f29eb Merge pull request #4008 from dumganhar/touchevent-refactor 
issue #3069: Refactor and Improve EventDispatcher
 2013-10-29 00:46:56 -07:00
James Chen 91932ea906 issue #3069: Fixing compilation errors. 2013-10-29 15:36:43 +08:00
James Chen bb568e84e8 Updating auto generated binding codes. 2013-10-29 15:09:13 +08:00
James Chen fbd04a476a issue #3069: Updating comments in CCEventListenerCustom.h. 2013-10-29 15:02:26 +08:00
James Chen 01579e12b0 issue #3069: Remove unused ID. 2013-10-29 15:01:39 +08:00
James Chen 5698dcd0e1 issue #3069: Protecting some methods in EventListener, make EventDispatcher as its friend class. 2013-10-29 14:58:47 +08:00
James Chen 296978a9be issue #3069: Separate 'EventDispatcher::removeEventListeners' to 'removeEventListeners' and 'removeCustomEventListeners'. 2013-10-29 14:57:16 +08:00
samuelhu 3508213615 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-29 11:45:19 +08:00
samuelhu a4d028e905 issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
Andrew Glass 06bd7fafd5 Clear NoSuchMethodError Exception when JniHelper fails to find methodID 
When calling GetMethodID a NoSuchMethodError will be raised if the method cannot be found.
See http://docs.oracle.com/javase/7/docs/technotes/guides/jni/spec/functions.html#wp16660
This exception should be cleared if JNI execution is to be continued.
Currently JniHelper informs that the method is not found, but there is no way to continue execution without manually clearing the exception. This prevents checking for the existence of a method and recovering from it being missing.

This fix will clear the exception if JniHelper fails to find the method.
 2013-10-28 18:40:58 +00:00
boyu0 66d1bbd89f issue #2771: edit physics effect with all bodies and fix some bugs 2013-10-28 16:17:19 +08:00
James Chen 8b7d1934c8 issue #3069: Using enum class for define Event type and EventListener type. 2013-10-28 16:00:01 +08:00
boyu0 d0d8694091 issue #2771: fix some retain/release bugs 2013-10-28 11:08:41 +08:00
James Chen 8d11f484a9 issue #3069: Removing unused comments. 2013-10-28 10:52:23 +08:00
James Chen 0622434321 issue #3069: Using `std::string` to initialize `EventCustom`. It will be easier for editor parser to emit callback event. 2013-10-28 10:49:21 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
psi 9ecc0c6db8 include climits for UINT_MAX 2013-10-26 13:33:31 +09:00
James Chen 6c6757a04e issue #3069: Moving s_eventPriorityIndex to member variable of EventDispatcher. 2013-10-25 17:03:50 +08:00
James Chen 063b012a9c int --> Event::Type 2013-10-25 16:43:04 +08:00
James Chen cb7e0b391b issue #3069: Removing unused variables in CCEventListenerTouch.h. 2013-10-25 16:37:40 +08:00
James Chen 9bf44a6c83 issue #3069: Renaming 'removeListeners' to 'removeEventListeners'. 2013-10-25 16:34:26 +08:00
James Chen cf20329b71 issue #3069: Removing unused codes in UILayer. 2013-10-25 16:33:54 +08:00
James Chen 0d2d522f12 issue #3069: int --> EventListener::Type. 2013-10-25 16:15:37 +08:00
James Chen 312e1bd27c [Dispatcher] Updating comments. 2013-10-25 15:40:21 +08:00
James Chen 1339ef7ecb [JSB] These are only for v2.x JSB compatibility after removing controller codes in Layer. 2013-10-25 15:20:06 +08:00
James Chen efa5afb1c3 [Dispatcher] Removing unused codes in Layer. 2013-10-25 15:19:25 +08:00
James Chen 30a3199a91 [Dispatcher] Removing unused codes. 2013-10-25 15:19:04 +08:00
James Chen 27b71ba73c Use integer as event type and listener type. 2013-10-25 10:53:47 +08:00
James Chen c4f9acbee7 disable DUMP_LISTENER_ITEM_PRIORITY_INFO. use std::unordered_map instead of std::map. 2013-10-25 10:53:47 +08:00
James Chen 9632cd7949 memoryleak fix. 2013-10-25 10:53:47 +08:00
James Chen dc6e201eb6 bug fix for eventdispatcher. 2013-10-25 10:53:46 +08:00
James Chen 5ecb664a58 crash and memory leak fix. 2013-10-25 10:53:46 +08:00
James Chen aeef62d893 bug fix for EventDispatcher. 2013-10-25 10:53:46 +08:00
James Chen e59c49a5e3 fix crash. 2013-10-25 10:53:46 +08:00
James Chen a56475e872 Updating jsb. 2013-10-25 10:53:46 +08:00
James Chen 6f9bee5b1a bug fix in EventDispatcher. 2013-10-25 10:53:46 +08:00
James Chen 9ed263056c Use eventDispatcher to dispatch event. Remove controller codes in Layer. 2013-10-25 10:53:46 +08:00
James Chen 1f3863e787 Event Dispatcher refactor commit. TestCpp could run. 2013-10-25 10:53:45 +08:00
James Chen f7e2c63230 Refactor event dispatcher. Remove non-node relative member variables. 2013-10-25 10:53:45 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
James Chen 779e539658 Remove event controller codes from Layer class. HelloCpp works. 2013-10-25 10:53:45 +08:00
boyu0 fdcf019665 issue #2771: implement contact callbacks 2013-10-25 10:31:22 +08:00
Dhilan007 56ef197146 update the reference to cocos2d-x repo. 2013-10-24 18:36:36 +08:00
Dhilan007 08960f1510 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2893 2013-10-24 18:16:44 +08:00
Dhilan007 fd993e2fa2 issues #2905:split jsbinding module 2013-10-24 17:54:57 +08:00
James Chen 10329de46c Merge pull request #4002 from boyu0/iss2771_physical 
issue #2771 physical
 2013-10-24 02:31:40 -07:00
samuelhu a5e479d2bb Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-24 11:14:20 +08:00
samuelhu d7689073e0 issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-24 11:12:21 +08:00
boyu0 a8ddca81bd issue #2771: fix some compile error in win32 2013-10-23 18:52:09 +08:00
minggo 914269b4bd Merge pull request #4001 from minggo/iss2905-adjust_folder 
issue #2905:ndk-r8e build ok now
 2013-10-23 02:47:05 -07:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
boyu0 912a9a2887 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-23 17:41:52 +08:00
boyu0 899f720efa issue #2771: implement getShapeAtPoint and getShapesAtPoint 2013-10-23 17:28:23 +08:00
Dhilan007 dfd69d262a adjust std:function support 10 parameter 2013-10-23 16:48:51 +08:00
ondesly 969b464b9b android & ios screen size change support 2013-10-23 12:29:59 +04:00
minggo 4952df576b Merge pull request #3996 from boyu0/iss2771_physical 
issue #2771: physical
 2013-10-22 20:45:55 -07:00
boyu0 17422c3123 issue #2771: fix some compile error in win32 2013-10-23 11:08:21 +08:00
boyu0 51801d9218 issue #2771: fix some compile error in android and win32 2013-10-23 10:11:08 +08:00
samuelhu 26caaa0a36 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-23 09:57:21 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
boyu0 24561860f0 issue #2771: add ray cast test 2013-10-22 18:00:24 +08:00
samuelhu 5f769b2313 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-10-22 16:52:44 +08:00
James Chen feee6ca84b Merge pull request #3978 from HoGarfield/cc.RESOLUTION_POLICY 
Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView
 2013-10-22 01:34:44 -07:00
James Chen 59b5c26abf Merge pull request #3991 from HoGarfield/AnimationManager 
closed #3040: Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback
 2013-10-22 01:30:06 -07:00
samuelhu be1f17ca0f issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
minggo d968ef6949 Merge pull request #3990 from Dhilan007/di2905 
issues #2905:add miss file
 2013-10-22 00:58:34 -07:00
garfield_ho 0002815acb Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback 2013-10-22 15:56:35 +08:00
Dhilan007 31a2217178 issues #2905:add miss file 2013-10-22 15:56:08 +08:00
garfield_ho 55d45081f6 Fixed name 2013-10-22 15:41:43 +08:00
James Chen 74b514c299 Merge pull request #3979 from HoGarfield/AutoPlay-Animation 
closed #3033: CCBReader can't play sequence automatically in JSB.
 2013-10-22 00:30:47 -07:00
minggo d07fbb8903 Merge pull request #3974 from boyu0/iss2771_physical 
issue 2771: physical
 2013-10-21 22:44:22 -07:00
boyu0 e99b80b304 issue #2771: implements rayCast and rectQuery 2013-10-21 23:16:21 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
garfield_ho 464d1598d2 fixed bug of CCBReader that can not autoplaySequence 2013-10-19 16:48:57 +08:00
garfield_ho 54ac8f3537 Add cc.RESOLUTION_POLICY to jsb_cocos2d.js,so it can use setDesignResolutionSize in cc.EGLView 2013-10-19 16:44:14 +08:00
boyu0 5741a16620 issue #2771: edit some include head file path 2013-10-18 17:47:29 +08:00
boyu0 6e2c4801f8 Merge https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 16:05:29 +08:00
boyu0 6aef4476d9 issue #2771: edit some mistake when merge 2013-10-18 15:55:47 +08:00
Dhilan007 6ce34288e0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 15:53:26 +08:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
boyu0 d12ee5f120 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-10-18 15:34:13 +08:00
Dhilan007 8fb0327597 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 14:57:33 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
Dhilan007 86384b0df1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-18 12:36:18 +08:00
dualface 8f2f524f2d fix tolua_fix, cleanup peertable after object deleted 2013-10-18 11:30:28 +08:00
James Chen 39afa3b8df Merge pull request #3967 from dumganhar/change-url 
Changing the submodule URL for 'auto-generated'.
 2013-10-17 19:00:36 -07:00
James Chen 8c0d7e151c Updating the submodule reference of 'auto-generated'. 2013-10-18 10:02:47 +08:00
Dhilan007 66c2fe26ef Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 22:34:09 +08:00
minggo 9c3cac759c issue #2905:simple game and assets manager build ok on android 2013-10-17 18:39:37 +08:00
Dhilan007 6f39f903e3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 16:23:19 +08:00
James Chen fd0e84bfa2 Merge pull request #3963 from kpkhxlgy0/use 
closed #2994: Can't click the area that outside of keyboard to close keyboard when using EditBox
 2013-10-17 00:36:33 -07:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
XiaoLongHan a2de02cc19 Change the class name of textfield to compare, so that you can touch anywhere outside of the virtual keyboard. 2013-10-17 14:21:55 +08:00
Dhilan007 546bc3aa32 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-17 11:33:10 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
Dhilan007 a91621ae5a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:51:02 +08:00
James Chen afe2b8e0c1 Update auto-generated submodule manually. 2013-10-16 17:37:34 +08:00
Dhilan007 c6344875de Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 17:30:51 +08:00
James Chen d283c66803 Merge pull request #3955 from dumganhar/iss2905-folder-structure 
issue #2905: [iOS Mac] HelloLua and TestLua work now.
 2013-10-16 02:17:43 -07:00
James Chen 225738ecc5 issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
minggo 91eada6c1e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 352d1f6768 issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
Dhilan007 3d1f734326 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-10-16 15:44:43 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
Dhilan007 5116e91c4b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into di2905 2013-10-16 11:00:22 +08:00
minggo 410280a8d3 Merge pull request #3945 from minggo/iss2905-adjust_folder 
issue #2905: testcpp bild ok on Android
 2013-10-15 03:02:12 -07:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
Dhilan007 2865ad798b issues #2905:Updating project configuration for folder change. 2013-10-15 10:18:37 +08:00
James Chen 438fe70287 issue #2905: [iOS, Mac] HelloCpp works now. 2013-10-14 15:53:14 +08:00
minggo 92e0dbe0c1 issue #2905:add ccUtils.cpp 2013-10-14 14:56:57 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
ThePickleMan 870f7de357 Readded trimmed semicolon 2013-10-13 23:12:41 -05:00
PickleMan 01ebb2ac29 Added triangle, quad bezier, cubic bezier drawing to DrawNode 2013-10-13 23:41:55 -04:00
minggo 1751cc3d89 Merge pull request #3935 from minggo/remove-subfolder 
issue #2905: remove sub folders except platform
 2013-10-13 18:40:02 -07:00
minggo 49d7bbd600 issue #2905: remove sub folders except platform 2013-10-12 15:41:45 +08:00
minggo 5182a3c978 Merge pull request #3933 from minggo/iss2905-adjust_folder 
adjust folder structure
 2013-10-12 00:27:48 -07:00
minggo 8eeb911e8f issue #2905: adjust folder structure 2013-10-12 15:25:45 +08:00
James Chen f6275667bf Removing unused ios projects. 2013-10-12 15:02:28 +08:00
James Chen 7de6646213 Don't ignore (D|d)ebugXXX folders or files. And move scripting/javascript/bindings/js to 'scripting/javascript/script/' folder. 2013-10-12 14:56:40 +08:00
minggo 19ee87e29a issue #2905: step2 Box2D -> box2d 2013-10-12 14:03:04 +08:00
minggo 1f38636e84 issue #2905: step1 Box2D -> box2d 2013-10-12 14:02:13 +08:00
minggo 5acbe663e0 issue #2905: add missing files 2013-10-12 13:44:57 +08:00
minggo ad6325b0dd fix conflicts 2013-10-12 11:31:32 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00