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

2426 Commits

Author SHA1 Message Date
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 28eed3c8e0 issue #2790: Reverts HelloWorldScene.cpp. 2013-12-04 17:51:53 +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 d2bddee11e issue #2790: Adds CCMap.h. 2013-12-04 16:01:56 +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
minggo 02aca34ccf Merge pull request #4417 from boyu0/iss2771_physical 
[ci skip]issue #2771 physical, add more joint and joint tests
 2013-12-02 21:59:46 -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
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 1a94e393af Setup for testing for every windows user 2013-11-30 09:36:22 +00:00
martell 79401a7596 quickly added win32 cmake 2013-11-30 06:09:12 +00: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
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
Lajos Kamocsay 4538be2b43 FontTest was not rendering TTFs 2013-11-25 10:00:53 -05:00
signmotion 25cc4101a7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-11-25 10:23:50 +02:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00