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

828 Commits

Author SHA1 Message Date
boyu0 c8c0e2270e issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
Ricardo Quesada 61cc365d9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCGLProgram.h
	cocos/2d/CCLabelTTF.h
 2013-12-12 14:41:42 -08:00
Ricardo Quesada f4c68e4eef More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
Ricardo Quesada a8c317bd83 getDescription() works as expected 
renames `description` to `getDescription`. Adds `virtual`  to it.
Adds `getDescription` to missing nodes.
 2013-12-12 14:30:22 -08:00
Ricardo Quesada 29a15c885a Merge branch 'develop' into newRenderer 2013-12-12 11:44:09 -08:00
boyu0 d7106d49be Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-12 17:04:21 +08:00
Huabing.Xu 5509bd48ef remove _grid 2013-12-12 16:21:21 +08:00
Huabing.Xu 08bfbbc582 Fix project can not compile after rebased pull 2013-12-12 16:20:52 +08:00
Huabing.Xu 256fe13d3f other grid scene transitions can work now 2013-12-12 15:15:43 +08:00
Huabing.Xu f1cac00dd7 TransitionPageTurn can work now 2013-12-12 15:15:43 +08:00
Huabing.Xu ea9d744d79 add setGridTarget method, grid node now can affect its target and its child 2013-12-12 15:15:43 +08:00
Huabing.Xu 09a9b1f557 remove setGrid getGrid in class Node 2013-12-12 15:15:43 +08:00
Huabing.Xu aad617e200 add class GridNode 2013-12-12 15:10:04 +08:00
minggo 040c42ebfd use ssize_t for index 2013-12-12 14:48:26 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
minggo ab23b47043 use ssize_t for capacity and index in containers 2013-12-12 14:48:26 +08:00
James Chen b5bab598b3 issue #2790: Disables deprecated warning for android to make Travis-CI happy. 2013-12-12 10:35:13 +08:00
James Chen b2e8bdce1e issue #2790: Uses StringUtils::format for Node::description(). 2013-12-12 09:47:35 +08:00
James Chen 976bef8b68 issue #2790: StringUtils::toStringWithFormat —> StringUtils::format. 2013-12-12 09:37:56 +08:00
Ricardo Quesada 6d1abc7d4d Merge branch 'develop' into newRenderer 2013-12-11 15:28:05 -08:00
James Chen 9e637a3a3b issue #2790: GLProgram::getXXXLog return `std::string` to prevent using CCString which was deprecated. 2013-12-11 22:35:37 +08:00
James Chen cc567a3077 issue #2790: Vector::remove —> Vector::erase. 2013-12-11 18:08:06 +08:00
James Chen be9bb6998b issue #2790: Deprecates Dictionary, Array, String, Integer, Bool, Float, Double classes. 
Also renames Map::remove to Map::erase.
 2013-12-11 18:08:06 +08:00
James Chen 49cc9719a6 issue #2790: log —> CCLOG. 2013-12-11 18:08:06 +08:00
James Chen 40bc797b1f issue #2790: Configuration::getValue has default value now. 2013-12-11 18:08:06 +08:00
James Chen 022df4c014 issue #2790: Removes test codes. 2013-12-11 18:08:05 +08:00
James Chen 2cda34d59a issue #2790: Deprecates CCDictionary, uses ValueMap for pure base data. Adds StringUtils class . 2013-12-11 18:08:05 +08:00
boyu0 00b115843c issue #3162: add updateColor function to Label and delete duplicate functions. 2013-12-11 16:38:47 +08:00
boyu0 7cbce905bf issue #3162: delete duplicate functions. 2013-12-11 16:12:14 +08:00
boyu0 463ae20ce6 issue #3162: Add layer cascade color and cascade opacity test, fix bugs 2013-12-11 15:57:20 +08:00
Ricardo Quesada 3b66d09bf5 Merge branch 'develop' into newRenderer 2013-12-10 11:10:55 -08:00
Ricardo Quesada 23222923bf Migrated code to Matrix4 2013-12-10 11:07:15 -08:00
Dhilan007 35eeebe64a add comments for include "CCStdC.h" only for windows 2013-12-10 23:13:21 +08:00
Dhilan007 abef5b59fa fix compile error for vs project 2013-12-10 21:20:52 +08:00
boyu0 a71394b122 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-10 18:03:41 +08:00
boyu0 083a0eea2a Remove all std::move in function returns. 2013-12-10 16:06:05 +08:00
Ricardo Quesada 0222c6544e Migration to Mat4x4 
Armature not migrated yet

Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
 2013-12-09 17:32:51 -08:00
