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
|
f1fac73bb4
|
issue #2790: Fix wrong include.
|
2013-12-07 16:14:00 +08:00 |
James Chen
|
be7c62a2b9
|
issue #2790: Removes unused CCSet binding glue codes.
|
2013-12-07 14:44:21 +08:00 |
James Chen
|
713d89b6d8
|
issue #2790: Uses Vector<Invocation*> instead of CCArray* for CCControl. Uses std::unordered_map<int, Vector<Invocation*>*> instead of CCDictionary*.
|
2013-12-07 14:36:07 +08:00 |
James Chen
|
ba56bf6ecd
|
issue #2790: Updates Tests.
|
2013-12-07 14:28:37 +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
|
d8061477c1
|
issue #2790: Removes CCSort.h/.cpp from projects.
|
2013-12-07 14:21:01 +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
|
a12a101548
|
issue #2790: Removes CCSorting.h/.cpp, uses Vector<T> for storing used and freed cells.
|
2013-12-07 14:17:47 +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 |
James Chen
|
4d9beb7dfa
|
Merge pull request #4448 from signmotion/corrected_DISALLOW_COPY_AND_ASSIGN
Fixed some slips (VS2012 compile errors)
|
2013-12-06 16:38:47 -08:00 |
Nite Luo
|
94255a9d52
|
Fix culling
|
2013-12-06 14:59:06 -08:00 |
signmotion
|
f34083e87f
|
- Fixed some slips.
|
2013-12-06 22:08:32 +02: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 |
James Chen
|
f031cccdf3
|
Merge pull request #4446 from CocosRobot/updategeneratedsubmodule_1386322272
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-06 01:39:21 -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 |
James Chen
|
c916377970
|
issue #2790: Comments building template for android.
|
2013-12-06 17:23:31 +08:00 |
James Chen
|
7aff958063
|
issue #2790: A typo fix.
|
2013-12-06 17:09:36 +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
|
ed7c3f717a
|
issue #2790: Travis-ci builds JSB projects again.
|
2013-12-06 16:49:17 +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 |
youyou
|
7e96701ef0
|
fixed create PhysicsSprite
|
2013-12-06 14:25:08 +08:00 |
Ricardo Quesada
|
dcf4eacd92
|
update project
|
2013-12-05 22:24:51 -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 |