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

1332 Commits

Author SHA1 Message Date
yinkaile 13408e4dc5 change play interface name 2013-12-25 16:46:31 +08:00
Huabing.Xu 7816635963 fix ShadeNodeTest->ShaderNode 2013-12-25 16:38:43 +08:00
Huabing.Xu 218dc7c115 fix RenderTextureTest->simpleSprite 2013-12-25 16:18:29 +08:00
Huabing.Xu 7333a636c1 fix Label->LabelBMFontBounds 2013-12-25 15:13:11 +08:00
Huabing.Xu 19522152d5 fix Label->Atlas4 2013-12-25 15:05:49 +08:00
Huabing.Xu cfb06722d5 Merge branch 'develop' into develop_FixTestCase_LabelTest 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  change “string.compare()” to “==“
  fix android compile error
  [AUTO] : updating submodule reference to latest autogenerated bindings
  fix TestCpp project can't work on debug mode on vs.
  Updates JS tests for SpineTest.
  Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings.
  change some const char* to const std::string&
  change some const char* to const std::string&
 2013-12-25 14:55:57 +08:00
Huabing.Xu e8d57154dd fix Label->Atlas1 2013-12-25 14:52:49 +08:00
minggo 599aabc55b Merge pull request #4653 from dabingnn/develop_FixTestCase_ArmatureSceneTest 
Develop fix test case armature scene test
 2013-12-24 22:32:43 -08:00
Huabing.Xu 22a62d9d07 Fix TestBoundingBox 2013-12-25 14:02:13 +08:00
Huabing.Xu 699424e3c7 remove ArmatureTestLayer::draw 2013-12-25 11:53:50 +08:00
James Chen 17c391f447 Merge pull request #4645 from Dhilan007/update_vs_project 
fix TestCpp project can't work on debug mode on vs.
 2013-12-24 19:50:25 -08:00
James Chen 51fb4e5d1f Merge pull request #4647 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
change indent to spaces
 2013-12-24 19:49:20 -08:00
Huabing.Xu 02c28cf891 change indent to spaces 2013-12-25 11:46:40 +08:00
James Chen 8fdd6249f0 Merge pull request #4646 from dabingnn/develop_FixTestCase_DrawPrimitiveTest 
fix actionTest->DrawPrimitiveTest
 2013-12-24 19:46:32 -08:00
Huabing.Xu 598d295c6c fix actionTest->DrawPrimitiveTest 2013-12-25 11:44:05 +08:00
Dhilan007 c168dc4731 fix TestCpp project can't work on debug mode on vs. 2013-12-25 11:38:46 +08:00
James Chen 538da31773 Removes CC prefix for CCSkeleton and CCSkeletonAnimation. Adds namespace `sp` for JSBindings. 2013-12-25 11:18:14 +08:00
Huabing.Xu fac87108f6 fix actionTest->Box2dTest 2013-12-25 10:54:31 +08:00
CaiWenzhi 2ae8576e0f Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-25 10:40:05 +08:00
Huabing.Xu 960c64d787 fix actionTest->ActionCardinalSpline，ActionCatmullRom 2013-12-25 10:20:29 +08:00
Huabing.Xu c29b796c15 fix actionTest->ActionCardinalSplineStacked 2013-12-25 09:58:35 +08:00
Huabing.Xu 122f97f20a fix actionTest->ActionFollow, ActionCatmullRomStacked 2013-12-25 09:51:55 +08:00
chengstory e4e22b52cb Merge branch 'develop' into #3456 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/CCSSceneReader.cpp
 2013-12-24 22:05:13 +08:00
CaiWenzhi 0dac69523c Remove "_renderer" from widget 2013-12-24 20:22:14 +08:00
James Chen 0305ff15db Merge pull request #4625 from dabingnn/develop_NewClippingNode 
Develop new clipping node
 2013-12-23 23:20:38 -08:00