Ricardo Quesada aa00137fde Merge branch 'develop' into newRenderer 2013-12-09 11:10:00 -08:00
boyu0 d0da73c365 Add _stencil is nil test, add warning log. 2013-12-09 14:00:10 +08:00
boyu0 d6d7923134 closed #3162: add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them 2013-12-09 11:32:28 +08:00
James Chen 908f5ed515 issue #2790: Fix for TMXObjectGroup::getObject. 2013-12-07 16:38:50 +08:00
James Chen 6b0589679b issue #2790: Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler 2013-12-07 14:25:24 +08:00
James Chen d7997cf0cc issue #2790: Updates MenuItemToggole 2013-12-07 14:24:31 +08:00
James Chen b0cb7c230a #issue #2790: Uses Vector<Scene*> for scenesStack in CCDirector. 2013-12-07 14:22:51 +08:00
James Chen 0091ca2b6f issue #2790: Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp. 2013-12-07 14:22:03 +08:00
James Chen 165cdf7fe6 issue #2790: Deprecates CCArray. 2013-12-07 10:48:02 +08:00
Ricardo Quesada 8df96b1a6e Layercolor uses the new API 2013-12-06 17:59:34 -08:00
Ricardo Quesada ba2f65c6b2 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 2013-12-06 17:42:48 -08:00
Ricardo Quesada ee0ef6bf46 ProgressTimer works OK 
Adds _modelViewTransform as  ivar of Node (temporary fix)
 2013-12-06 17:42:16 -08:00
Nite Luo 94255a9d52 Fix culling 2013-12-06 14:59:06 -08:00
Ricardo Quesada 439adafbcd Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 2013-12-06 11:57:19 -08:00
Ricardo Quesada 745541979b Particles working again. 
Paticle Batch working too: increased VBO_SIE to 10500
 2013-12-06 11:51:17 -08:00
Nite Luo 3e0bee706e Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command 2013-12-06 11:41:24 -08:00
Ricardo Quesada 97fb43b8d7 Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-06 11:19:12 -08:00
Ricardo Quesada 73b1e3bb9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCLabelAtlas.cpp
	cocos/2d/CCSprite.cpp
 2013-12-06 09:37:08 -08:00
boyu0 0e94d4f3b8 closed #3162: fix indent. 2013-12-06 18:23:31 +08:00
James Chen 6cd573fa7f issue #2790: Deprecates CCSet. 2013-12-06 18:16:58 +08:00
boyu0 4d0e3dbd8d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-06 18:16:26 +08:00
boyu0 af5f496861 issue #3162: Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed. 2013-12-06 18:07:16 +08:00
James Chen 0d30f2bbbb Merge pull request #4445 from dumganhar/iss2790-template-container 
issue #2790: Fix of JSB project broken after using Vector<T>
 2013-12-06 01:24:21 -08:00
minggo 368647c166 Merge pull request #4444 from minggo/fix-warning 
fix some warnings
 2013-12-06 01:07:03 -08:00
James Chen 9f6d2df63b Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container 2013-12-06 16:46:51 +08:00
James Chen b5978eeee6 issue #2790: Bindings-generator supports binding Vector<T> and some bug fixes. 2013-12-06 16:46:19 +08:00
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
minggo 0126aaa205 Merge pull request #4442 from minggo/use-schedule 
use Schedule::performFunctionInCocosThread
 2013-12-05 22:30:54 -08:00
Ricardo Quesada 81b06f06a9 Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCAtlasNode.h
 2013-12-05 22:24:41 -08:00
minggo 19c86c0e4f Merge pull request #4434 from martell/msys2 
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
 2013-12-05 22:23:45 -08:00
minggo eecd5d7980 Merge pull request #4441 from xhcnb/mem_leak_android_userdefault 
[ci skip]UserDefault::setDataForKey on android will cause memory leak
 2013-12-05 22:19:58 -08:00
minggo 1502fef7e4 use Schedule::performFunctionInCocosThread 2013-12-06 14:15:01 +08:00
Jason Xu 29bd5001ae UserDefault::setDataForKey on android will cause memory leak 2013-12-06 11:53:43 +08:00
Ricardo Quesada e699a3b765 Uses MV in Quad Command 2013-12-05 19:04:01 -08:00
Nite Luo 42de943662 Fix Bug for Sprite performance test 2013-12-05 14:25:45 -08:00
Nite Luo e3fc789070 Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-05 12:05:44 -08:00
darkdukey 5f902d95b3 Merge pull request #5 from dabingnn/newRendererParticleSystem 
New renderer particle system
 2013-12-05 12:05:18 -08:00
