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
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
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
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
minggo
27f35ac3e3
Merge pull request #4312 from samuele3hu/developTableView
...
[ci skip]Hot fix:Repair some lua test samples and modify layer touch listener functions
2013-11-18 07:09:57 -08:00
Dhilan007
a9e9dcbd9a
updating js shared submodule reference
2013-11-18 22:32:53 +08:00
samuele3
6c88dd34c0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-18 22:17:47 +08:00
samuele3
a2e9920288
Hot fix:Repair some lua test samples and modify layer touch listener functions
2013-11-18 22:16:49 +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
minggo
593c0f8946
Merge pull request #4304 from Dhilan007/di3223
...
[ci skip]issue #3223:bind gui and studio
2013-11-18 02:28:53 -08:00
Dhilan007
8b14575d7e
bind gui and studio.
2013-11-18 16:54:52 +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
boyu0
af65a59e5f
issue #2771 : fix indent
2013-11-18 10:15:50 +08:00
boyu0
a7d884a63f
issue #2771 : change debug draw defines to class static const variable
2013-11-18 10:10:37 +08:00
boyu0
8c949c3441
fix bugs: delete initTest functions.
2013-11-18 03:43:32 +08:00
boyu0
8ab64c9fa8
issue #2771 : fix some api name and code style
2013-11-18 03:10:13 +08:00
boyu0
0710cfa526
issue #2771 : delete PhysicsSlidingJoint and PhysicsSpringJoint. add joint tests, fix bugs
2013-11-18 02:16:20 +08:00
Nite Luo
f5a8c1d02c
Fix NewClipNodeTest
2013-11-15 17:32:29 -08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -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
minggo
425ce40a67
Merge pull request #4274 from Dhilan007/helloLuaConf
...
[ci skip]fix Incomplete helloLua project configuration.
2013-11-15 00:06:49 -08:00
Dhilan007
6db31508cc
fix Incomplete helloLua project configuration.
2013-11-15 16:01:03 +08:00
minggo
5870a69bb7
Merge pull request #4269 from Dhilan007/di2854
...
[ci skip]issue #2854:Disable CDT Builder on Eclipse
2013-11-14 23:45:13 -08:00
Dhilan007
050a47c4eb
issue #2854:Disable CDT Builder on Eclipse
2013-11-15 14:35:55 +08:00
samuele3
c1bdd8ad3c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 13:49:19 +08:00
samuele3
ec9bc0069f
Modify template of lua ios_mac config and some bugs
2013-11-15 13:48:34 +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
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
c52dc4ff5f
Adds love to ShaderTest2 test
...
Improves the code in ShaderTest2
2013-11-14 15:44:22 -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
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +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
chengstory
41975ba445
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
2013-11-14 14:16:14 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +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
Ricardo Quesada
0189f91480
More tests working
...
[x]: Texture2D test working OK
2013-11-13 17:47:26 -08:00
Ricardo Quesada
2ce2eaf4b3
More tests converted
2013-11-13 17:36:33 -08:00
Ricardo Quesada
d590986e73
Constructors are protected
2013-11-13 15:55:36 -08:00
samuele3
17f74eeb17
issue #2868:Modify armature test samples and add more armature test samples
2013-11-13 18:18:29 +08:00
boyu0
fb04c9e574
issue #2770 : fix some warning
2013-11-13 11:22:34 +08:00
samuele3
062fb85943
issue #2868:Modify cocos2dx_studio.ini to add more auto-binding class
2013-11-13 10:12:44 +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
d7b76a871e
Make sure it compiles after Change in test
2013-11-12 11:23:10 -08:00
Nite Luo
8c972d96a8
Create new test for NewRenderer
2013-11-12 11:19:18 -08:00
samuele3
c1d256c159
issue #2868:modify ccs lua test samples
2013-11-12 16:52:03 +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
samuele3
482ee5d47f
issue #2868:Add more ccs lua test samples
2013-11-12 15:25:47 +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
Nite Luo
a28f3f6f03
Merge branch 'develop' into newRenderer
2013-11-11 12:04:28 -08:00
CaiWenzhi
4f76141c41
optimize guireader
2013-11-11 18:22:14 +08:00
CaiWenzhi
782c26bc37
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-11 17:57:43 +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
bbb2579114
Merge pull request #4160 from dabingnn/iss3025_TextureCache
...
[ci skip]Iss3025 texture cache
2013-11-10 23:08:01 -08:00
James Chen
a6c85a3906
issue #3137 : Disabling Accelerometer when layer is destroyed.
2013-11-11 10:23:05 +08:00
James Chen
0eb9caa3d6
Merge commit 'refs/pull/4123/head' of git://github.com/cocos2d/cocos2d-x into fix-acc
2013-11-11 10:08:28 +08:00
samuele3
e26fe04deb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-09 23:04:11 +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
CaiWenzhi
1f389d3779
Rename event interface
2013-11-08 18:43:06 +08:00
boyu0
a56dedb41a
issue #2771 : add class PhysicsDebugDraw
2013-11-08 14:25:03 +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
CaiWenzhi
18f411fd1e
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-08 11:36:59 +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
109adaf337
Merge pull request #4103 from luisparravicini/issue-2882
...
[ci skip]added | operator for Control::EventType
2013-11-07 18:59:33 -08:00
minggo
d1f94e0d9d
Merge pull request #4111 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physical
2013-11-07 18:51:15 -08:00
minggo
167242e540
Merge pull request #4127 from Dhilan007/ANCHOR_XXX
...
[ci skip]Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, e...
2013-11-07 18:45:50 -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
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
Dhilan007
916361af3f
Point: Adds ANCHOR_XXX constants like ANCHOR_MIDDLE, ANCHOR_TOP_RIGHT, etc.
2013-11-07 23:40:33 +08:00
Huabing.Xu
bd7d62aee0
issue #3025 : replace TextureCache::getInstance() by Director::getInstance()->getTextureCache() in samples folder
2013-11-07 21:48:39 +08:00
CaiWenzhi
cbb9c655d9
fixed bugs
2013-11-07 21:10:48 +08:00
boyu0
cee966e284
issue #2771 : fix build error
2013-11-07 19:24:15 +08:00
boyu0
3e8871f2c9
issue #2771 : delete some unfinished PhysicsTest and change subtitle
2013-11-07 17:53:30 +08:00
boyu0
e278ad66c8
issue #2771 : change PhysicsJoint::create() to PhysicsJoint::construct()
2013-11-07 17:46:05 +08:00
boyu0
7363be0697
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-07 17:37:33 +08:00
CaiWenzhi
e2249c8c3f
Fixed crash
2013-11-07 17:15:52 +08:00
Jason Xu
b5f83c30b6
fix indention
2013-11-07 17:08:16 +08:00
CaiWenzhi
9f2297a5a6
add "retain" to listeners
2013-11-07 16:46:41 +08:00
Jason Xu
c9f814c016
fix Accelerometer Test with missing: Device::setAccelerometerEnabled(true);
2013-11-07 16:39:41 +08:00
boyu0
ef5440f738
issue #2771 : change rayCast and rectQuery callback class to std::function
2013-11-07 16:23:50 +08:00
samuele3
c055b1a3d6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-07 15:45:56 +08:00
minggo
4a691942f1
Merge pull request #4113 from nutty898/develop_nutty_Mergemasterbranchtodevelopbranch
...
Merge 2.x version to 3.0 version
2013-11-06 19:37:08 -08:00
minggo
f05b79d140
remove unneeded files
2013-11-07 11:29:23 +08:00
samuele3
4536798842
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-07 10:18:38 +08:00
samuele3
6a1a774303
issue #2868:Config cocoStudio GUI lua binding files and add a few script files
2013-11-07 10:16:02 +08:00
CaiWenzhi
cf20ae03ee
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-07 10:01:00 +08:00
James Chen
d6d041f561
issue #3113 : [Linux] Adding options for modules.
2013-11-06 19:17:34 +08:00
CaiWenzhi
7163dd4d76
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
2013-11-06 18:13:51 +08:00
CaiWenzhi
7a207431cd
Merge branch 'develop' into develop_nutty_Mergemasterbranchtodevelopbranch
...
Conflicts:
cocos/gui/UIHelper.h
2013-11-06 16:13:10 +08:00
2youyou2
fcf0b1ef5f
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-06 16:06:37 +08:00
CaiWenzhi
e0aa82da13
Merge master branch to develop branch
2013-11-06 16:04:06 +08:00
boyu0
75dd32cde9
issue #2771 : fix physics test compile error
2013-11-06 14:34:27 +08:00
James Chen
c364c4f083
issue #3113 : Updating CMakeLists.txt, Improve Copying files.
2013-11-06 10:57:36 +08:00
Luis Parravicini
8b1d3af720
added | operator for Control::EventType
2013-11-05 23:55:24 -03:00
boyu0
af129e25f0
issue #2771 : change some coding style
2013-11-05 20:02:58 +08:00
2youyou2
16c23d0ad3
remove CC_PROPERTY and CC_SYNTHESIZE.
2013-11-05 19:53:38 +08:00
boyu0
8c62bf813f
issue #2771 : enhance API and add Slice demo
2013-11-05 15:54:33 +08:00
2youyou2
3eef64c3b8
1. Change NULL to null
...
2. Remove CocoStudio/Armature files
2013-11-05 15:32:13 +08:00
samuele3
b76865c692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-05 15:11:05 +08:00
samuele3
b445f0824a
issue #2868:Bind UI and Scene parser to lua by bindings-generator and add releated test samples
2013-11-05 15:09:51 +08:00
2youyou2
b076711b69
fix compile error
2013-11-05 13:42:27 +08:00
Nite Luo
e4ffd250cb
Simple implementation of RenderCommand and RenderQueue
2013-11-04 09:14:22 -08:00
James Chen
edb1fc7822
[cmake] Deletes .icf files.
2013-11-04 21:03:09 +08:00
James Chen
733197fa65
[cmake] copy resources works.
2013-11-04 21:03:08 +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
c085412636
[CMake] TestLua and HelloLua is ok.
2013-11-04 21:03:07 +08:00
James Chen
922924e1ab
TestCpp is ok.
2013-11-04 21:03:07 +08:00
James Chen
e560de6e4e
HelloCpp works.
2013-11-04 21:03:07 +08:00
James Chen
8cdd1af982
HelloCpp CMakeLists.txt
2013-11-04 21:03:07 +08:00
samuele3
3289ce8fe0
issue #3037:Modify vs2012 config
2013-11-04 14:50:23 +08:00
samuele3
ba6cf00d9b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
2013-11-04 14:47:10 +08:00
samuele3
790be0decc
issue #3037:Modify vs2012 config
2013-11-04 14:43:22 +08:00
minggo
d1c02e6faa
Merge pull request #4078 from minggo/iss3108-signed_char
...
closed #3108 : add -fsigned-char to make char to signed as default on Android arm architecture
2013-11-03 22:37:37 -08:00
boyu0
00acd67ff3
issue #2771 : finish OneWayPlatform demo and fix some bugs
2013-11-04 14:36:38 +08:00
minggo
f6d82d21d2
closed #3108 : add -fsigned-char to make char to signed as default
2013-11-04 10:48:45 +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
8f213420eb
closed #3106 : Update NewEventDispatcherTest.cpp.
2013-11-02 22:05:04 +08:00
James Chen
7dc6513687
Adding more tests for EventDispatcherTest.
2013-11-02 21:47:00 +08: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
b751c41498
[Android] Updating Android.mk for JSB projects.
2013-11-01 18:27:47 +08:00
James Chen
e893ae5697
Using namespace std; for AssetsManagerTest.
2013-11-01 18:27:09 +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
463ed08ffe
issue #3037:Modify AssetsManagerTest.lua
2013-11-01 17:29:09 +08: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
James Chen
9fad8bfc8d
Don't set debug flag in AndroidManifest.xml.
2013-11-01 17:02:35 +08:00
boyu0
2f67ceb495
issue #2771 : fix some code style
2013-11-01 16:26:03 +08:00
James Chen
a04d1acede
Fix of compilation errros of SimpleGame.
2013-11-01 15:19:51 +08:00
boyu0
b2951b70ff
issue #2771 : enhance Listener use EventListener mechanism
2013-11-01 14:50:06 +08:00
2youyou2
a9054ba14a
1.add method to set collider filter
2013-11-01 14:36:44 +08:00
James Chen
db6bce4cf0
Merge pull request #4023 from samuele3hu/developHttp
...
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-31 20:40:29 -07:00
samuelhu
5010779e39
issue #3049:Reset .project file in pro.android.
2013-11-01 11:36:06 +08:00
samuelhu
f3ff7955a8
issue #3037:Modify platform build config
2013-11-01 11:18:02 +08:00
minggo
f684dc0ff7
Merge pull request #4025 from Dhilan007/di2893
...
issues #2893:perfect new label
2013-10-31 18:46:30 -07:00
James Chen
074f688d95
Merge pull request #4030 from dumganhar/spv25
...
[sp v25] Updating SpiderMonkey library to FFv25.
2013-10-31 07:08:09 -07:00
samuelhu
de4aaeda2d
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-31 22:06:34 +08:00
samuelhu
4031556398
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_samples.xcodeproj/project.pbxproj
samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
2013-10-31 21:57:24 +08:00
samuelhu
5891f00967
issue #3037:Add assetsmananger lua binding and a releated test sample
2013-10-31 21:52:28 +08:00
Dhilan007
150f1aeaab
issue #2893:improve new label
2013-10-31 20:17:30 +08:00
boyu0
dec749a692
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-31 18:20:32 +08:00
2youyou2
4eaaaddc34
upload resource
2013-10-31 17:29:03 +08:00
2youyou2
005d3c0121
1. fix if frame event is at the last frame, it may emit event several times
...
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
2013-10-31 17:28:14 +08:00
samuelhu
7c45ddafe2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-31 17:22:14 +08:00
Nite Luo
771844fc58
Fix android build after adding MouseEvent and MouseTest
2013-10-31 00:40:38 -07:00
samuelhu
705da20ee7
issue #2794:Add LuaObjectCBridge and related test sample
2013-10-31 15:26:38 +08:00
samuelhu
faf3b30e9b
issue #3069:Add LuaObjectCBridge and related test sample
2013-10-31 15:20:53 +08:00
Nite Luo
49a2acfbd4
Merge branch 'develop' into mousewheel_mac
2013-10-31 00:10:45 -07:00
Nite Luo
fe04448c8d
Merge folder changes from develop
2013-10-30 23:19:36 -07:00
James Chen
69b0206018
issue #2826 : Updating vs project to link mozjs-25.lib
2013-10-31 11:24:43 +08:00
Dhilan007
12db6a32ab
issues #2893 :
...
1.Texture atlas are create on demand, based on the characters used in the label.
2.Create Quads (and not sprites) for each letter.
2013-10-31 10:49:37 +08:00
samuelhu
53b0bfc27b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTouchEvent
2013-10-31 09:52:01 +08:00
samuelhu
1f07a659a6
issue #3069:Modify layer lua register and add some compatible lua binding functions
2013-10-31 09:49:04 +08:00
minggo
9e5420c954
Merge pull request #4029 from minggo/iss2905-adjust_folder
...
use build/android-build to build android samples, and update readme
2013-10-30 03:30:03 -07:00
minggo
da9f7c912b
use build/android-build to build android samples, and update readme
2013-10-30 18:27:56 +08:00
boyu0
e8d06496d0
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-10-30 17:27:09 +08:00
boyu0
391cda44ef
issue #2771 : edit listener
2013-10-30 15:53:58 +08:00
yinkaile
80b97be6f4
update develop
2013-10-30 11:34:16 +08:00
samuelhu
c08a09a7e0
#3049:Add LICENSE_JSON4LUA and some constant values.
2013-10-30 10:52:04 +08:00
yinkaile
ef973b5737
upload resource
2013-10-30 09:54:05 +08:00
yinkaile
8fa8b9f844
update develop
2013-10-30 09:41:40 +08:00
samuelhu
471bbb8af9
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 18:21:15 +08:00
samuelhu
b611177a65
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
2013-10-29 17:58:00 +08:00
samuelhu
70082ddc29
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 17:54:35 +08:00
boyu0
cae9a3e54f
issue #2771 : add physics pump demo and fix bugs
2013-10-29 17:31:35 +08:00
James Chen
ca598f29eb
Merge pull request #4008 from dumganhar/touchevent-refactor
...
issue #3069 : Refactor and Improve EventDispatcher
2013-10-29 00:46:56 -07:00
James Chen
cb7a762584
issue #3069 : Updating EventDispatcherTest.
2013-10-29 14:59:05 +08:00
samuelhu
3508213615
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-10-29 11:45:19 +08:00
samuelhu
a4d028e905
issue #3409:Add XMLHttpRequest lua binding and corresponding test sample
2013-10-29 11:40:41 +08:00
Michael Contento
fe180078f0
Android: add xlargeScreens="true" to supports-screens
2013-10-28 23:12:51 +01:00
boyu0
66d1bbd89f
issue #2771 : edit physics effect with all bodies and fix some bugs
2013-10-28 16:17:19 +08:00
James Chen
a829325240
issue #3069 : Updating EventDispatcherTest.
2013-10-28 16:00:19 +08:00
boyu0
d0d8694091
issue #2771 : fix some retain/release bugs
2013-10-28 11:08:41 +08:00
James Chen
e6b0134080
issue #3069 : Updating Custom event test.
2013-10-28 10:49:43 +08:00
James Chen
48ce5e39fe
EventDispatcher is managed by Director now, like Scheduler and ActionManager.
2013-10-26 15:04:01 +08:00
James Chen
9bf44a6c83
issue #3069 : Renaming 'removeListeners' to 'removeEventListeners'.
2013-10-25 16:34:26 +08:00
James Chen
27b71ba73c
Use integer as event type and listener type.
2013-10-25 10:53:47 +08:00
James Chen
b5cac51f97
PhysicsTest update.
2013-10-25 10:53:47 +08:00
James Chen
9c4bc9e8ed
Update physicsTest.
2013-10-25 10:53:47 +08:00