yinkaile 67c3480320 change std::string.compare() to == 2013-12-24 14:21:25 +08:00
Huabing.Xu e7facf9f85 remove NewClippingNode feature function into ClippingNode 2013-12-24 14:08:57 +08:00
yinkaile 9f8d95131e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-24 13:48:41 +08:00
Huabing.Xu b61bf3ad95 LabelBMFont inherit SpriteBatchNode instead of NewSpriteBatchNode 
remove NewSpriteBatchNode testcase to SpriteBatchNode
 2013-12-24 10:51:35 +08:00
yinkaile 4de3e520d8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-24 10:51:24 +08:00
CaiWenzhi 6dd55921aa Merge branch 'develop' into develop_nutty_modify_framework_newrender 2013-12-24 10:44:57 +08:00
Huabing.Xu c4f4f91cb4 Merge branch 'develop' into develop_mergeNewSprite 
* develop:
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates Bindings-generator.
  Binds Node::setAnchorPoint manually.
  Don’t hide parent’s addChild method in TMXLayer class.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Updates JS-tests to the latest version.
  [Lua Binding] Supports to bind more container: std::vector<std::string>, std::vector<int>, cocos2d::Map<std::string, T>.
  Updates js tests to the latest version.
  Removes unneeded binding glue codes, Sprite::setPosition.
  Bindings-generator skips Node::setContentSize. Binds it manually.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #3353:Add the DisplayLinkDirector lua binding
  issue #2771: fix warning log and fix typo.
  issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
 2013-12-24 10:03:21 +08:00
Huabing.Xu e66eb6464d use Sprite instead of NewSprite 2013-12-23 21:07:25 +08:00
James Chen a48544c814 Merge pull request #4598 from boyu0/iss2771_physical 
issue #2771: fix warning log and fix typo.
 2013-12-23 05:00:03 -08:00
Huabing.Xu 9c97fc6f19 remove NewRenderTexture include file 2013-12-23 18:08:50 +08:00
Huabing.Xu 41a77fed61 TestCase Use RenderTexture instead of NewRenderTexture 2013-12-23 17:13:41 +08:00
CaiWenzhi a19000b49f Add samples 2013-12-23 15:35:35 +08:00
boyu0 69f1834e61 issue #2771: fix warning log and fix typo. 2013-12-23 14:30:43 +08:00
yinkaile 8d9035c5e8 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-23 14:06:22 +08:00
yinkaile ba809a0096 change const char* to const std::string& 2013-12-23 14:05:46 +08:00
Dhilan007 786b7d9912 update vs project for remove CCCamera. 2013-12-22 17:19:59 +08:00
minggo 3d37a26e21 Merge pull request #4523 from Dhilan007/increase_test_pressure 
increase label test pressure.
 2013-12-21 17:08:20 -08:00
Ricardo Quesada 49903ea779 Director emits events after visit, after draw and after update. And when the projection changes 
Adds helper functions on EventDispatcher
Adds test in NewEventDispatcherTest
 2013-12-21 10:55:16 -08:00
Ricardo Quesada eea2e70d1e Adds events in director 2013-12-21 00:56:28 -08:00
Ricardo Quesada eadbaa3bf5 Adds comment to ActionCamera file 2013-12-20 19:37:14 -08:00
Ricardo Quesada b8b7714431 Camera is working OK in 2d projection 2013-12-20 19:19:24 -08:00
Ricardo Quesada d8ad5291f4 Nore camera 2013-12-20 16:33:31 -08:00
James Chen 0db2067f97 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-spine 2013-12-20 20:11:41 +08:00
minggo 756f8f7a11 Merge pull request #4482 from dabingnn/develop_gridNode 
Develop grid node
 2013-12-19 18:30:42 -08:00
Ricardo Quesada 59fee6b8d2 replaces std::for_each with for() 
replaces `std::for_each` with C++11 `for( : )`
 2013-12-19 13:34:41 -08:00