Ricardo Quesada f68dcd9969 Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/Classes/tests.h
 2013-12-05 11:47:46 -08:00
minggo b67d567a79 replace long with int or ssize_t 2013-12-05 17:22:22 +08:00
James Chen b520941c5c Reverts config of VS project. 2013-12-05 16:37:50 +08:00
James Chen 79700118db Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 
Conflicts:
	cocos/base/CCConsole.cpp
	cocos/base/CCConsole.h
 2013-12-05 16:26:04 +08:00
James Chen 2b857ebb52 Fixing compilation errors on windows. 2013-12-05 16:09:38 +08:00
Ricardo Quesada 6a034a91f1 Merge branch 'develop' into console 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-04 21:58:11 -08:00
Ricardo Quesada 73321199b9 Console: commands receives the char* 
The char* is passed in case the commands
need to sub-parse the arguments.
Very useful for QA.
For example, the could create a command called "click", and the command could
receive arguments.
 2013-12-04 21:51:08 -08:00
James Chen b0af2667f8 Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-05 12:48:32 +08:00
minggo ba62c88682 Merge pull request #4420 from dumganhar/iss2790-template-container 
[ci skip]issue #2790: (ONLY FOR REVIEW NOW)Template Containers for Reference counted classes, Value for Pure Data
 2013-12-04 20:06:24 -08:00
martell e0523c73f5 fixed CCImage for MSVC someone added std:tolower which broke it 2013-12-05 03:53:25 +00:00
James 373c3b01bf issue #2790: Fixing compilation errors on linux. 2013-12-05 11:44:37 +08:00
martell e5ada6f377 added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors 2013-12-05 03:37:27 +00:00
Ricardo Quesada 49b25231f2 Compiles on Android 2013-12-04 19:16:01 -08:00
Nite Luo 9b0e0d2116 Fix a bug with auto batching logic 2013-12-04 19:05:17 -08:00
James Chen 944160210c issue #2790: Renames functions in Map<K, V>. 2013-12-05 10:59:43 +08:00
Ricardo Quesada 4aae44f1e9 fixes cocos2d.h include 2013-12-04 18:54:15 -08:00
James Chen 499a0404d4 issue #2790: Renames some functions in Vector<T>. Makes it more like stl vector. 2013-12-05 10:35:10 +08:00
Huabing.Xu e6823875d5 change VBO_SIZE to a big number to avoid crash temporarily 2013-12-05 10:20:54 +08:00
Huabing.Xu 7a58cb5a29 use quad command instead of custom command for ParticleSystemQuad::draw() 2013-12-05 10:20:22 +08:00
Ricardo Quesada f42aef0af8 Moves CCConsole.* to base/ 2013-12-04 18:09:23 -08:00
Nite Luo e316ac779b Sprite culling now using vertices directly to avoid calculation on transform 2013-12-04 17:41:18 -08:00
Nite Luo a98714f6a5 support device without VAO 2013-12-04 17:02:02 -08:00
Nite Luo 792cb5a716 Merge branch 'develop' into newRenderer 2013-12-04 15:23:12 -08:00
Nite Luo 143df8af7d Fix RenderTexture after merging commandpool 2013-12-04 15:13:13 -08:00
darkdukey 4b7d0c290a Merge pull request #4 from dabingnn/newRendererCommandPool 
New renderer command pool
 2013-12-04 15:08:17 -08:00
