Ricardo Quesada
1b6dfcda40
Merge branch 'develop' into cceglview_in_desktop
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-01-22 11:21:16 -08:00
pandamicro
7e4f82db1d
Issue #3806 : Update shared tests_v3.0 of js test cases
2014-01-22 22:57:34 +08:00
pandamicro
29fcf46497
Fixed #3806 : Update tests 3.0
2014-01-22 22:41:30 +08:00
James Chen
1b89a058fa
Merge pull request #5160 from samuele3hu/developBugFix
...
fix:Update the some test cases for lua
2014-01-22 01:21:50 -08:00
samuele3hu
e1476c8d60
fix:Replace cc.TextureCache:getInstance() —> cc.Director:getInstance():getTextureCache()
2014-01-22 17:09:33 +08:00
zhangbin
462b9a7ace
issue #2572 , Optimize the code of test case for issue 2572.
2014-01-22 17:04:54 +08:00
minggo
9c6a65baba
Merge pull request #5156 from minggo/deprecate-function
...
deprecated some functions in Object
2014-01-22 00:51:50 -08:00
samuele3hu
e848167b25
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-22 15:44:33 +08:00
samuele3hu
c4d2f1d83c
fix:Add the deprecated function for the “dumpCachedTextureInfo” and update the related test case
2014-01-22 15:41:46 +08:00
zhangbin
3c2ef04f2b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-01-22 15:39:28 +08:00
zhangbin
3007f34240
issue #2572 , Add test case for issue 2572.
2014-01-22 15:38:59 +08:00
samuele3hu
0d8d517c2b
fix:Update the TestLua/TouchesTest by using the new event-dispatcher
2014-01-22 15:18:47 +08:00
James Chen
444a30e226
issue #3677 : Wrong include fix.
2014-01-22 14:12:25 +08:00
James Chen
32572e257e
issue #3677 : File rename. PerformanceEventDispatcher.h/.cpp -> PerformanceEventDispatcherTest.h/.cpp.
2014-01-22 14:10:42 +08:00
James Chen
e3e248c0f0
issue #3677 : Updates Windows project to add PerformanceEventDispatcherTest.
2014-01-22 13:53:54 +08:00
minggo
4381685a9d
deprecated some functions in Object
2014-01-22 13:47:29 +08:00
James Chen
43a10f951b
issue #3677 : Updates Android.mk and CMakeLists.txt.
2014-01-22 13:35:52 +08:00
James Chen
cecb20f824
issue #3677 : Adds EventDispatcher performance test.
2014-01-22 13:33:40 +08:00
minggo
63543b0f32
Merge pull request #5151 from minggo/iss3713-replace_CCObject
...
fix memory leak of autorelease pool
2014-01-21 19:52:47 -08:00
minggo
562d10c89f
issue #3713 : every autorelease will cause a release operation
2014-01-22 11:40:07 +08:00
minggo
aae7a9a3cc
Merge branch 'iss3713-replace_CCObject' of https://github.com/minggo/cocos2d-x into iss3713-replace_CCObject
2014-01-22 10:18:34 +08:00
minggo
9ffcef4982
issue #3713:fix memory leak of autoreleas pool
2014-01-22 10:17:42 +08:00
Ricardo Quesada
1113587f47
mac/CCEGLView moved to desktop/
2014-01-21 17:52:30 -08:00
James Chen
b189329d84
Merge pull request #5145 from samuele3hu/developBugFix
...
Fix:e Add new test case for GlobalZOrder in the TestLua/NodeTest
2014-01-21 17:44:26 -08:00
Ricardo Quesada
b51b04f315
ActionsProgress test include fixes
2014-01-21 16:28:52 -08:00
Ricardo Quesada
7a8707cb08
Merge branch 'develop' into local_z_Order_fixes
...
Conflicts:
cocos/2d/CCNode.cpp
cocos/2d/CCNode.h
2014-01-21 10:10:50 -08:00
Ricardo Quesada
f1444a26a1
Improves documentation with local z order
2014-01-21 09:26:58 -08:00
samuele3hu
dbeac80cae
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-21 23:10:36 +08:00
samuele3hu
564ba84e11
Fix:e Add new test case for GlobalZOrder in the TestLua/NodeTest
2014-01-21 23:08:18 +08:00
James Chen
2343d0f9cb
Merge pull request #5141 from samuele3hu/developBugFix
...
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 06:40:18 -08:00
minggo
4833810c6e
Merge pull request #5132 from minggo/iss3713-replace_CCObject
...
remove Object::_autoReleaseCount
2014-01-21 02:26:40 -08:00
minggo
b0163b503e
closed #3713:add test case in vs project
2014-01-21 18:00:34 +08:00
samuele3hu
77b5d4c772
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBugFix
2014-01-21 17:52:13 +08:00
samuele3hu
2338d773dc
fix:Add the “setZOrder” and “getZOrder” deprecated functions of the Node class in the lua’s script and update the related test cases
2014-01-21 17:51:49 +08:00
minggo
6378d10d5d
issue #3713:add test case for autorelease pool
2014-01-21 17:47:59 +08:00
samuele3hu
88be8606b9
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developPerf
2014-01-21 16:46:28 +08:00
samuele3hu
da8e208f47
close #3802 : Add some manual lua-binding functions for the Lable and update the related test cases
2014-01-21 16:36:29 +08:00
minggo
5fd35c3bab
Merge https://github.com/cocos2d/cocos2d-x into iss3713-replace_CCObject
2014-01-21 13:46:40 +08:00
minggo
386ba88974
issue #3713 : remove unneeded codes to fix compiling error
2014-01-21 10:33:45 +08:00
James Chen
0f9c3fa59c
closed #3789 : EventDispatcher supports sorting listeners by global Z and local Z order. And adds relevant test case.
2014-01-21 10:23:05 +08:00
James Chen
9f793f8a9b
Warning fixes: 1) getZOrder —> getLocalZOrder. 2) long —> int
2014-01-20 15:03:30 +08:00
James Chen
b116a11c3c
issue #2789 : Adds performance test for Map<K, V> and Dictionary.
2014-01-20 11:13:30 +08:00
James Chen
b11ef3069f
issue #2789 : Adds Map, Dictionary perf test, not yet finished.
2014-01-20 11:13:29 +08:00
Ricardo Quesada
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
Ricardo Quesada
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
James Chen
8eca8e25cb
Merge pull request #5099 from samuele3hu/test-rebase
...
close #3626:Make lua bindings-generator support the namespace binding
2014-01-17 06:07:45 -08:00
samuele3hu
cf857aade2
issue #3626:Modify some files that skipped some modifications because of merge
2014-01-17 11:22:03 +08:00
James Chen
31199183b2
Merge commit 'refs/pull/5086/head' of git://github.com/cocos2d/cocos2d-x into new-label-atlas
2014-01-17 11:10:04 +08:00
James Chen
f48f429825
issue #2789 : Removes unused empty lines and renames some variables.
2014-01-17 10:29:21 +08:00
samuele3hu
5859d3866a
issue #3626:Update the lua test cases which used the “tolua.cast” function to add the module name for the second string param
2014-01-17 10:19:56 +08:00
samuele3hu
35d031ea06
issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module
2014-01-17 10:19:56 +08:00
samuele3hu
de698aaea7
issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases
2014-01-17 10:19:55 +08:00
samuele3hu
811aa69d39
issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases
2014-01-17 10:19:55 +08:00
samuele3hu
fdac224a7b
issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace
2014-01-17 10:19:55 +08:00
samuele3hu
b72f309076
issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases
2014-01-17 10:19:54 +08:00
James Chen
3af95f3e84
issue #2789 : Updates windows projects.
2014-01-17 10:05:26 +08:00
James Chen
b3e1319982
issue #2789 : Updates Android.mk and CMakeLists.txt.
2014-01-17 10:03:10 +08:00
James Chen
83b459fcdb
issue #2789 : Adds loop test for Vector and Array.
2014-01-17 10:02:13 +08:00
James Chen
811f55bb8d
issue #2789 : Avoids compiler to do optimization.
2014-01-17 10:02:12 +08:00
James Chen
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
Ricardo Quesada
f2471b8caf
Merge pull request #5068 from dabingnn/develop_renderer_tileMapTest
...
add performance test for New renderer: LargeTileMap test for quadCommand
2014-01-16 16:03:42 -08:00
Ricardo Quesada
4dba667ea2
Adds test '13' to Sprite Test
...
...and also adds missing Image HD files
2014-01-16 13:07:56 -08:00
Ricardo Quesada
afb4077de5
Remove Sprites works as expected
2014-01-16 12:22:11 -08:00
Dhilan007
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
James Chen
21dc91bf78
Merge pull request #5082 from Dhilan007/develop_label
...
closed #3726:Fix crash when using unknown character.
2014-01-16 00:10:53 -08:00
James Chen
d000d9739d
Merge pull request #5084 from andyque/develop
...
closed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
2014-01-15 23:33:45 -08:00
Dhilan007
547ab3ef0a
update subtitle.
2014-01-16 15:07:20 +08:00
andyque
4a6e137389
fixed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate
2014-01-16 15:00:35 +08:00
Dhilan007
18bd978480
1.add label crash test
...
2.fix lose char when label have unknown character.
2014-01-16 14:37:07 +08:00
Huabing.Xu
21d586d4ca
Merge branch 'develop' into develop_renderer_tileMapTest
...
* develop: (24 commits)
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
More renderer optimizations
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG [ci skip]
Sprite: removed _hasChildren
Compilation fix: Updates cocos_files.json and removes unused in template.
use data.isNull() instead of !data.getBytes()
Update VS project file.
Updates CHANGELOG
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
Updates Xcode, Android and Linux project
fixes #3720
Renderer performance fixes
Console::log(format, va_args) is private
fix compiling error
Relieve inherit from LabelProtocol
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
add check data valid in getStringFromFile
...
2014-01-16 12:47:32 +08:00
zhangbin
e7b584908e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
2014-01-16 11:58:49 +08:00
James Chen
2e7516c582
Merge pull request #5041 from Dhilan007/develop_label
...
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
Ricardo Quesada
4278f024b8
Console::log(format, va_args) is private
...
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
zhangbin
536eaca24d
closed #3714 , Remove configurations which are not necessary in AndroidManifest.xml of aneroid projects.
2014-01-15 17:27:53 +08:00
Dhilan007
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
boyu0
a5c26b7da9
issue #3401 : add physics action and pump test for lua.
2014-01-15 13:52:24 +08:00
Huabing.Xu
25998f0237
closed #3640 : change windows project files
2014-01-15 11:44:08 +08:00
Huabing.Xu
19705fcf37
issue #3640 : add performance test->renderer LargeTileMap test
2014-01-15 11:27:57 +08:00
Ricardo Quesada
2efeb32352
Merge pull request #5063 from ricardoquesada/performance_test_fixes
...
Performance Test fixes
2014-01-14 17:24:49 -08:00
Ricardo Quesada
c267c479db
Performance Test fixes
...
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Nite Luo
fd04e17808
add a new line
2014-01-14 17:11:32 -08:00
Nite Luo
edc7547f70
add test instructions
2014-01-14 17:06:22 -08:00
Nite Luo
5f661babd2
Add VBO full test
2014-01-14 17:03:54 -08:00
boyu0
de30a9cfea
issue #3401 : add lua physics slide test, add more banding code, and fix some bugs.
2014-01-14 15:48:44 +08:00
Ricardo Quesada
6eed3a2b27
Adds missing copyright headers in some files
2014-01-13 14:48:12 -08:00
Ricardo Quesada
f2c3d2f3ae
Camera and Node fixes
...
OrbitCamera: added getters (public). Setters moved from `protected` to `public
: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
: Setters receives `kmVec3` as well. Old API is still supported
Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
Instead, once the additional transform is set, in order to remove it the user needs to pass
the identity matrix
2014-01-13 12:52:07 -08:00
Dhilan007
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
Ricardo Quesada
95568648c9
Console Enabled by default on TestCpp
2014-01-10 20:32:39 -08:00
Ricardo Quesada
2a6b9fe08e
Console is a property of Director.
...
By doing this, the console lives as much as the Director.
And the Console is not started until the method "listenOnPort" is
called.
2014-01-10 17:11:14 -08:00
James Chen
0088399d94
Merge pull request #5016 from akof1314/develop
...
Support MinGW with CMake for TestCpp
2014-01-09 23:13:19 -08:00
Ricardo Quesada
95b7196a2a
Adds more tests cases for Node
...
Adds more tests cases for Node
2014-01-09 14:26:36 -08:00
Ricardo Quesada
d13612ef32
Improves description in camera test
2014-01-09 11:38:44 -08:00
Ricardo Quesada
e8ea39127a
Merge pull request #5021 from ricardoquesada/node_test
...
Adds a new test that shows the problem with the Camera
2014-01-09 09:32:37 -08:00
WuHuan
f87af9e998
fix linux build
2014-01-09 19:49:11 +08:00
WuHuan
2f4b094598
Merge pull request #4 from cocos2d/develop
...
update
2014-01-09 02:56:21 -08:00
minggo
dfcd0872ed
Merge pull request #5006 from dabingnn/develop_layerColorDepthTestOccludeBugcase
...
Add Test Case: LayerColor should not occlude sprites and labels when dep...
2014-01-09 01:59:16 -08:00
WuHuan
4dbb0ee1e8
mingw console
2014-01-09 17:48:37 +08:00
James Chen
2133c0e566
Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode
...
Conflicts:
cocos/2d/CCDrawNode.h
2014-01-09 17:03:08 +08:00
Huabing.Xu
1b339a4635
Add Test Case: LayerColor should not occlude sprites and labels when depth test is true
2014-01-09 14:50:29 +08:00
Dhilan007
3a235f1ffc
amendment incorrect use of macro
2014-01-09 09:50:02 +08:00
Ricardo Quesada
dccd1b40de
Adds a new test that shows the problem with the Camera
...
Apprently the bug is in QuadCommand, since if we use CustomCommand
the camera works OK.
2014-01-08 16:28:18 -08:00
WuHuan
1cd68accc1
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
2014-01-08 17:03:44 +08:00
WuHuan
954ee61022
testcpp mingw
2014-01-08 16:58:36 +08:00
James Chen
5a31680211
Merge pull request #4977 from dumganhar/jsb-armature-fix
...
Jsb armature fix
2014-01-07 05:18:45 -08:00
James Chen
7a52d2aad7
Small fix in ArmatureScene.cpp/.h
2014-01-07 20:54:34 +08:00
samuele3hu
bebdfd8e55
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-07 20:40:17 +08:00
samuele3hu
de5c86a184
Fix:Replace the “setDisplayFrame” function with the “setSpriteFrame” function
2014-01-07 20:39:46 +08:00
James Chen
a6da007e4f
Updates JS-Test submodule.
2014-01-07 18:01:22 +08:00
James Chen
49ca35fc3d
Merge pull request #4956 from dumganhar/move-temp-obj
...
Uses CMAKE_BINARY_DIR instead of CMAKE_SOURCE_DIR, all temporary files will be in 'build' folder.
2014-01-06 23:58:42 -08:00
James Chen
f5ae2bbacc
Merge pull request #4932 from boyu0/iss3401_physical_lua_binding
...
issue #3401 : physical lua binding
2014-01-06 23:48:47 -08:00
James Chen
2a3481f20c
Moves temp files to CURRENT_BINARY_DIR.
2014-01-06 23:44:36 -08:00
James Chen
2eb8691f6a
Merge pull request #4946 from dumganhar/linux-template-fix
...
Linux template update
2014-01-06 20:57:28 -08:00
James Chen
23012352ce
Deletes unused Makefile for linux.
2014-01-06 19:36:13 -08:00
James Chen
e52d8e562b
Merge pull request #4942 from Dhilan007/develop_submodule
...
Updates JS-Tests submodule.
2014-01-06 19:03:49 -08:00
Dhilan007
f897407470
Updates JS-Tests submodule.
2014-01-07 10:55:42 +08:00
boyu0
cf146b32cf
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss3401_physical_lua_binding
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/scripting/lua/bindings/CCLuaStack.cpp
cocos/scripting/lua/script/Cocos2d.lua
cocos/scripting/lua/script/Cocos2dConstants.lua
2014-01-07 10:16:44 +08:00
CaiWenzhi
8cfc6fcafb
Remove useless samples
2014-01-07 09:47:46 +08:00
boyu0
eaa3041a97
issue #3401 : physical lua banding script, add testlua->physics test
2014-01-06 22:19:40 +08:00
Dhilan007
4087afaf4e
fix compiling error on vs project.
2014-01-06 19:55:29 +08:00
Dhilan007
4806ef5c6f
change time of initialization
2014-01-06 18:26:14 +08:00
Dhilan007
8e3eb8580f
fix crash in NewEventDispatcherTest.cpp on vs
2014-01-06 18:00:52 +08:00
Dhilan007
5786c8aa41
fix crash in TouchesTest.cpp on vs
2014-01-06 17:31:49 +08:00
minggo
cd6b000016
Merge pull request #4920 from minggo/develop
...
don't rlease autoreleased object
2014-01-06 01:21:13 -08:00
minggo
4033ecea77
don't rlease autoreleased object
2014-01-06 17:20:42 +08:00
James Chen
e705dfe471
Merge pull request #4917 from chengstory/AddTriggerCode
...
Add Trigger code to sceneTest on cocos2dx 3.x.
2014-01-06 01:16:46 -08:00
minggo
7b55c3da1e
don't release autoreleased objec
2014-01-06 17:03:24 +08:00
minggo
63ad431349
don't assign last element with (null, null)
2014-01-06 16:41:42 +08:00
zhangcheng
573737df40
Add Trigger code to sceneTest on cocos2dx 3.x.
2014-01-06 16:32:39 +08:00
minggo
94e0b03d47
don't release autoreleased object
2014-01-06 16:28:15 +08:00
James Chen
c40cedc804
Don't test Map<K,V>::bucketCount since it's platform dependence.
2014-01-06 16:09:01 +08:00
James Chen
d9e79b4ec5
Merge pull request #4915 from Dhilan007/develop_crash
...
fix crash in UnitTest.cpp on vs.
2014-01-05 23:27:08 -08:00
Dhilan007
4261a441de
fix crash in UnitTest.cpp on vs.
2014-01-06 15:19:47 +08:00
James Chen
22fa5319a9
Wrong search path fix for CocoStudioTest/SceneTest
2014-01-06 14:49:32 +08:00
James Chen
7ae83848a9
Updates JS-Tests submodule.
2014-01-06 13:55:20 +08:00
James Chen
f9f369258b
Renames resource folder name from 'loadXXX' to 'LoadXXX'
2014-01-06 13:47:11 +08:00
samuele3hu
d5d213aa0a
Fix:Update the file spelling
2014-01-06 11:19:40 +08:00
samuele3hu
130fa33a50
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
2014-01-06 11:13:26 +08:00
samuele3hu
7e279219ff
Fix:Resolve the error that CocoStudioSceneTest load resource in android
2014-01-06 11:12:44 +08:00
James Chen
d74d21a6f0
Merge pull request #4884 from daltomi/debug
...
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
2014-01-05 19:08:37 -08:00
James Chen
bf19541330
Updates JS-test submodule after merging.
2014-01-06 10:45:14 +08:00
James Chen
26e10ff662
[develop] Updates JS-test submodule
2014-01-06 10:38:04 +08:00
Huabing.Xu
a274d35025
remove node reuse in renderTextureSave
2014-01-06 09:49:04 +08:00
Dhilan007
8abc54bbac
add miss file for vs project.
2014-01-05 18:12:11 +08:00
chengstory
4893c561db
Merge branch 'develop' into #3582
2014-01-05 12:43:41 +08:00
James Chen
03200374b0
Merge pull request #4887 from Dhilan007/develop_crash
...
fix crash related to not support the z length modifier for size_t on vs
2014-01-04 20:10:40 -08:00
Dhilan007
49d8b76b9e
fix crash related to not support the z length modifier for size_t on vs
2014-01-05 11:59:32 +08:00
chengstory
125c52a10c
Merge branch 'develop' into #3582
2014-01-05 11:11:25 +08:00
James Chen
4699eb5751
Updates JS-Test submodule .
2014-01-05 10:10:51 +08:00
Daniel T. Borelli
8ffb05b6c9
Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness
2014-01-04 19:26:16 -03:00
chengstory
bac600ab9f
fixed #3582
...
1. create Component By component Factory.
2014-01-05 02:22:32 +08:00