Ricardo Quesada 99ae4d86d3 fixes compiler warnings 
* converts some `int` to `ssize_t`
* adds `const` to `title()` and `subtitle()`
 2013-12-19 12:23:42 -08:00
James Chen cfec4d5b7e Updates spine test. 2013-12-19 21:35:43 +08:00
Huabing.Xu d51ad36613 Merge branch 'develop' into develop_gridNode 
* develop: (67 commits)
  Adds const in ShaderTest2.h
  Skew works again!
  [AUTO] : updating submodule reference to latest autogenerated bindings
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Reverts submodule.
  Updates submodule of bindings-generator.
  Adds `std::for_each` test in invocation
  Reverts bindings-generator.
  fixed not render
  iterator in Sprite fixes
  update vs project for removes unneeded files
  getNodeToParentTransform fixes
  Node cleanup
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Improves SpriteTest
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Android and Linux fixes
  removes `using namespace std` from header file
  Removes unneeded files
  change play arguments
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-19 17:20:22 +08:00
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 2013-12-19 17:05:59 +08:00
Ricardo Quesada 2d2a6b205d Adds const in ShaderTest2.h 
Adds const in ShaderTest2.h
 2013-12-18 21:15:47 -08:00
James Chen 113fa9924e Merge pull request #4550 from dumganhar/merge-pr-4532 
Merge pr 4532
 2013-12-18 20:12:18 -08:00
Ricardo Quesada c044a91f6e Adds `std::for_each` test in invocation 
and removes CArray and CMacro tests
 2013-12-18 19:28:09 -08:00
yinkaile a6a432d2a2 fixed not render 2013-12-19 10:42:06 +08:00
yinkaile 93eaf44e9c Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
 2013-12-19 09:42:21 +08:00
Ricardo Quesada 7616edd9f3 Improves SpriteTest 
Improves SpriteTest.
It is easier to see if Sprite works as SpriteBatchNode (and vice-versa).

Needed for the new renderer.

Also adds `const` to title() and subtitle()
 2013-12-18 13:52:10 -08:00
Ricardo Quesada d1b555614e removes `using namespace std` from header file 
... in order to prevent possible collisions.

`using namespace XXX` MUST never be used in header files.
 2013-12-18 11:45:30 -08:00
yinkaile 324732b867 change play arguments 2013-12-18 23:29:54 +08:00
yinkaile 57c33e0604 fixed compile error 2013-12-18 22:36:10 +08:00
yinkaile d3a575e8cc change for iterator and callfunc 2013-12-18 22:07:33 +08:00
yinkaile 026811ca59 Merge branch 'develop' into Array 
Conflicts:
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-18 22:03:16 +08:00
James Chen 7719c692b8 More warning fixes. 2013-12-18 16:03:07 +08:00
Dhilan007 2d9b7ee4fc update vs project for new renderer and fix compiling fail on vs. 2013-12-18 14:36:49 +08:00
Dhilan007 2a3390d3eb increase label test pressure. 2013-12-18 10:46:02 +08:00
Ricardo Quesada 33c4f891a0 Adds 'CC' to renderer files 2013-12-17 18:41:09 -08:00
Ricardo Quesada 3f3071fbb6 Cleanup RenderCommand code 
RenderCommand code is cleaner
 2013-12-17 18:02:11 -08:00
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +08:00
James Chen 3829f841e7 Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other). 2013-12-17 18:09:07 +08:00
yinkaile 6ff45b09e7 Merge branch 'newRenderer' into Array 
Conflicts:
	cocos/editor-support/cocostudio/CCArmature.cpp
	cocos/editor-support/cocostudio/CCArmature.h
	cocos/editor-support/cocostudio/CCBatchNode.cpp
	cocos/editor-support/cocostudio/CCColliderDetector.cpp
	cocos/scripting/auto-generated
	tools/bindings-generator
 2013-12-17 18:06:11 +08:00