Nite Luo f423166471 Fix bugs with RenderTexture with NewRender 2013-12-04 15:06:28 -08:00
Ricardo Quesada f69d5d1328 Merge branch 'develop' into console 2013-12-04 12:28:05 -08:00
Nite Luo ae551ae294 Convert RenderTexture to use RenderCommands 2013-12-04 11:54:57 -08:00
James Chen c9767b8ea0 issue #2790: fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile. 2013-12-04 17:50:57 +08:00
James Chen 54289276de issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +08:00
James Chen 4212e33aee issue #2790: Removes unused comments in CCAnimation.h 2013-12-04 17:27:53 +08:00
James Chen 60874ece64 issue #2790: Updates Makefile, Moves some codes to CCValue.cpp. 2013-12-04 16:18:22 +08:00
James Chen ceaa1f26bb issue #2790: Windows run ok with ValueDict for FileUtils. 2013-12-04 16:02:54 +08:00
James Chen 76896d70d0 issue #2790: Android build was ok, fixes some warnings. 2013-12-04 16:02:54 +08:00
James Chen 5c60f66c63 issue #2790: Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray. 2013-12-04 16:02:53 +08:00
James Chen f01f56113c issue #2790: Don’t make an assert if converting Value failed. 2013-12-04 16:02:53 +08:00
James Chen 9881ab2178 issue #2790: Uses cocos2d::Map and ValueDict for SpriteFrameCache. 2013-12-04 16:02:53 +08:00
James Chen 2e0489a49c issue #2790: Uses ValueDict instead of Dictionary* for ParticleSystem. 2013-12-04 16:02:53 +08:00
James Chen 1164176bed issue #2790: NULL —> nullptr in CCParticleSystem.cpp. 2013-12-04 16:02:52 +08:00
James Chen 411136dd57 issue #2790: Updates CCValue, supports using ‘const char*’ to construct a Value. 2013-12-04 16:02:52 +08:00
James Chen 4ec6e50cc4 issue #2790: Pure base data from Dictionary* to ValueDict, Array* to ValueArray. 2013-12-04 16:02:52 +08:00
James Chen 8a435aa274 issue #2790: ArrayValue —> ValueArray, DictValue —> ValueDict. 2013-12-04 16:02:52 +08:00
James Chen 3136ffc3dd issue #2790: Adds CCValue.h/.cpp. 2013-12-04 16:02:51 +08:00
James Chen d2bddee11e issue #2790: Adds CCMap.h. 2013-12-04 16:01:56 +08:00
James Chen 9928e8bef1 issue #2790: Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes. 2013-12-04 16:01:55 +08:00
James Chen cb215bc931 issue #2790: Vector<T> replaces Array* finished. 2013-12-04 16:01:55 +08:00
James Chen 0d581a15d8 issue #2790: MenuItemToggle::setSubItems() uses Vector<MenuItem*> now. 2013-12-04 16:01:55 +08:00
James Chen 8aef092005 issue #2790: TestCpp with new Vector<>. 2013-12-04 16:01:54 +08:00
James Chen 1d5984b29a issue #2790: Vector::makeObjectsPerformCallback —> Vector::forEach 2013-12-04 16:01:02 +08:00
James Chen d4d864216b issue #2790: Deletes Vector::init, adds Vector::setCapacity. 2013-12-04 16:00:18 +08:00
James Chen 90062b656d issue #2790: Node::_children is Vector<Node*> now. 2013-12-04 16:00:17 +08:00
James Chen c152652c5b issue #2790: Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr). 2013-12-04 15:56:08 +08:00
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
minggo 92b180080c Merge pull request #4409 from mlepage/develop 
[ci skip]Fix typos
 2013-12-03 19:13:23 -08:00
Ricardo Quesada a34352cef7 Console is working! 2013-12-03 18:46:54 -08:00
Huabing.Xu cd562676f5 use block allocation for commands 2013-12-04 10:39:34 +08:00
boyu0 fd68dc4f9f issue #2771: add condition test to updatePhysicsTransform 2013-12-03 16:28:18 +08:00
Huabing.Xu 757f1abc7f 1. protected render command construction/destruction function. 
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
 2013-12-03 14:08:47 +08:00
Huabing.Xu 44f12ce8e4 add RenderCommandPool head file 2013-12-03 11:52:51 +08:00
Huabing.Xu d4b9e0538b refactor: group command use a non parameter constructor and a reentrant init function 2013-12-03 11:24:03 +08:00
Huabing.Xu d33f05b3f0 refactor: custom command use a non parameter constructor and a reentrant init function 2013-12-03 11:17:21 +08:00
Huabing.Xu ace75eebce refactor: quad command use a non parameter constructor and a reentrant init function 2013-12-03 11:11:46 +08:00
Nite Luo 6862d59bb2 Add NewRenderTexture to convert RenderTexture to use new renderer 2013-12-02 17:23:52 -08:00
Nite Luo 8801f508eb Partcle system use the new renderer 2013-12-02 12:13:05 -08:00
Nite Luo fbadb3329a Merge branch 'develop' into newRenderer 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-12-02 10:55:31 -08:00
Ricardo Quesada dbcae0af1e Merge branch 'develop' into console 2013-12-02 09:57:53 -08:00
James Chen 9618eb00be Merge pull request #4411 from martell/cmake 
closed #3328: cmake support for windows
 2013-12-02 01:22:57 -08:00
martell 06ff1bc594 Fixed HelloCpp Linking on Linux 2013-12-02 07:10:37 +00:00
minggo d2f235f8b8 Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage 
[ci skip]issue #2345: add tga support to Image
 2013-12-01 18:18:42 -08:00
minggo 24f7819e99 Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval 
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
 2013-12-01 18:08:58 -08:00
