Ricardo Quesada
|
9f10054a99
|
Merge pull request #4515 from ricardoquesada/more_warning_fixes
More warning fixes
|
2013-12-17 14:34:29 -08:00 |
Ricardo Quesada
|
10eafeaeed
|
fixes warning compiler
|
2013-12-17 11:16:30 -08:00 |
Ricardo Quesada
|
441cb6c282
|
fixes warnings in QuadCommand
|
2013-12-17 10:35:15 -08:00 |
Ricardo Quesada
|
009f70b7ff
|
Merge pull request #4514 from ricardoquesada/fix_warnings
fixes warning on Label Fragment shader
|
2013-12-17 10:19:16 -08:00 |
Ricardo Quesada
|
ff106ed070
|
fixes warning on Label Fragment shader
|
2013-12-17 10:01:38 -08:00 |
yinkaile
|
581a7856de
|
fixed compiler error
|
2013-12-17 19:32:16 +08:00 |
James Chen
|
ed1fb1ad34
|
Merge pull request #4512 from CocosRobot/updategeneratedsubmodule_1387276777
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 03:09:31 -08:00 |
CocosRobot
|
12d8740537
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 10:39:43 +00:00 |
James Chen
|
9d1cb43d8c
|
Merge pull request #4510 from dumganhar/vector-fix
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
|
2013-12-17 02:28:56 -08:00 |
James Chen
|
37f408f2b9
|
Merge pull request #4506 from Dhilan007/ushort_jsb
add API for transform unsigned short
|
2013-12-17 02:20:56 -08:00 |
Dhilan007
|
0414926b52
|
add API for transform unsigned short
|
2013-12-17 18:17:04 +08:00 |
James Chen
|
3829f841e7
|
Small fix for Vector::insert(const Vector<T>& other), renames it to Vector::pushBack(const Vector<T>& other).
|
2013-12-17 18:09:07 +08:00 |
yinkaile
|
6ff45b09e7
|
Merge branch 'newRenderer' into Array
Conflicts:
cocos/editor-support/cocostudio/CCArmature.cpp
cocos/editor-support/cocostudio/CCArmature.h
cocos/editor-support/cocostudio/CCBatchNode.cpp
cocos/editor-support/cocostudio/CCColliderDetector.cpp
cocos/scripting/auto-generated
tools/bindings-generator
|
2013-12-17 18:06:11 +08:00 |
James Chen
|
16b643fbef
|
Merge pull request #4508 from CocosRobot/updategeneratedsubmodule_1387273832
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 01:56:09 -08:00 |
James Chen
|
c0d741d0d8
|
Merge pull request #4507 from dumganhar/del-vector-foreach
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
|
2013-12-17 01:55:35 -08:00 |
James Chen
|
c85f9877bb
|
Reverts Vector::eraseObject, not need to return iterator.
|
2013-12-17 17:54:38 +08:00 |
CocosRobot
|
30521ff5a4
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 09:50:36 +00:00 |
James Chen
|
d16fa07661
|
Removes Vector<T>::forEach, please use std::for_each instead. The same as Vector<T>::sort.
|
2013-12-17 17:45:29 +08:00 |
minggo
|
bcb07abb7b
|
Merge pull request #4505 from 2youyouo2/newRenderer
update armature to new render
|
2013-12-17 01:43:07 -08:00 |
yinkaile
|
bc868cc004
|
update armature to new render
|
2013-12-17 17:00:01 +08:00 |
James Chen
|
8d6fa58cc5
|
Merge pull request #4504 from dumganhar/develop
iOS & Mac project fix.
|
2013-12-17 00:51:55 -08:00 |
James Chen
|
d3a4dbab08
|
iOS & Mac project fix.
|
2013-12-17 16:34:05 +08:00 |
minggo
|
85ba3ee1a9
|
Merge pull request #4496 from Dhilan007/addImageAsync_IncorrectError
issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly ...
|
2013-12-17 00:32:50 -08:00 |
James Chen
|
57b8c24847
|
Merge pull request #4503 from CocosRobot/updategeneratedsubmodule_1387267978
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 00:14:33 -08:00 |
CocosRobot
|
91cfecb931
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 08:13:06 +00:00 |
James Chen
|
a1a1428a5f
|
Merge pull request #4502 from dumganhar/iss2171-new-renderer
Merge PR #4499 and compilation fixes
|
2013-12-17 00:06:39 -08:00 |
LinWenhai
|
649e6b8065
|
use size_t replace unsigned int for record redeque::size returned value.
|
2013-12-17 16:04:48 +08:00 |
James Chen
|
ca1e1275ee
|
issue #2171: Updates CMakeLists.txt.
|
2013-12-17 15:51:32 +08:00 |
James Chen
|
12cc6c6153
|
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into iss2171-new-renderer
Conflicts:
cocos/2d/CMakeLists.txt
|
2013-12-17 15:50:24 +08:00 |
James Chen
|
8ab4537f73
|
issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
|
2013-12-17 15:41:26 +08:00 |
James Chen
|
7fc7757470
|
issue #2171: Adds header files of renderer in cocos2d.h.
|
2013-12-17 15:40:50 +08:00 |
James Chen
|
5d248ef77a
|
issue #2171: Reorder renderer files for iOS & mac project.
|
2013-12-17 15:40:17 +08:00 |
James Chen
|
08edcca9be
|
issue #2171: small fix in ccTypes.h
|
2013-12-17 15:39:35 +08:00 |
James Chen
|
8f5970ef90
|
issue #2171: Don’t ‘using namespace std;’ in header file.
|
2013-12-17 15:32:24 +08:00 |
minggo
|
5225e8ae99
|
Merge pull request #4501 from CocosRobot/updategeneratedsubmodule_1387265097
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-16 23:26:48 -08:00 |
CocosRobot
|
21c74322bd
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 07:25:00 +00:00 |
minggo
|
16ed9155c0
|
Merge pull request #4460 from Dhilan007/label_distanceField
new label:add support for distanceField
|
2013-12-16 23:18:41 -08:00 |
James Chen
|
a3cf2d8f7f
|
issue #2171: Ignores Director::getFrustum.
|
2013-12-17 15:02:08 +08:00 |
James Chen
|
2a38d4fe94
|
issue #2171: Fixing compilation errors for Linux port.
|
2013-12-17 14:50:40 +08:00 |
James Chen
|
27c506809f
|
Merge pull request #4500 from pyrasis/develop
[Win32] fix compile error.
|
2013-12-16 22:22:04 -08:00 |
James Chen
|
d74ebe18a9
|
issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
|
2013-12-17 14:19:35 +08:00 |
James Chen
|
4e01769cd5
|
issue #2171: [New Renderer] Fixing compilation errors for Android.
|
2013-12-17 14:18:41 +08:00 |
Lee, Jae-Hong
|
2a38a2c154
|
[Win32] fix argument type.
- argument of interface is ssize_t.
|
2013-12-17 15:11:37 +09:00 |
Ricardo Quesada
|
8bd838ddfc
|
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
|
2013-12-16 20:43:51 -08:00 |
Ricardo Quesada
|
c7d350c83e
|
Merge branch 'develop' into newRenderer
|
2013-12-16 20:43:43 -08:00 |
Ricardo Quesada
|
3a25d9079d
|
Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer
|
2013-12-16 13:58:27 -08:00 |
Ricardo Quesada
|
1e423f8198
|
Merge branch 'newRenderer' of github.com:ricardoquesada/cocos2d-x into newRenderer
|
2013-12-16 13:58:04 -08:00 |
Ricardo Quesada
|
5c178f1c93
|
Merge branch 'develop' into newRenderer
|
2013-12-16 13:57:29 -08:00 |
James Chen
|
41bb9eb4b8
|
Update AUTHORS [ci skip]
|
2013-12-16 17:48:59 +08:00 |
James Chen
|
3a1ffca890
|
Update CHANGELOG [ci skip]
|
2013-12-16 17:46:38 +08:00 |