James Chen c0d741d0d8 Merge pull request #4507 from dumganhar/del-vector-foreach 
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
 2013-12-17 01:55:35 -08:00
James Chen d16fa07661 Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort. 2013-12-17 17:45:29 +08:00
minggo bcb07abb7b Merge pull request #4505 from 2youyouo2/newRenderer 
update armature to new render
 2013-12-17 01:43:07 -08:00
yinkaile bc868cc004 update armature to new render 2013-12-17 17:00:01 +08:00
James Chen d3a4dbab08 iOS & Mac project fix. 2013-12-17 16:34:05 +08:00
James Chen 12cc6c6153 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer 
Conflicts:
	cocos/2d/CMakeLists.txt
 2013-12-17 15:50:24 +08:00
minggo 16ed9155c0 Merge pull request #4460 from Dhilan007/label_distanceField 
new label:add support for distanceField
 2013-12-16 23:18:41 -08:00
James Chen 2a38d4fe94 issue #2171: Fixing compilation errors for Linux port. 2013-12-17 14:50:40 +08:00
James Chen 4e01769cd5 issue #2171: [New Renderer] Fixing compilation errors for Android. 2013-12-17 14:18:41 +08:00
Lee, Jae-Hong 2a38a2c154 [Win32] fix argument type. 
- argument of interface is ssize_t.
 2013-12-17 15:11:37 +09:00
Ricardo Quesada 3a25d9079d Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-16 13:58:27 -08:00
Ricardo Quesada 5c178f1c93 Merge branch 'develop' into newRenderer 2013-12-16 13:57:29 -08:00
Huabing.Xu 6abb6639b5 remove android properties change by eclipse 2013-12-16 19:22:40 +08:00
Nite Luo 545000a213 Add mouse scrolling support for extension test 2013-12-16 17:40:34 +08:00
youyou 81cdbea9c8 change Array to Vector, Dictionary to Map 2013-12-16 14:34:09 +08:00
Huabing.Xu 6aa2908c13 rename： 
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid  getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
 2013-12-16 14:21:05 +08:00
Dhilan007 32f23ebdba fix bad position for performance test about Label. 2013-12-16 11:04:52 +08:00
Huabing.Xu b1eacd52cb Merge branch 'develop' into develop_gridNode 
* develop:
  fix compile error related to ssize_t.
  issue #2771: add and change some physics API, and add more documents
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Some fixes for XXX:getDescription.
  Reverts CCSpriteBatchNode.h
  size_t —> ssize_t in CCTMXLayer.cpp
  issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
  Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
  [AUTO] : updating submodule reference to latest autogenerated bindings
  More renames of description() to getDescription()
  getDescription() works as expected
  fix compiling error after fixing conflicts
  fix compiling error after fixing conflicts
  use ssize_t for index
  use ssize_t for index and capacity
  use ssize_t for capacity and index in containers
  Fix:Remove some needless lua binding functions and resolve a bug
 2013-12-16 10:43:49 +08:00
boyu0 2444f407b2 issue #3162: fix test title 2013-12-16 04:13:49 +08:00
youyou 917bd8c3d9 change Array to Vector 2013-12-13 19:40:38 +08:00
youyou 0e8c3409e5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.h
 2013-12-13 16:28:50 +08:00
