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

361 Commits

Author SHA1 Message Date
minggo 0ac9022201 fix a typo 2013-11-27 10:02:32 +08:00
minggo 85002285c2 override addChild in Sprite to fix error in binding generator 2013-11-27 09:50:47 +08:00
Ricardo Quesada 2f1dffe46b Adds performFunctionInCocos2dThread 
... in Scheduler
 2013-11-26 16:58:14 -08:00
Ricardo Quesada b7f7b0dae4 Reports wether the build is DEBUG or RELEASE 
Reports wether the build is DEBUG or RELEASE in Configuration
 2013-11-26 14:36:31 -08:00
boyu0 8346fe4b4d issue #2771: edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX 2013-11-26 18:22:52 +08:00
minggo fcf43823b4 remove unneeded codes 2013-11-26 17:53:34 +08:00
boyu0 0100c05a93 issue #2771: fix compile errors 2013-11-26 17:29:09 +08:00
James Chen 63702188be issue #3258: Compilation error fix for linux port. 2013-11-26 15:56:43 +08:00
James Chen b55e8f17c7 issue #3258: MenuItemFont has empty argument create function now. 2013-11-26 15:44:21 +08:00
boyu0 99d904363a issue #2771: delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
Ricardo Quesada b6f6e72c94 Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCActionInstant.h
 2013-11-25 13:59:24 -08:00
Ricardo Quesada cc5a03f21a updates cocos2d version 2013-11-22 16:58:05 -08:00
Ricardo Quesada 447a34655a RenderTexture contructor ctor is public again 2013-11-22 16:14:05 -08:00
Ricardo Quesada 9b52af010d Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN 
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
 2013-11-22 16:09:05 -08:00
Ricardo Quesada 3f1983214f Effects have protected contructors 
and disallowed copy + assign
 2013-11-22 15:07:58 -08:00
Ricardo Quesada 4d7e56b44a fix indentation 2013-11-22 09:42:21 -08:00
Jason Xu 7c5784005c Fix: on android, Device::setAccelerometerInterval will causes dead loop 2013-11-23 00:07:15 +08:00
samuele3 eb3f5eb629 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView 2013-11-22 11:52:32 +08:00
samuele3 192deb7952 issue #3228: Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case 2013-11-22 11:51:07 +08:00
Ricardo Quesada 515786a7ee adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons 
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
 2013-11-21 17:06:06 -08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
Ricardo Quesada 90f51e0dab Merge branch 'develop' into constructors_are_protected 2013-11-20 11:26:55 -08:00
Ricardo Quesada 6a8c4784a4 Adds some #pragma mark love 2013-11-20 11:26:33 -08:00
Ricardo Quesada d3c44cbb0b Merge branch 'develop' into constructors_are_protected 
Conflicts:
	cocos/2d/CCLayer.h
 2013-11-20 11:23:03 -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 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
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
Ricardo Quesada 9a51d6c0ba Merge branch 'develop' into constructors_are_protected 2013-11-19 17:59:43 -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
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
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 bd00e6fabb Merge pull request #4326 from dabingnn/develop_hotFix 
[ci skip]Develop hot fix
 2013-11-18 19:33:07 -08:00
Huabing.Xu fff851a8aa HotFix: change tab to space 2013-11-19 11:17:02 +08:00
Dhilan007 ce0a6d5b57 fix miss bind setGrid\getGrid for JS. 2013-11-19 10:33:11 +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
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
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
minggo 30b7ac8dd1 fix crash of textinput test case 2013-11-18 15:14:48 +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
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
boyu0 90f07f680f Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical 2013-11-18 11:22:20 +08:00
Huabing.Xu 09f27f1d16 HotFix: remove Mac platform Image::saveToFile assert 2013-11-18 10:14:57 +08:00
minggo 982a23af3d fix some hungarial 2013-11-16 21:08:00 +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
Ricardo Quesada 417657b5a9 Merge branch 'develop' into constructors_are_protected 2013-11-15 10:11:49 -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
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
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
Ricardo Quesada cd0ba6850c Merge branch 'develop' into constructors_are_protected 2013-11-14 11:57:18 -08:00
minggo 2f7f05d1d7 fix asynchronize loading bug 2013-11-14 18:39:23 +08:00
Huabing.Xu 4894632467 Fix bug: add android, fix android can not compile 2013-11-14 17:14:35 +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
minggo a057274115 set z order after reorder 2013-11-14 14:08:50 +08:00
Huabing.Xu 46ef7a7fbc Fix bug: deprecate old interface 2013-11-14 13:35:17 +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 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 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
Ricardo Quesada d590986e73 Constructors are protected 2013-11-13 15:55:36 -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
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
samuele3 26c3266711 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS 2013-11-13 10:15:24 +08:00
Ricardo Quesada 4848e3d3bb correct size for Listener ID 2013-11-12 17:14:51 -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
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
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
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
James Chen cc3a6ebda9 Merge pull request #4150 from ledyba/fix_ccdevice 
Close X Display
 2013-11-11 17:40:32 -08:00
Ricardo Quesada d6446e9b14 calls `delete[]` instead of `delete` 
calls `delete[]` instead of `delete`
 2013-11-11 16:07:46 -08:00
James Chen 51cfd3fb4b Merge pull request #4151 from pyrasis/develop 
[Win32] fix compile error.
 2013-11-11 04:42:42 -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
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 0151ac60ba fix 64bit warning. unsigned int (int) —> long. 2013-11-11 16:45:44 +08: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
Huabing.Xu 3fc16256ab issue #3025: move deprecated texture cache implementation to cpp file 2013-11-11 15:40:12 +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
James Chen 55cf30b7c8 HASH_FIND_INT —> HASH_FIND_PTR for CCAcitonManager.cpp and CCScheduler.cpp. 2013-11-11 14:36:43 +08:00
Huabing.Xu 55b9462b17 issue #3025: directly use _textureCache in Director 2013-11-11 14:21:41 +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
boyu0 6c1144ee79 issue #2770: fix some warning 2013-11-11 12:49:38 +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
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
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 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
Ricardo Quesada 5faae4a51e removes exe bit from text files 2013-11-08 11:30:50 -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
Huabing.Xu 6f1e98df34 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into iss3025_TextureCache 2013-11-08 13:50:22 +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
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
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
Michael Contento 0160bec3ad Colors are now compare- and explicit convertible 2013-11-07 18:13:33 +01: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
minggo b9b14571ac fix compiling erros on Android 2013-11-07 17:16:31 +08:00
samuele3 8c025a2cee Reslove the linux compiled error 2013-11-07 15:12:19 +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
Michael Contento b7173cd60d add Sprite::setScale(float, float) 2013-11-06 14:42:31 +01: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
minggo a416a6b258 Merge pull request #4102 from ricardoquesada/uses_string 
Uses `const std::string&`
 2013-11-05 22:14:27 -08:00