James Chen
f10bd853c0
A warning fix in CCBAnimationManager. Uses CallFuncN::create(std::function) instead.
2013-12-10 20:33:21 +08:00
James Chen
1db469fa3d
Merge pull request #4467 from CocosRobot/updategeneratedsubmodule_1386674868
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 03:28:49 -08:00
CocosRobot
bf11a8d309
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 11:27:50 +00:00
James Chen
47541523e8
Merge pull request #4466 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : HttpClient and TouchesTest uses Vector<T> now.
2013-12-10 03:24:31 -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
samuele3hu
89c079009b
issue #2790:Resolve some errors of basical conversion functions
2013-12-10 18:01:40 +08:00
James Chen
627a1bf700
issue #2790 : HttpClient uses Vector<T> now.
2013-12-10 16:41:13 +08:00
CocosRobot
a775f7940d
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 08:30:00 +00:00
James Chen
eff05669b9
Merge pull request #4463 from boyu0/edit_using_of_std_move
...
Edit using of std move
2013-12-10 00:12:07 -08:00
boyu0
083a0eea2a
Remove all std::move in function returns.
2013-12-10 16:06:05 +08:00
boyu0
698cdc5591
add std::move to Vector move constructor and move equal operator overloading function.
2013-12-10 15:58:13 +08:00
CocosRobot
b5a0048ffd
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 07:21:39 +00:00
minggo
55270cecb4
Merge pull request #4457 from dumganhar/iss2790-deprecate-ccarray
...
issue #2790 : Don't use CCDictionary, CCArray for CCBReader, use std::unordered_map, Vector<T>, Map<K, V> instead.
2013-12-09 23:15:43 -08:00
James Chen
e03dc97726
isssue #2790 : Removes unused FIXME comment.
2013-12-10 13:51:58 +08:00
James Chen
1a385c1572
issue #2790 : _actionManager —> _animationManager.
2013-12-10 13:45:15 +08:00
James Chen
52d00477ad
issue #2790 : Uses std::shared_ptr for _actionManagers.
2013-12-10 13:42:55 +08:00
James Chen
479477be52
issue #2790 : Stops all actions when reset _rootNode.
2013-12-10 13:41:51 +08:00
CocosRobot
1927e3e62c
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-10 04:08:19 +00:00
samuele3
85783fff2b
issue #2790:Unify the format
2013-12-10 11:47:51 +08:00
samuele3
34c0147cf3
issue #2790:Resolve the compile error
2013-12-10 11:33:57 +08:00
samuele3
f801a8e5fe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
2013-12-10 11:21:59 +08:00
samuele3
c2e7299d8f
Issue #2790:Add more conversion functions to support templates containers
2013-12-10 11:21:30 +08:00
Ricardo Quesada
0222c6544e
Migration to Mat4x4
...
Armature not migrated yet
Signed-off-by: Ricardo Quesada <ricardoquesada@gmail.com>
2013-12-09 17:32:51 -08:00
Ricardo Quesada
aa00137fde
Merge branch 'develop' into newRenderer
2013-12-09 11:10:00 -08:00
James Chen
64fd2386a9
issue #2790 : Uses Map<K, V> instead of Dictionary in CCBAnimationManager.
2013-12-09 18:17:04 +08:00
James Chen
8b69994d5c
issue #2790 : Removes CCBValue.
2013-12-09 17:55:56 +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
James Chen
f6dc9bf9b6
issue #2790 : Adds more ‘assignment operator’ method for CCValue.
2013-12-09 17:55:56 +08:00
James Chen
f16068e621
issue #2790 : Bug fix in CCMap.h
2013-12-09 17:55:56 +08:00
James Chen
21b84339ca
issue #2790 : Reverts to use Dictionary to avoid a strange bug for CCBReader.
2013-12-09 17:55:56 +08:00
James Chen
d63b933eb3
issue #2790 : More CCArray —> Vector<T> or ValueVector for CCBAnimationMangager
2013-12-09 17:55:55 +08:00
minggo
63779930a6
Merge pull request #4452 from boyu0/add_stencil_nil_test
...
[ci skip]Add _stencil is nil test, add warning log.
2013-12-09 01:32:40 -08:00
boyu0
d0da73c365
Add _stencil is nil test, add warning log.
2013-12-09 14:00:10 +08:00
youyou
a884a70045
fix2d compling warning
2013-12-09 13:56:07 +08:00
CocosRobot
b2e7966137
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-09 03:53:01 +00:00
boyu0
d6d7923134
closed #3162 : add RGBAProtocol, NodeRGBA and LayerRGBA back and deprecate them
2013-12-09 11:32:28 +08:00
youyou
c96bc7b58d
fix collider Synchronization
2013-12-09 11:14:53 +08:00
James Chen
a2e90f1fca
issue #2790 : Small fixes for physics, uses reference and std::move.
2013-12-09 10:54:22 +08:00
James Chen
13111c2cd9
issue #2790 : Error fix in CCBReader.
2013-12-09 09:54:04 +08:00
James Chen
e07f2bdddd
issue #2790 : Vector<T> and Map<K, V> for CCBReader. Not finished yet.
2013-12-08 22:17:54 +08:00
James Chen
f406dcfebc
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-deprecate-ccarray
2013-12-07 23:32:49 +08:00
James Chen
abbcd45c58
issue #2790 : CCLOG —> CCLOGINFO in CCMap.h
2013-12-07 23:32:29 +08:00
James Chen
908f5ed515
issue #2790 : Fix for TMXObjectGroup::getObject.
2013-12-07 16:38:50 +08:00
James Chen
beb6bb6c8d
issue #2790 : Bug fix in CCMap.h
2013-12-07 16:14:22 +08:00
James Chen
be7c62a2b9
issue #2790 : Removes unused CCSet binding glue codes.
2013-12-07 14:44:21 +08:00
James Chen
16cd61f024
issue #2790 : Vector<T> for physics and remove lots of unneeded dynamic_cast.
2013-12-07 14:28:14 +08:00
James Chen
365f6faabb
issue #2790 : Warning fixes for CCDictionary.cpp and CCString.cpp
2013-12-07 14:26:52 +08:00
James Chen
06e6d38ab0
issue #2790 : Initializes Value when empty constructor was invoked.
2013-12-07 14:26:17 +08:00
James Chen
6b0589679b
issue #2790 : Vector<SchedulerScriptHandlerEntry*> instead of CCArray* in CCScheduler
2013-12-07 14:25:24 +08:00
James Chen
d7997cf0cc
issue #2790 : Updates MenuItemToggole
2013-12-07 14:24:31 +08:00
James Chen
cd72813389
issue #2790 : Autorelease pool is using Vector<T> now.
2013-12-07 14:23:29 +08:00
James Chen
b0cb7c230a
#issue #2790 : Uses Vector<Scene*> for scenesStack in CCDirector.
2013-12-07 14:22:51 +08:00
James Chen
0091ca2b6f
issue #2790 : Uses non-const ValueMap for simplifying codes in CCAnimationCache.cpp.
2013-12-07 14:22:03 +08:00
James Chen
6f13a111ae
issue #2790 : Adds Vector<T>::sort method, adds Vector::removeObject(object, toRemoved).
2013-12-07 14:18:42 +08:00
James Chen
165cdf7fe6
issue #2790 : Deprecates CCArray.
2013-12-07 10:48:02 +08:00
James Chen
23ad9f4e1a
issue #2790 : Adds const version of Vector<T>::forEach.
2013-12-07 10:46:40 +08:00
Ricardo Quesada
8df96b1a6e
Layercolor uses the new API
2013-12-06 17:59:34 -08:00
Ricardo Quesada
ba2f65c6b2
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 17:42:48 -08:00
Ricardo Quesada
ee0ef6bf46
ProgressTimer works OK
...
Adds _modelViewTransform as ivar of Node (temporary fix)
2013-12-06 17:42:16 -08:00
Nite Luo
94255a9d52
Fix culling
2013-12-06 14:59:06 -08:00
Ricardo Quesada
439adafbcd
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
2013-12-06 11:57:19 -08:00
Ricardo Quesada
745541979b
Particles working again.
...
Paticle Batch working too: increased VBO_SIE to 10500
2013-12-06 11:51:17 -08:00
Nite Luo
3e0bee706e
Fix a hack in CCLabelAtlas for vertice color, add TODO for quad command
2013-12-06 11:41:24 -08:00
Ricardo Quesada
97fb43b8d7
Merge remote-tracking branch 'darkdukey/newRenderer' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-06 11:19:12 -08:00
Ricardo Quesada
73b1e3bb9e
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCSprite.cpp
2013-12-06 09:37:08 -08:00
boyu0
0e94d4f3b8
closed #3162 : fix indent.
2013-12-06 18:23:31 +08:00
James Chen
6cd573fa7f
issue #2790 : Deprecates CCSet.
2013-12-06 18:16:58 +08:00
boyu0
4d0e3dbd8d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect
2013-12-06 18:16:26 +08:00
boyu0
af5f496861
issue #3162 : Merge Node and NodeRGBA, fix bug: Child's opacity will not be changed when its parent's setCascadeOpacityEnabled was set to true and opacity was changed.
2013-12-06 18:07:16 +08:00
CocosRobot
8442f17259
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-06 09:31:16 +00:00
James Chen
0d30f2bbbb
Merge pull request #4445 from dumganhar/iss2790-template-container
...
issue #2790 : Fix of JSB project broken after using Vector<T>
2013-12-06 01:24:21 -08:00
minggo
368647c166
Merge pull request #4444 from minggo/fix-warning
...
fix some warnings
2013-12-06 01:07:03 -08:00
James Chen
9f6d2df63b
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2790-template-container
2013-12-06 16:46:51 +08:00
James Chen
b5978eeee6
issue #2790 : Bindings-generator supports binding Vector<T> and some bug fixes.
2013-12-06 16:46:19 +08:00
minggo
fa7c97171b
fix some warnings
2013-12-06 16:32:06 +08:00
minggo
0126aaa205
Merge pull request #4442 from minggo/use-schedule
...
use Schedule::performFunctionInCocosThread
2013-12-05 22:30:54 -08:00
Ricardo Quesada
81b06f06a9
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCAtlasNode.h
2013-12-05 22:24:41 -08:00
minggo
19c86c0e4f
Merge pull request #4434 from martell/msys2
...
Msys2 and Mingw added fixed x64 cocos/audio on Windows for MSVC and MinGW
2013-12-05 22:23:45 -08:00
minggo
eecd5d7980
Merge pull request #4441 from xhcnb/mem_leak_android_userdefault
...
[ci skip]UserDefault::setDataForKey on android will cause memory leak
2013-12-05 22:19:58 -08:00
samuele3
c006bfd68e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror
2013-12-06 14:17:23 +08:00
samuele3
ad8638d976
issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper
2013-12-06 14:16:33 +08:00
minggo
1502fef7e4
use Schedule::performFunctionInCocosThread
2013-12-06 14:15:01 +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
Jason Xu
29bd5001ae
UserDefault::setDataForKey on android will cause memory leak
2013-12-06 11:53:43 +08:00
minggo
f02d15d71f
initialize static member variable in cpp
2013-12-06 11:46:13 +08:00
Ricardo Quesada
e699a3b765
Uses MV in Quad Command
2013-12-05 19:04:01 -08:00
Nite Luo
42de943662
Fix Bug for Sprite performance test
2013-12-05 14:25:45 -08:00
Nite Luo
e3fc789070
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-12-05 12:05:44 -08:00
darkdukey
5f902d95b3
Merge pull request #5 from dabingnn/newRendererParticleSystem
...
New renderer particle system
2013-12-05 12:05:18 -08:00
Ricardo Quesada
f68dcd9969
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/Classes/tests.h
2013-12-05 11:47:46 -08:00
minggo
9676821479
use int in Vector
2013-12-05 17:38:08 +08:00
minggo
b67d567a79
replace long with int or ssize_t
2013-12-05 17:22:22 +08:00
James Chen
6aa2e5b257
Updates comments that vs2012 doesn’t support initializer list.
2013-12-05 16:49:05 +08:00
James Chen
b520941c5c
Reverts config of VS project.
2013-12-05 16:37:50 +08:00
James Chen
b4b50f3491
Compilation fix for windows.
2013-12-05 16:33:13 +08:00
James Chen
79700118db
Merge commit 'refs/pull/4433/head' of git://github.com/cocos2d/cocos2d-x into ccconsole
...
Conflicts:
cocos/base/CCConsole.cpp
cocos/base/CCConsole.h
2013-12-05 16:26:04 +08:00
James Chen
2b857ebb52
Fixing compilation errors on windows.
2013-12-05 16:09:38 +08:00
Ricardo Quesada
c617eee505
Uses the new Vector<>. Code is more robust!
2013-12-04 22:07:23 -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
CocosRobot
d04f777351
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-05 04:02:07 +00:00
James Chen
14ab7ccd16
Merge pull request #4428 from boyu0/iss2771_move_CC_USE_PHYSICS_to_header
...
issue #2771 : move CC_USE_PHYSICS from project definition to ccConfig.h
2013-12-04 19:55:10 -08:00
martell
e0523c73f5
fixed CCImage for MSVC someone added std:tolower which broke it
2013-12-05 03:53:25 +00:00
James
373c3b01bf
issue #2790 : Fixing compilation errors on linux.
2013-12-05 11:44:37 +08:00
martell
e5ada6f377
added support for msys2 mingwtoolchains and fix x64 cocos/audio on windows platform for MSVC and Mingw. Also fixed a few very bad type casts very important for future Arm64 bit processors
2013-12-05 03:37:27 +00:00
Ricardo Quesada
e0bf32d881
dprintf is not defined on Android
...
using my own dprintf
2013-12-04 19:33:50 -08:00
Ricardo Quesada
49b25231f2
Compiles on Android
2013-12-04 19:16:01 -08:00
Nite Luo
9b0e0d2116
Fix a bug with auto batching logic
2013-12-04 19:05:17 -08:00
James Chen
944160210c
issue #2790 : Renames functions in Map<K, V>.
2013-12-05 10:59:43 +08:00
Ricardo Quesada
4aae44f1e9
fixes cocos2d.h include
2013-12-04 18:54:15 -08:00
James Chen
499a0404d4
issue #2790 : Renames some functions in Vector<T>. Makes it more like stl vector.
2013-12-05 10:35:10 +08:00
Ricardo Quesada
15321a58df
fixes compiler errors on Linux
2013-12-04 18:28:09 -08:00
Huabing.Xu
e6823875d5
change VBO_SIZE to a big number to avoid crash temporarily
2013-12-05 10:20:54 +08:00
Huabing.Xu
7a58cb5a29
use quad command instead of custom command for ParticleSystemQuad::draw()
2013-12-05 10:20:22 +08:00
Ricardo Quesada
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
Nite Luo
e316ac779b
Sprite culling now using vertices directly to avoid calculation on transform
2013-12-04 17:41:18 -08:00
Ricardo Quesada
c2a88154af
Custom commands are working OK
2013-12-04 17:38:11 -08:00
Nite Luo
a98714f6a5
support device without VAO
2013-12-04 17:02:02 -08:00
Ricardo Quesada
e41deeee86
Adds Scene Graph command
2013-12-04 16:57:44 -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
Nite Luo
143df8af7d
Fix RenderTexture after merging commandpool
2013-12-04 15:13:13 -08:00
darkdukey
4b7d0c290a
Merge pull request #4 from dabingnn/newRendererCommandPool
...
New renderer command pool
2013-12-04 15:08:17 -08:00
Nite Luo
f423166471
Fix bugs with RenderTexture with NewRender
2013-12-04 15:06:28 -08:00
Ricardo Quesada
f69d5d1328
Merge branch 'develop' into console
2013-12-04 12:28:05 -08:00
Ricardo Quesada
245d33e4ad
Fixes several bugs in the console.
...
[*] Doesn't crash
[*] Closes connection
[*] Its faster
2013-12-04 12:26:43 -08:00
Nite Luo
ae551ae294
Convert RenderTexture to use RenderCommands
2013-12-04 11:54:57 -08:00
James Chen
c9767b8ea0
issue #2790 : fileToValueDict —> getValueMapFromFile, fileToValueArray —> getValueVectorFromFile.
2013-12-04 17:50:57 +08:00
James Chen
54289276de
issue #2790 : ValueArray —> ValueVector, ValueDict —> ValueMap, IntValueDict —> IntValueMap.
2013-12-04 17:46:57 +08:00
James Chen
736c70704b
issue #2790 : Some FIXME fixes.
2013-12-04 17:28:14 +08:00
James Chen
4212e33aee
issue #2790 : Removes unused comments in CCAnimation.h
2013-12-04 17:27:53 +08:00
James Chen
bbeec97b48
issue #2790 : Bug fixes in CCValue.cpp.
2013-12-04 16:38:12 +08:00
James Chen
82cc795ecf
issue #2790 : Adds more move functions.
2013-12-04 16:37:48 +08:00
James Chen
293ba0210b
issue #2790 : CCLOG —> CCLOGINFO for CCMap.h and CCVector.h
2013-12-04 16:37:08 +08:00
James Chen
60874ece64
issue #2790 : Updates Makefile, Moves some codes to CCValue.cpp.
2013-12-04 16:18:22 +08:00
James Chen
ceaa1f26bb
issue #2790 : Windows run ok with ValueDict for FileUtils.
2013-12-04 16:02:54 +08:00
James Chen
76896d70d0
issue #2790 : Android build was ok, fixes some warnings.
2013-12-04 16:02:54 +08:00
James Chen
35b96602d3
issue #2790 : includes <algorithm> for std::for_each.
2013-12-04 16:02:53 +08:00
James Chen
5c60f66c63
issue #2790 : Menu::itemForTouch —> Menu::getItemForTouch. Array* —> ValueArray.
2013-12-04 16:02:53 +08:00
James Chen
f01f56113c
issue #2790 : Don’t make an assert if converting Value failed.
2013-12-04 16:02:53 +08:00
James Chen
5eb9446b80
issue #2790 : Uses const reference instead of value for std::for_each ’s argument.
2013-12-04 16:02:53 +08:00
James Chen
3fc5fffd26
issue #2790 : const char* —> const std::string& for CCNS.h/.cpp.
2013-12-04 16:02:53 +08:00
James Chen
9881ab2178
issue #2790 : Uses cocos2d::Map and ValueDict for SpriteFrameCache.
2013-12-04 16:02:53 +08:00
James Chen
2e0489a49c
issue #2790 : Uses ValueDict instead of Dictionary* for ParticleSystem.
2013-12-04 16:02:53 +08:00
James Chen
2d6e6dbdb0
issue #2790 : Assert fix for Vector<T>::insertObject.
2013-12-04 16:02:52 +08:00
James Chen
1164176bed
issue #2790 : NULL —> nullptr in CCParticleSystem.cpp.
2013-12-04 16:02:52 +08:00
James Chen
411136dd57
issue #2790 : Updates CCValue, supports using ‘const char*’ to construct a Value.
2013-12-04 16:02:52 +08:00
James Chen
4ec6e50cc4
issue #2790 : Pure base data from Dictionary* to ValueDict, Array* to ValueArray.
2013-12-04 16:02:52 +08:00
James Chen
8a435aa274
issue #2790 : ArrayValue —> ValueArray, DictValue —> ValueDict.
2013-12-04 16:02:52 +08:00
James Chen
3136ffc3dd
issue #2790 : Adds CCValue.h/.cpp.
2013-12-04 16:02:51 +08:00
James Chen
d2bddee11e
issue #2790 : Adds CCMap.h.
2013-12-04 16:01:56 +08:00
James Chen
9928e8bef1
issue #2790 : Uses Vector<T>::getObjectAtIndex instead of Vector<T>[] operator to avoid some mistakes.
2013-12-04 16:01:55 +08:00
James Chen
cb215bc931
issue #2790 : Vector<T> replaces Array* finished.
2013-12-04 16:01:55 +08:00
James Chen
0d581a15d8
issue #2790 : MenuItemToggle::setSubItems() uses Vector<MenuItem*> now.
2013-12-04 16:01:55 +08:00
James Chen
8aef092005
issue #2790 : TestCpp with new Vector<>.
2013-12-04 16:01:54 +08:00
James Chen
1d5984b29a
issue #2790 : Vector::makeObjectsPerformCallback —> Vector::forEach
2013-12-04 16:01:02 +08:00
James Chen
d4d864216b
issue #2790 : Deletes Vector::init, adds Vector::setCapacity.
2013-12-04 16:00:18 +08:00
James Chen
90062b656d
issue #2790 : Node::_children is Vector<Node*> now.
2013-12-04 16:00:17 +08:00
James Chen
c152652c5b
issue #2790 : Vector<FiniteTimeAction*> for Sequence::create(arr) and Spawn::create(arr).
2013-12-04 15:56:08 +08:00
James Chen
80004548c8
issue #2790 : Adds CCVector.h to Xcode project. int —> long
2013-12-04 15:56:08 +08:00
James Chen
52af153a81
issue #2790 : Commit CCVector.h from Riq’s repo( https://github.com/ricardoquesada/cocos2d-x/blob/template_vector/cocos2dx/cocoa/CCVector.h ).
2013-12-04 15:56:08 +08:00
CocosRobot
a354031526
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-12-04 07:47:50 +00:00
samuele3
629ffcbbfd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-04 15:20:09 +08:00
samuele3
c1a226686f
issue #3309:Modify some deprecated cpp files and lua files
2013-12-04 15:15:55 +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
Huabing.Xu
cd562676f5
use block allocation for commands
2013-12-04 10:39:34 +08:00
minggo
9babdaa1fa
Merge pull request #4419 from boyu0/iss2771_physical_fix_update_physics_transform
...
[ci skip]issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 18:15:35 -08:00
minggo
712bcc7b36
Merge pull request #4416 from minggo/change-long
...
[ci skip]use size_t instead of long in Array
2013-12-03 18:08:08 -08:00
Nite Luo
0c292e59b8
Merge branch 'develop' into newRenderer
2013-12-03 10:52:10 -08:00
boyu0
fd68dc4f9f
issue #2771 : add condition test to updatePhysicsTransform
2013-12-03 16:28:18 +08:00
samuele3
367799da0d
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developDeprecated
2013-12-03 15:42:31 +08:00
samuele3
a8c1bba464
issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings
2013-12-03 15:40:59 +08:00
Huabing.Xu
757f1abc7f
1. protected render command construction/destruction function.
...
2. use renderCommandPool<T> to allocate and deallocate command
3. use releaseToCommandPool interface to push command back to pool
2013-12-03 14:08:47 +08:00
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
Huabing.Xu
44f12ce8e4
add RenderCommandPool head file
2013-12-03 11:52:51 +08:00
Huabing.Xu
d4b9e0538b
refactor: group command use a non parameter constructor and a reentrant init function
2013-12-03 11:24:03 +08:00
Huabing.Xu
d33f05b3f0
refactor: custom command use a non parameter constructor and a reentrant init function
2013-12-03 11:17:21 +08:00
Huabing.Xu
ace75eebce
refactor: quad command use a non parameter constructor and a reentrant init function
2013-12-03 11:11:46 +08:00
minggo
225348cdde
use size_t instead of long in Array
2013-12-03 11:09:39 +08:00
Nite Luo
6862d59bb2
Add NewRenderTexture to convert RenderTexture to use new renderer
2013-12-02 17:23:52 -08:00
Nite Luo
8801f508eb
Partcle system use the new renderer
2013-12-02 12:13:05 -08:00
Nite Luo
fbadb3329a
Merge branch 'develop' into newRenderer
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2013-12-02 10:55:31 -08:00
Ricardo Quesada
dbcae0af1e
Merge branch 'develop' into console
2013-12-02 09:57:53 -08:00
Ricardo Quesada
eb834bce7f
Adds readline
2013-12-02 09:57:16 -08:00
boyu0
dba58f6a9b
issue #2771 : add more joints
2013-12-02 18:29:04 +08:00
James Chen
9618eb00be
Merge pull request #4411 from martell/cmake
...
closed #3328 : cmake support for windows
2013-12-02 01:22:57 -08:00
martell
06ff1bc594
Fixed HelloCpp Linking on Linux
2013-12-02 07:10:37 +00:00
martell
7a8653525b
fixed Audio for Linux
2013-12-02 06:37:32 +00:00
2youyou2
963dd6852b
Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into develop
2013-12-02 13:33:26 +08:00
2youyou2
246b03d52d
fixed alpha effect
2013-12-02 13:32:31 +08:00
minggo
d2f235f8b8
Merge pull request #4408 from boyu0/iss2345_add_tga_support_to_CCImage
...
[ci skip]issue #2345 : add tga support to Image
2013-12-01 18:18:42 -08:00
minggo
24f7819e99
Merge pull request #4362 from xhcnb/hotfix_android_setAccelerometerInterval
...
[ci skip]Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-12-01 18:08:58 -08:00
martell
f369606d77
fix cocos2d-x for vs2013
2013-11-30 08:05:39 +00:00
martell
79401a7596
quickly added win32 cmake
2013-11-30 06:09:12 +00:00
signmotion
03d64e0689
- Corrected CC_DISALLOW_COPY_AND_ASSIGN.
2013-11-29 20:34:15 +02: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
Jason Xu
266e4e1654
rename to with Jni suffex
2013-11-29 19:34:36 +08:00
Jason Xu
27c3a459ed
rename android native function names.
2013-11-29 17:17:15 +08:00
boyu0
83f855e2ec
issue #2345 : delete unnecessary include
2013-11-29 15:31:58 +08:00
boyu0
04c3d95005
issue #2345 : namespace cocos2d { -> NS_CC_BEGIN
2013-11-29 15:25:21 +08:00
boyu0
dffc12e648
issue #2345 : new/delete -> malloc/free
2013-11-29 15:13:16 +08:00
boyu0
86074c23d8
issue #2345 : class Image add tga image format support.
2013-11-29 14:31:42 +08:00
minggo
3268da3a4d
Merge pull request #4401 from minggo/thread-helper
...
[ci skip]add helper funcion to invoke a function in gl thread
2013-11-27 22:26:11 -08:00
CocosRobot
a24af527a3
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-28 03:14:39 +00:00
Ricardo Quesada
21afd63d82
Merge branch 'develop' into console
2013-11-27 14:29:27 -08:00
Nite Luo
83972ecf57
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
2013-11-27 10:16:34 -08:00
Nite Luo
75381ebc51
Merge branch 'develop' into newRenderer
2013-11-27 10:16:17 -08:00
boyu0
4615eae22f
issue #2771:remove unneeded include “ccConfig.h”
2013-11-27 18:30:48 +08:00
boyu0
72f2d68edd
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2771_physical
2013-11-27 17:47:37 +08:00
minggo
eded94ef76
don't create a pool, since it doesn't invoke any iOS dependent codes
2013-11-27 17:43:54 +08:00
boyu0
2b43e72e7c
issue #2771 : fix vs compile errors, change project setting
2013-11-27 17:33:33 +08:00
minggo
bcb131262c
add helper funcion to invoke a function in gl thread
2013-11-27 16:49:07 +08:00
James Chen
468ba24183
Merge pull request #4397 from CocosRobot/updategeneratedsubmodule_1385533506
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-26 22:32:04 -08:00
Huabing.Xu
ea46e1c658
change test case
2013-11-27 14:30:38 +08:00
James Chen
1a283ab600
Merge pull request #4396 from dumganhar/iss3289-armature-crash
...
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes...
2013-11-26 22:29:36 -08:00
CocosRobot
4d327b8180
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-27 06:25:08 +00:00
James Chen
6dc9183c8a
closed #3289 : [JSB] 'Test Frame Event' of CocoStudioArmatureTest Crashes!
2013-11-27 14:12:43 +08:00
James Chen
4311e7c469
[Script Binding] Bind ‘unsigned long’.
2013-11-27 13:52:41 +08:00
2youyou2
36cd51a453
change ColliderFilter param type
2013-11-27 11:39:58 +08:00
2youyou2
c0bd7f012c
change ColliderFilter param type
2013-11-27 11:32:37 +08:00
James Chen
f4610c5272
Merge pull request #4382 from dumganhar/iss3279-xmlhttprequest-bin
...
closed #3279 : XMLHttpRequest receives wrong binary array.
2013-11-26 19:02:07 -08:00
Ricardo Quesada
534fd9600e
Adds CCConsole.
...
it doesn't work... just the skeleton
2013-11-26 18:58:36 -08:00
Huabing.Xu
3da196ea43
add Frustum culling to new Sprite
2013-11-27 10:35:12 +08:00
Huabing.Xu
80da1dac3f
add Frustum, AABB, ViewTransform
2013-11-27 10:34:30 +08:00
CocosRobot
dda13b7e8a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-27 02:18:42 +00:00
James Chen
6c097fa692
Merge pull request #4389 from minggo/remove-unneeded-codes
...
override addChild in Sprite to fix error in binding generator
2013-11-26 18:14:20 -08:00
minggo
0ac9022201
fix a typo
2013-11-27 10:02:32 +08:00
minggo
85002285c2
override addChild in Sprite to fix error in binding generator
2013-11-27 09:50:47 +08:00
Nite Luo
3123c70153
Sprite are now using NewRenderer
2013-11-26 17:13:04 -08:00
Nite Luo
bf53cc116b
use updateQuadVertices function to update vertices since update transform is highly customized for BatchNode
2013-11-26 17:01:32 -08:00
Ricardo Quesada
2f1dffe46b
Adds performFunctionInCocos2dThread
...
... in Scheduler
2013-11-26 16:58:14 -08:00
Ricardo Quesada
b7f7b0dae4
Reports wether the build is DEBUG or RELEASE
...
Reports wether the build is DEBUG or RELEASE in Configuration
2013-11-26 14:36:31 -08:00
Nite Luo
92b57c79ba
Merge branch 'develop' into newRenderer
...
Conflicts:
cocos/2d/CCClippingNode.h
cocos/2d/CCLayer.h
2013-11-26 11:56:03 -08:00
Nite Luo
61ca4f0137
Fix a bug with NewSprite Update Quad
2013-11-26 11:48:37 -08:00
James Chen
f6a1f5cc95
issue #3279 : A warning fix for 64bit platform.
2013-11-26 21:54:48 +08:00
James Chen
ecc7783685
closed #3279 : XMLHttpRequest receives wrong binary array.
2013-11-26 20:31:44 +08:00
boyu0
8346fe4b4d
issue #2771 : edit android.mk, CMakeLists.txt, change PHYSICS_CONTACT_POINT_MAX to PhysicsContactData:POINT_MAX
2013-11-26 18:22:52 +08:00
minggo
fcf43823b4
remove unneeded codes
2013-11-26 17:53:34 +08:00
James Chen
23de9bf8cd
Merge pull request #4378 from hulefei/dev_addGuiNamespace
...
add gui namespace before SEL_TouchEvent
2013-11-26 01:43:36 -08:00
boyu0
0100c05a93
issue #2771 : fix compile errors
2013-11-26 17:29:09 +08:00
hanson
d650c0a6a1
add gui namespace before SEL_TouchEvent
2013-11-26 17:03:01 +08:00
CocosRobot
17c4631f45
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-26 08:36:22 +00: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
James Chen
63702188be
issue #3258 : Compilation error fix for linux port.
2013-11-26 15:56:43 +08:00
James Chen
ebcdf2f87d
issue #3258 : Bug fix of MenuItemToggle binding.
2013-11-26 15:44:49 +08:00
James Chen
b55e8f17c7
issue #3258 : MenuItemFont has empty argument create function now.
2013-11-26 15:44:21 +08:00
boyu0
99d904363a
issue #2771 : delete all the box2d implementation in physics parts.
2013-11-26 13:47:42 +08:00
boyu0
df1fca3279
issue #2771 : refactor some functions and delete PHYSICS_INFINITY macro.
2013-11-26 11:38:55 +08:00
James Chen
5fbf164142
closed #3274 : Can't override cc.Node.setPosition in JSB.
2013-11-26 10:14:56 +08:00
Nite Luo
f3830985bb
Sprite now using New renderer
2013-11-25 16:33:05 -08:00
Ricardo Quesada
a198fb51df
JS Bindings Menu
...
doesn't initialize the menu twice.
2013-11-25 16:24:33 -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
boyu0
09ba28d522
issue #2771 : refactor PhysicsWorld and PhysicsWorldInfo
2013-11-25 17:57:06 +08:00
signmotion
25cc4101a7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-11-25 10:23:50 +02:00
James Chen
9ebc4e3722
Merge pull request #4358 from samuele3hu/developTableView
...
issue #3228:CallFuncND + auto remove lua test case have no effect
2013-11-25 00:18:30 -08:00
signmotion
5f74496d7a
- Reverted modification. See below.
...
> @@ -301,7 +301,8 @@ void UIListView::removeLastItem()
>
> UIWidget* UIListView::getItem(unsigned int index)
> {
> - if ((int)index < 0 || index >= _items->count())
> + // @todo Signed/unsigned mishmash. Index is must be unsigned int always. Yes?
> + if ( ((int)index < 0) || ((int)index >= _items->count()) )
May be we should change the type of parameter.
So could you please revert the modification of this file?
2013-11-25 10:00:09 +02:00
James Chen
b9fa8566f2
closed #3273 : ScriptingCore::evalString crashes
2013-11-25 15:52:59 +08:00
James Chen
8574fb0494
Build fix for XMLHttpRequest after using std::unordered_map instead of std::map.
2013-11-25 15:11:43 +08:00
2youyou2
9cfb7b2a85
change armature version
2013-11-25 14:46:10 +08:00
CocosRobot
a4c2ccdf65
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-25 02:16:36 +00:00
boyu0
f2dabe77ec
issue #2771 : add some method implements with box2d in PhysicsWorld
2013-11-25 10:08:52 +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
b67ec6618f
Finish converting LayerColor start working on particle system
2013-11-22 17:14:24 -08:00
Ricardo Quesada
cc5a03f21a
updates cocos2d version
2013-11-22 16:58:05 -08:00
Ricardo Quesada
447a34655a
RenderTexture contructor ctor is public again
2013-11-22 16:14:05 -08:00
Nite Luo
60ada5dee3
Fonts are now using NewSprite to render
2013-11-22 16:09:11 -08:00
Ricardo Quesada
9b52af010d
Macro CC_DISABLE_COPY is renamed to CC_DISALLOW_COPY_AND_ASSIGN
...
and the old CC_DISALLOW_COPY_AND_ASSIGN is removed
2013-11-22 16:09:05 -08:00
Ricardo Quesada
3f1983214f
Effects have protected contructors
...
and disallowed copy + assign
2013-11-22 15:07:58 -08:00
Nite Luo
b02af0cbfe
Clean up renderer code
2013-11-22 10:24:52 -08:00
Ricardo Quesada
4d7e56b44a
fix indentation
2013-11-22 09:42:21 -08:00
Jason Xu
7c5784005c
Fix: on android, Device::setAccelerometerInterval will causes dead loop
2013-11-23 00:07:15 +08:00
samuele3
eb3f5eb629
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-22 11:52:32 +08:00
samuele3
192deb7952
issue #3228 : Reconstruct the Callfunc create method to support std::function and add callFuncND + auto remove lua test case
2013-11-22 11:51:07 +08:00
Ricardo Quesada
515786a7ee
adds CC_DISALLOW_COPY_AND_ASSIGN() to Actilons
...
... and also moves the Contructor/Destrucotor/initXXX to `protected:`
2013-11-21 17:06:06 -08:00
Nite Luo
43941bcbe0
Only init render after GLview has been initialized
2013-11-21 16:36:19 -08:00
Ricardo Quesada
b6ddc6d048
Uses std::unordered_map<> instead of std::map<>
...
and more fixes.
2013-11-21 13:43:59 -08:00
Ricardo Quesada
a26b385b11
Merge branch 'develop' into constructors_are_protected
2013-11-21 10:56:03 -08:00
Nite Luo
96d2910a99
Merge branch 'develop' into newRenderer
2013-11-21 10:19:32 -08:00
boyu0
8e14cdb8d2
issue #2771 : add assert to joint
2013-11-21 14:39:37 +08:00
minggo
4582686860
Merge pull request #4347 from samuele3hu/developTableView
...
[ci skip]Add doxygen comments for the CocoStudio
2013-11-20 21:55:34 -08:00
Nite Luo
db52698b26
Fix the crash on ios 7
2013-11-20 20:39:32 -08:00
Ricardo Quesada
90f51e0dab
Merge branch 'develop' into constructors_are_protected
2013-11-20 11:26:55 -08:00
Ricardo Quesada
6a8c4784a4
Adds some #pragma mark love
2013-11-20 11:26:33 -08:00
Ricardo Quesada
d3c44cbb0b
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-20 11:23:03 -08:00
Nite Luo
f438e83104
Merge branch 'develop' into newRenderer
2013-11-20 11:14:28 -08:00
Nite Luo
0e51504ee6
Use stack to manage current RenderGroup
2013-11-20 11:05:01 -08:00
James Chen
bffc5bb4d5
Merge pull request #4348 from boyu0/iss2771_physical
...
issue #2771 : physical bug fix.
2013-11-20 00:24:07 -08:00
boyu0
1743826498
issue #2771 : fix a careless mistake
2013-11-20 16:08:48 +08:00
boyu0
bde6f5d9eb
issue #2771 : fix crash bug
2013-11-20 15:54:09 +08:00
samuele3
07ea8647c3
Add doxygen comments for the CocoStudio
2013-11-20 15:07:34 +08:00
samuele3
3ed7a79a84
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-20 13:01:07 +08:00
CocosRobot
54ef1d6c15
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-20 04:24:55 +00:00
samuele3
8a408f9951
Add doxygen comments for the CocoStudio
2013-11-20 12:04:47 +08:00
James Chen
59c2647bd6
Prevents warning of invoking ScrollView::setTouchEnabled. Layer::setTouchEnabled should not be a virtual function.
2013-11-20 11:35:04 +08:00
James Chen
da8c34d994
Fix of unsigned / signed mismatch in UIPageView.cpp.
2013-11-20 11:20:35 +08:00
James Chen
6b579ebe5e
Don't deprecate callback functions in Layer. Reason:
...
Callback function should not be deprecated, it will generate lots of warnings.
Since 'setTouchEnabled' was deprecated, it will make warnings if developer overrides onTouchXXX and invokes setTouchEnabled(true) instead of using EventDispatcher::addEventListenerWithXXX.
2013-11-20 11:19:51 +08:00
James Chen
93333ad252
Merge pull request #4340 from Dhilan007/jssubmodule
...
recover controller on layer.
2013-11-19 18:49:07 -08:00
James Chen
3c783d2e28
Merge pull request #4344 from dumganhar/develop
...
Fixing warning generated by VS2012.
2013-11-19 18:43:14 -08:00
Dhilan007
bd3789e0b5
add miss api
2013-11-20 10:40:43 +08:00
James Chen
424431690a
Fixing warning generated by VS2012.
2013-11-20 10:39:30 +08:00
Dhilan007
0646e59bf3
resolve conflict
2013-11-20 10:26:00 +08:00
boyu0
c945fbd42c
issue #2771 : add some warning log
2013-11-20 10:25:43 +08:00
James Chen
60ed1dcd3a
Merge pull request #4341 from Dhilan007/touchfix
...
fix touches not working in cocosbuilder
2013-11-19 18:20:42 -08:00
Ricardo Quesada
9a51d6c0ba
Merge branch 'develop' into constructors_are_protected
2013-11-19 17:59:43 -08:00
Dhilan007
02c69a5c6a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-20 09:57:50 +08:00
Ricardo Quesada
0d750cdbaf
Adds virtual destructors on Interfaces
...
Classes with at least one virtual function needs a virtual destructor.
This patch adds virtual destructors to Interface classes
And also enables 'warn on missing virtual destructors'
2013-11-19 16:57:23 -08:00
Nite Luo
8ce16e1e12
Finish DrawNode
2013-11-19 13:57:39 -08:00
Ricardo Quesada
27b09a2b3b
Merge branch 'develop' into constructors_are_protected
2013-11-19 13:54:34 -08:00
Ricardo Quesada
582afe3b61
Fixes warnings in CCLabel
...
These warnings were introduced yesterday.
Since we are paying attention to the warnings, new code MUST NOT
generate new warnings.
2013-11-19 13:51:40 -08:00
Ricardo Quesada
5c74c938ee
Merge branch 'develop' into constructors_are_protected
...
Conflicts:
cocos/2d/CCLayer.h
2013-11-19 13:13:57 -08:00
Nite Luo
a3725c2394
Merge branch 'develop' into newRenderer
2013-11-19 11:08:26 -08:00
Nite Luo
7ad64ece36
Add Transform to DrawNode
2013-11-19 11:06:26 -08:00
Dhilan007
948410c7b5
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 19:33:26 +08:00
Dhilan007
23f36e0406
fix touches not working in cocosbuilder
2013-11-19 19:24:04 +08:00
boyu0
aec514e3a2
issue #2771 : fix collision bug cause by dynamic/static cast.
2013-11-19 18:30:12 +08:00
CocosRobot
d8ec58831a
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 09:40:27 +00:00
Dhilan007
dc42645afe
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into bind_studio
2013-11-19 16:49:28 +08:00
Dhilan007
3929e6070d
fix error form overrides a 'final' function
2013-11-19 16:27:09 +08:00
Dhilan007
c307d83b35
add miss Deprecated api
2013-11-19 16:06:27 +08:00
Dhilan007
1a65af9d1a
fix warn
2013-11-19 15:54:54 +08:00
Dhilan007
f0ab3f9ca1
fix some error in layer controller code
2013-11-19 15:41:22 +08:00
Dhilan007
0586c4d275
recover controller on layer.
2013-11-19 13:56:30 +08:00
minggo
594450e3f7
Merge pull request #4330 from CocosRobot/updategeneratedsubmodule_1384833055
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 19:52:09 -08:00
CocosRobot
0855ff0841
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 03:50:57 +00:00
minggo
2848e0dc3e
Merge pull request #4328 from 2youyouo2/develop
...
[ci skip]update armature
2013-11-18 19:46:29 -08:00
2youyou2
d5478f1ca2
fix if last frame has tween effect, armature may display wrong
2013-11-19 11:44:17 +08:00
minggo
bd00e6fabb
Merge pull request #4326 from dabingnn/develop_hotFix
...
[ci skip]Develop hot fix
2013-11-18 19:33:07 -08:00
Huabing.Xu
1fc928df41
HotFix: use static cast for format conversion
2013-11-19 11:32:12 +08:00
yinkaile
f308f2f95a
fix CCArmature display wrong on mac version
2013-11-19 11:22:40 +08:00
Huabing.Xu
49f34c5339
HotFix: fix CCB particle alpha blend-> setBlendAddictive after set texture
2013-11-19 11:19:12 +08:00
Huabing.Xu
fff851a8aa
HotFix: change tab to space
2013-11-19 11:17:02 +08:00
Huabing.Xu
458b9b53da
HotFix: fix CCB particle alpha blend
2013-11-19 11:16:14 +08:00
minggo
1e8a3fc92f
Merge pull request #4322 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug spine alpha blend error
2013-11-18 18:54:16 -08:00
minggo
fb2c2ec7f2
Merge pull request #4323 from Dhilan007/jssubmodule
...
[ci skip]fix miss bind setGrid\getGrid for JS.
2013-11-18 18:53:51 -08:00
minggo
8e7cce8cea
Merge pull request #4324 from CocosRobot/updategeneratedsubmodule_1384828843
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 18:53:06 -08:00
Huabing.Xu
69b38f6e40
HotFix: change tab to space
2013-11-19 10:42:37 +08:00
CocosRobot
186b6fd98b
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-19 02:40:44 +00:00
minggo
78f2e0982e
Merge pull request #4319 from liamcindy/develop
...
[ci skip]fixed ui anmation crash when stop animation for develop branch
2013-11-18 18:34:16 -08:00
Dhilan007
ce0a6d5b57
fix miss bind setGrid\getGrid for JS.
2013-11-19 10:33:11 +08:00
Huabing.Xu
d9681150fc
HotFix: fix bug spine alpha blend error
2013-11-19 10:15:12 +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
James Chen
91a57c614d
closed #3224 : The subthread of CCHttpClient interrupts main thread if timeout signal comes.
2013-11-19 00:19:57 +08:00
minggo
1ed8cfee7c
Merge pull request #4297 from liamcindy/develop
...
[ci skip]Shielded unusefull log for develop branch
2013-11-18 07:10:40 -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
minggo
0e2ea2971d
Merge pull request #4313 from minggo/develop
...
[ci skip]fix compiling error of js template
2013-11-18 06:33:23 -08:00
minggo
2028cde015
fix compiling error of js template
2013-11-18 22:32:13 +08:00
minggo
62bd6453fc
Merge pull request #4310 from boyu0/iss2771_physical
...
[ci skip]issue #2771 physical fix crashes
2013-11-18 06:19:49 -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
minggo
fc56d9234e
Merge pull request #4309 from dabingnn/develop_hotFix
...
[ci skip]HotFix: fix bug callback retain release error
2013-11-18 05:14:41 -08:00
Huabing.Xu
699dd9518b
HotFix: fix bug callback retain release error
2013-11-18 21:12:47 +08:00
boyu0
68b98fc84f
issue #2771 : change PhysicsContact::create to construct
2013-11-18 21:06:05 +08:00
CocosRobot
853a895c69
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 10:57:00 +00:00
James Chen
060e8413dd
Merge pull request #4307 from CocosRobot/updategeneratedsubmodule_1384771216
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 02:51:11 -08:00
CocosRobot
7afb8877c5
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-18 10:40:18 +00: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
minggo
da2158de20
Merge pull request #4303 from boyu0/iss2771_physical
...
[ci skip]issue #2771 : physics. rename resetForce to resetForces
2013-11-18 00:32:06 -08:00
boyu0
23c477f15d
issue #2771 : rename resetForce to resetForces
2013-11-18 16:27:23 +08:00
minggo
c7971bcaad
Merge pull request #4300 from minggo/textinput-crash
...
[ci skip]fix crash of textinput test case
2013-11-18 00:23:51 -08:00
samuele3
ee815c8e9a
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTableView
2013-11-18 15:57:14 +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
minggo
30b7ac8dd1
fix crash of textinput test case
2013-11-18 15:14:48 +08:00
minggo
946fd16adc
Merge pull request #4295 from samuele3hu/developCCS
...
[ci skip]hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
2013-11-17 23:10:01 -08:00
minggo
5c41130083
Merge pull request #4293 from 2youyouo2/develop
...
[ci skip]fixed BatchNode's _children is empty, draw will crash
2013-11-17 23:01:32 -08:00
minggo
bbb579faad
Merge pull request #4298 from boyu0/fix_keypadtest_crash
...
[ci skip]fix keypad test crash bug
2013-11-17 23:01:10 -08:00
boyu0
eea09d60f7
fix keypad test crash bug
2013-11-18 14:33:24 +08:00
Liam
66443255a6
Shielded unusefull log
2013-11-18 14:20:50 +08:00
samuele3
e6ed691e7c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-18 14:13:05 +08:00
samuele3
5c8d24a11e
hot fix:Repair the crash of cocostudio and the bug of some lua test samples can't come in
2013-11-18 14:12:07 +08:00
2youyou2
4f2603f69c
fixed BatchNode's _children is empty, draw will crash
2013-11-18 13:23:38 +08:00
minggo
5e4b3c6919
Merge pull request #4291 from dabingnn/develop_hotFix
...
[ci skip]HotFix: remove Mac platform Image::saveToFile assert
2013-11-17 20:57:47 -08:00
minggo
4c6aa04e98
Merge pull request #4288 from nutty898/develop_nutty_modify_bugfixed
...
[ci skip]Develop nutty modify bugfixed
2013-11-17 20:56:18 -08:00
boyu0
90f07f680f
Merge commit '95e7373dad8591b11c9bedefe159878210e12e56' into iss2771_physical
2013-11-18 11:22:20 +08:00
CaiWenzhi
2f3e922a98
Fixed crash of reader
2013-11-18 10:19:40 +08:00
Huabing.Xu
09f27f1d16
HotFix: remove Mac platform Image::saveToFile assert
2013-11-18 10:14:57 +08:00
boyu0
a7d884a63f
issue #2771 : change debug draw defines to class static const variable
2013-11-18 10:10:37 +08:00
CaiWenzhi
e63ef05c30
Merge branch 'develop' into develop_nutty_modify_bugfixed
2013-11-18 09:57:35 +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
minggo
982a23af3d
fix some hungarial
2013-11-16 21:08:00 +08:00
minggo
db804891ed
fix some warnings
2013-11-16 20:02:49 +08:00
Nite Luo
f5a8c1d02c
Fix NewClipNodeTest
2013-11-15 17:32:29 -08:00
Ricardo Quesada
a3fabd6b6d
TiledMap uses std::string
2013-11-15 16:37:57 -08:00
Ricardo Quesada
7c2ed2743c
Menu + MenuItem
...
`Menu` and `MenuItem` have protected constructors
2013-11-15 13:14:12 -08:00
Ricardo Quesada
208d25bdff
ControlSwitch compies
...
Uses procted constructor
2013-11-15 12:04:47 -08:00
Nite Luo
c5f9434331
Merge branch 'develop' into newRenderer
2013-11-15 11:33:38 -08:00
Nite Luo
566767da60
Add NewDrawNode
2013-11-15 11:29:11 -08:00
Ricardo Quesada
417657b5a9
Merge branch 'develop' into constructors_are_protected
2013-11-15 10:11:49 -08:00
CaiWenzhi
71ff8fef9c
Fixed crash
2013-11-15 22:25:29 +08:00
boyu0
02e5d44955
Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into iss2771_physical
2013-11-15 16:54:02 +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
boyu0
0cb45e50f1
issue #2771 : fix bugs
2013-11-15 16:27:43 +08:00
minggo
8b5068d4c5
Merge pull request #4273 from boyu0/fix_ccbreader_magic_bits_compare_bug
...
[ci skip]fix CCBReader magic bytes compare bug.
2013-11-14 23:45:33 -08:00
minggo
2923b1c1ed
Merge pull request #4271 from nutty898/develop_nutty_modify_relativelayout
...
[ci skip]Modify relative layout
2013-11-14 23:43:30 -08:00
boyu0
0c309acbe7
fix CCBReader magic bytes compare bug which cause CocosBuilderTest turns black
2013-11-15 15:41:43 +08:00
samuele3
63d4014586
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-15 14:52:17 +08:00
CaiWenzhi
75d9bde459
Modify relative layout
2013-11-15 14:37:34 +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
CaiWenzhi
1730fcddcb
Modify layout
2013-11-15 13:29:39 +08:00
Huabing.Xu
e14295c404
Merge branch 'develop' into free_instead_of_delete
2013-11-15 09:45:03 +08:00
Huabing.Xu
022b5c7b9a
Merge branch 'develop' into free_instead_of_delete
...
# By CaiWenzhi (4) and others
# Via minggo (7) and others
* develop:
fix asynchronize loading bug
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #3185 support for html5.
fixed bug of widget
fixed bugs of widget
fixed #3185 ComponentTest and SceneTest NULL to nullptr.
Add deprecated functions of class TextureCache
fix warning
set z order after reorder
fixed #3185 replace NULL to nullptr.
add "override"
fixed #3185
Modify code criterion
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/CCSSceneReader.cpp
2013-11-15 09:44:29 +08:00
Ricardo Quesada
a583ad461f
CCControlButton has protected constructor
2013-11-14 17:19:16 -08:00
Nite Luo
7ad93d8a94
Create new clippingNode
2013-11-14 16:39:03 -08:00
Ricardo Quesada
17a6575bd3
more protected constructors
...
Adds protected constructors for:
* ClippingNode
* ParallaxNode
* RenderTexture
* TMXTiledMap
2013-11-14 16:33:43 -08:00
Ricardo Quesada
dd68eb4796
ParticleSystem uses protected constructors
2013-11-14 16:21:49 -08:00
Ricardo Quesada
b87684c022
fixes Sprite::setTexture()
...
Sprite::setTexture(std::string&) works as expected.
It sets the texture rect of the sprite
2013-11-14 15:37:43 -08:00
Nite Luo
8d63faa0de
New Renderer working with RenderStack
2013-11-14 12:17:54 -08:00
Ricardo Quesada
cd0ba6850c
Merge branch 'develop' into constructors_are_protected
2013-11-14 11:57:18 -08:00
Nite Luo
a70cad8c97
Merge branch 'develop' into newRenderer
2013-11-14 10:36:43 -08:00
Nite Luo
4f1858fa8a
Crate NewClipping Node
2013-11-14 10:35:28 -08:00
minggo
9b746d22f5
Merge pull request #4259 from minggo/async-loading-fix
...
[ci skip]fix asynchronize loading bug
2013-11-14 02:40:44 -08:00
minggo
2f7f05d1d7
fix asynchronize loading bug
2013-11-14 18:39:23 +08:00
minggo
f06d71dd49
Merge pull request #4258 from CocosRobot/updategeneratedsubmodule_1384421963
...
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 02:26:45 -08:00
CocosRobot
523cb2e8d9
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 09:39:25 +00:00
minggo
c594a673fc
Merge pull request #4244 from chengstory/#3185
...
[ci skip]fixed #3185
2013-11-14 01:33:26 -08:00
Huabing.Xu
4894632467
Fix bug: add android, fix android can not compile
2013-11-14 17:14:35 +08:00
chengstory
6acf422f3b
fixed #3185 support for html5.
2013-11-14 17:03:45 +08:00
CaiWenzhi
19c605eb51
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 15:46:52 +08:00
CaiWenzhi
5f22edf095
fixed bug of widget
2013-11-14 15:42:59 +08:00
minggo
e0076cbdf3
Merge pull request #4246 from minggo/zorder-fix
...
[ci skip]Zorder fix
2013-11-13 23:26:05 -08:00
Huabing.Xu
03c8c8f4fc
Fix bug: use free() in imageCommon_cpp.h
2013-11-14 14:48:16 +08:00
Huabing.Xu
bc55d3246b
Merge branch 'develop' into free_instead_of_delete
...
# By minggo (12) and others
# Via minggo (18) and others
* develop: (78 commits)
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG[ci skip]
Update AUTHORS [ci skip]
fix bug: cccolor to jsval function has error in jsb
[ci skip]
[ci skip]
[ci skip]
[ci skip]
[ci skip]
C++11: NULL -> nullptr
[ci skip]
Fix: UserDefault::createXMLFile with correct XML definition.
[ci skip]
[ci skip]
[ci skip]
Fix bug: rename const with under line seperator
[AUTO] : updating submodule reference to latest autogenerated bindings
Fix bug: Z fighting on TransitionScenePageTurn
Fixed bugs
Modify reader and fixed bugs
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
2013-11-14 14:47:01 +08:00
CaiWenzhi
dee5305f7b
fixed bugs of widget
2013-11-14 14:46:44 +08:00
CaiWenzhi
ccaa8f7310
Merge branch 'develop' into develop_nutty_code_criterion
2013-11-14 14:31:04 +08:00
samuele3
a20620c185
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developCCS
2013-11-14 14:14:52 +08:00
samuele3
babc985409
Add deprecated functions of class TextureCache
2013-11-14 14:12:25 +08:00
minggo
a057274115
set z order after reorder
2013-11-14 14:08:50 +08:00
chengstory
e9f5e889d6
fixed #3185 replace NULL to nullptr.
2013-11-14 14:05:24 +08:00
CaiWenzhi
2432e6e40d
add "override"
2013-11-14 13:42:10 +08:00
Huabing.Xu
46ef7a7fbc
Fix bug: deprecate old interface
2013-11-14 13:35:17 +08:00
chengstory
14d51f9f35
fixed #3185
2013-11-14 13:28:42 +08:00
CocosRobot
515d20d863
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-11-14 04:32:48 +00:00
rablwupei
96462eb81f
fix bug: cccolor to jsval function has error in jsb
2013-11-14 12:03:44 +08:00
minggo
996be7502a
Merge pull request #4129 from michaelcontento/color-convenience
...
[ci skip]Colors are now compare- and explicit convertible
2013-11-13 19:50:31 -08:00
minggo
5c58a8224c
Merge pull request #4168 from xhcnb/fix_ccb_nodeloader
...
[ci skip]Fix a bug:we can use 'Custom Class' in CocosBuilder, and assign custom p...
2013-11-13 19:46:08 -08:00