boyu0 4befb50307 issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc 2013-12-13 16:26:26 +08:00
youyou 6a3aff0861 fixed change animation internal, animation speed not right 2013-12-13 15:58:58 +08:00
Dhilan007 8b9cfd7d35 fix compiling error on linux and android. 2013-12-13 12:58:16 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +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 08bfbbc582 Fix project can not compile after rebased pull 2013-12-12 16:20:52 +08:00
Huabing.Xu 349724b6fd Fix ArmatureSceneTest Crash 2013-12-12 15:15:43 +08:00
Huabing.Xu 503918db02 Fix EffectAdvancedTest Crash 2013-12-12 15:15:42 +08:00
Huabing.Xu 8bcbf8d186 Fix EffectTest Crash 2013-12-12 15:15:42 +08:00
Huabing.Xu 6300ce73d1 EffectTest can run 2013-12-12 15:15:42 +08:00
Ricardo Quesada 6d1abc7d4d Merge branch 'develop' into newRenderer 2013-12-11 15:28:05 -08:00
James Chen 6243401404 issue #2790: ConfigurationTest fix. 2013-12-11 18:08:06 +08:00
boyu0 463ae20ce6 issue #3162: Add layer cascade color and cascade opacity test, fix bugs 2013-12-11 15:57:20 +08:00
James Chen 473b21a05a Merge pull request #4471 from Dhilan007/compile_error_vs_131210 
fix compile error for vs project.
 2013-12-10 18:06:57 -08:00
Ricardo Quesada 3b66d09bf5 Merge branch 'develop' into newRenderer 2013-12-10 11:10:55 -08:00
James Chen bf7b46c315 issue #2790: TouchesTest.h/.cpp uses Vector<T> now. 2013-12-10 18:27:13 +08:00
Dhilan007 7c97ed2bcd Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-10 18:20:40 +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
Dhilan007 b2875618b2 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-10 10:15:53 +08:00
Ricardo Quesada aa00137fde Merge branch 'develop' into newRenderer 2013-12-09 11:10:00 -08:00
James Chen d1d5659818 issue #2790: Uses Vector<T> or Map<K, V> as many as possible for CCBReader. 2013-12-09 17:55:56 +08:00
youyou a884a70045 fix2d compling warning 2013-12-09 13:56:07 +08:00
Dhilan007 79e7d1a378 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop 2013-12-09 10:38:42 +08:00
James Chen ba56bf6ecd issue #2790: Updates Tests. 2013-12-07 14:28:37 +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 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
minggo fa7c97171b fix some warnings 2013-12-06 16:32:06 +08:00
youyou 7e96701ef0 fixed create PhysicsSprite 2013-12-06 14:25:08 +08:00
youyou e17b9d839b 1.add TEST_EASING 
2.add play serveral movement function
3.update TEST_COLLIDER_DETECTOR
4.fixed movement event
 2013-12-06 13:40:49 +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
Dhilan007 7d548e7d5e add miss file for vs-project 2013-12-05 18:11:40 +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 b0c09cd291 Includes <io.h> on windows for ConsoleTest. 2013-12-05 16:12:04 +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
Ricardo Quesada 49b25231f2 Compiles on Android 2013-12-04 19:16:01 -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
Ricardo Quesada b52d535a42 fixes indentation issues 
and some compilations issues on Linux
 2013-12-04 18:19:51 -08:00
Ricardo Quesada f42aef0af8 Moves CCConsole.* to base/ 2013-12-04 18:09:23 -08:00
Ricardo Quesada c2a88154af Custom commands are working OK 2013-12-04 17:38:11 -08:00
Ricardo Quesada ef18d4891e More bug fixes 2013-12-04 16:26:21 -08:00
Nite Luo 792cb5a716 Merge branch 'develop' into newRenderer 2013-12-04 15:23:12 -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 54289276de issue #2790: ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap. 2013-12-04 17:46:57 +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 f6676bd7ef issue #2790: [] -> getObjectAtIndex. 2013-12-04 16:02:51 +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
boyu0 98779b0a9f issue #2771: move CC_USE_PHYSICS from project definition to ccConfig.h 2013-12-04 14:36:32 +08:00
minggo 608e3bfa1b Merge pull request #4410 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN 
[ci skip]Corrected "disallow copy and assign"
 2013-12-03 19:21:45 -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