martell f369606d77 fix cocos2d-x for vs2013 2013-11-30 08:05:39 +00:00
martell 79401a7596 quickly added win32 cmake 2013-11-30 06:09:12 +00:00
Marc Lepage 940b0ffd56 Fix typos 2013-11-29 12:09:38 -05:00
Jason Xu 266e4e1654 rename to with Jni suffex 2013-11-29 19:34:36 +08:00
Jason Xu 27c3a459ed rename android native function names. 2013-11-29 17:17:15 +08:00
boyu0 83f855e2ec issue #2345: delete unnecessary include 2013-11-29 15:31:58 +08:00
boyu0 04c3d95005 issue #2345: namespace cocos2d { -> NS_CC_BEGIN 2013-11-29 15:25:21 +08:00
boyu0 dffc12e648 issue #2345: new/delete -> malloc/free 2013-11-29 15:13:16 +08:00
boyu0 86074c23d8 issue #2345: class Image add tga image format support. 2013-11-29 14:31:42 +08:00
minggo 3268da3a4d Merge pull request #4401 from minggo/thread-helper 
[ci skip]add helper funcion to invoke a function in gl thread
 2013-11-27 22:26:11 -08:00
Ricardo Quesada 21afd63d82 Merge branch 'develop' into console 2013-11-27 14:29:27 -08:00
Nite Luo 83972ecf57 Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-11-27 10:16:34 -08:00
Nite Luo 75381ebc51 Merge branch 'develop' into newRenderer 2013-11-27 10:16:17 -08:00
boyu0 72f2d68edd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical 2013-11-27 17:47:37 +08:00
minggo eded94ef76 don't create a pool, since it doesn't invoke any iOS dependent codes 2013-11-27 17:43:54 +08:00
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
minggo bcb131262c add helper funcion to invoke a function in gl thread 2013-11-27 16:49:07 +08:00
Huabing.Xu ea46e1c658 change test case 2013-11-27 14:30:38 +08:00
Huabing.Xu 3da196ea43 add Frustum culling to new Sprite 2013-11-27 10:35:12 +08:00
Huabing.Xu 80da1dac3f add Frustum, AABB, ViewTransform 2013-11-27 10:34:30 +08:00
James Chen 6c097fa692 Merge pull request #4389 from minggo/remove-unneeded-codes 
override addChild in Sprite to fix error in binding generator
 2013-11-26 18:14:20 -08:00
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
Nite Luo 3123c70153 Sprite are now using NewRenderer 2013-11-26 17:13:04 -08:00
Nite Luo bf53cc116b use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode 2013-11-26 17:01:32 -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
Nite Luo 92b57c79ba Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCClippingNode.h
	cocos/2d/CCLayer.h
 2013-11-26 11:56:03 -08:00
Nite Luo 61ca4f0137 Fix a bug with NewSprite Update Quad 2013-11-26 11:48:37 -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
Nite Luo f3830985bb Sprite now using New renderer 2013-11-25 16:33:05 -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
Nite Luo 19b8ba89e2 Merge branch 'develop' into newRenderer 2013-11-25 10:21:02 -08:00
Nite Luo b67ec6618f Finish converting LayerColor start working on particle system 2013-11-22 17:14: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
Nite Luo 60ada5dee3 Fonts are now using NewSprite to render 2013-11-22 16:09:11 -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
Nite Luo b02af0cbfe Clean up renderer code 2013-11-22 10:24:52 -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
Nite Luo 43941bcbe0 Only init render after GLview has been initialized 2013-11-21 16:36:19 -08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
Nite Luo 96d2910a99 Merge branch 'develop' into newRenderer 2013-11-21 10:19:32 -08:00
Nite Luo db52698b26 Fix the crash on ios 7 2013-11-20 20:39:32 -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
Nite Luo f438e83104 Merge branch 'develop' into newRenderer 2013-11-20 11:14:28 -08:00
Nite Luo 0e51504ee6 Use stack to manage current RenderGroup 2013-11-20 11:05:01 -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
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 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
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
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
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
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
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 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
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
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
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
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
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
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
Nite Luo f68a2a47e7 Improved batching 2013-11-11 00:14:29 -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
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
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
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
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
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 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
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
James Chen 963d7f3bd0 Changes the touch id declaration from int to long. 2013-11-05 15:49:58 +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 daa91ad413 [CMake] Update library dependency. 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
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
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
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 2f67ceb495 issue #2771: fix some code style 2013-11-01 16:26:03 +08:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
boyu0 b2951b70ff issue #2771: enhance Listener use EventListener mechanism 2013-11-01 14:50:06 +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
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +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