Nite Luo 0c292e59b8 Merge branch 'develop' into newRenderer 2013-12-03 10:52:10 -08:00
boyu0 63a4e09c90 issue #2771: add more joint tests, add some joint api, fix bugs 2013-12-03 12:47:03 +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
signmotion 41daad30fa Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-29 19:44:03 +02:00
Marc Lepage 940b0ffd56 Fix typos 2013-11-29 12:09:38 -05:00
boyu0 86074c23d8 issue #2345: class Image add tga image format support. 2013-11-29 14:31:42 +08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +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
boyu0 2b43e72e7c issue #2771: fix vs compile errors, change project setting 2013-11-27 17:33:33 +08:00
Huabing.Xu ea46e1c658 change test case 2013-11-27 14:30:38 +08:00
Huabing.Xu f8281cbb93 add test case scale 2013-11-27 10:41:01 +08:00
Huabing.Xu dd6c14e88d add test case 2013-11-27 10:35:23 +08:00
Nite Luo f1ca3f9a8a Fix NewRendererTest after change 2013-11-26 16:54:48 -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
James Chen 999b7ccd07 Merge pull request #4375 from dumganhar/constructors_are_protected 
issue #3258: Merge PR #4351: Constructors are protected
 2013-11-26 00:30:06 -08:00
boyu0 99d904363a issue #2771: delete all the box2d implementation in physics parts. 2013-11-26 13:47:42 +08:00
boyu0 df1fca3279 issue #2771: refactor some functions and delete PHYSICS_INFINITY macro. 2013-11-26 11:38:55 +08:00
minggo bf07077c52 Merge pull request #4361 from Dhilan007/eclipse_build_fix 
[ci skip]Remove something association of CDT Builder,it make 'miss error' in buil...
 2013-11-25 19:37:03 -08:00
James Chen 3b47ab62ad Merge commit 'refs/pull/4351/head' of git://github.com/cocos2d/cocos2d-x into constructors_are_protected 2013-11-26 11:26:20 +08:00
Lajos Kamocsay 4538be2b43 FontTest was not rendering TTFs 2013-11-25 10:00:53 -05:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
signmotion 0d9cd9784b * Fixed warnings in VS2012: C4018 (signed/unsigned mismatch) and C4244 (conversion from 'double' to 'float'). 2013-11-23 07:23:06 +02:00
Nite Luo b41d81f810 Add actions to NewSpriteBatchNode test 2013-11-22 15:05:18 -08:00
Ricardo Quesada 72436c896a prevents bug in gcc 4.6.3 2013-11-22 13:40:32 -08:00
Ricardo Quesada 3ab1e4f3a1 ClippingNode Test works again 2013-11-22 12:15:41 -08:00
Ricardo Quesada 1c65669a9f fixes type in documentation 2013-11-22 11:27:03 -08:00
Dhilan007 49a1d0ae62 Remove something association of CDT Builder,it make 'miss error' in builders. 2013-11-22 17:41:03 +08:00
Ricardo Quesada b6ddc6d048 Uses std::unordered_map<> instead of std::map<> 
and more fixes.
 2013-11-21 13:43:59 -08:00
boyu0 627b9538d0 issue #2771: fix physics test CC_USE_PHYSICS definition 2013-11-21 10:48:21 +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
James Chen 8129e49b84 Removing unused 'virtual' keyword in testcpp since we're using EventDispatcher::addEventListenerXXX to register event listener. 2013-11-20 11:21:30 +08:00
Nite Luo 8ce16e1e12 Finish DrawNode 2013-11-19 13:57:39 -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 2f735eed3f fix undefined reference to PhysicsDemoSlice::onTouchMoved 2013-11-19 17:10:10 +08:00
samuele3 eefaf9b81d Hot fix:Remove the MenuLayerPriorityTest test case of menu 2013-11-19 14:32:17 +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
boyu0 8feb3a731b issue #2771: fix physics test crashes 2013-11-18 21:28:40 +08:00
boyu0 cb91fff5eb issue #2771: fix bug physics test debug: button must click twice. 2013-11-18 20:42:10 +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
boyu0 90f07f680f Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical 2013-11-18 11:22:20 +08:00