yinkaile
|
026811ca59
|
Merge branch 'develop' into Array
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
|
2013-12-18 22:03:16 +08:00 |
James Chen
|
589b71eecf
|
Merge pull request #4530 from samuele3hu/developConversion
issue #3402:Add the new label lua binding and the releated test cases
|
2013-12-18 01:16:47 -08:00 |
James Chen
|
7ea455d440
|
Merge pull request #4528 from CocosRobot/updategeneratedsubmodule_1387349526
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-17 22:59:48 -08:00 |
samuele3hu
|
f5f95399fd
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion
|
2013-12-18 14:58:35 +08:00 |
CocosRobot
|
8f1e94471e
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-18 06:52:09 +00:00 |
James Chen
|
7a5074652c
|
Merge pull request #4526 from samuele3hu/LuaConversion
Add support for unsigned short
|
2013-12-17 22:43:42 -08:00 |
James Chen
|
4c7d63bb28
|
Merge pull request #4527 from Dhilan007/new_renderer
update vs project for new renderer and fix compiling fail on vs.
|
2013-12-17 22:41:29 -08:00 |
Dhilan007
|
2d9b7ee4fc
|
update vs project for new renderer and fix compiling fail on vs.
|
2013-12-18 14:36:49 +08:00 |
samuele3hu
|
55830c3023
|
Add support for unsigned short
|
2013-12-18 13:47:59 +08:00 |
samuele3hu
|
4d4b96ba30
|
issue #3402:Add the new label lua binding and the releated test cases
|
2013-12-18 11:39:43 +08:00 |
Ricardo Quesada
|
ad66f7ac41
|
Merge pull request #4525 from ricardoquesada/renderer_files_with_cc
Renderer files with cc
|
2013-12-17 19:17:50 -08:00 |
Ricardo Quesada
|
24f89ac45c
|
Revert... android platform is 10
|
2013-12-17 19:07:28 -08:00 |
Ricardo Quesada
|
156f69c528
|
Renderer is subclass of Object again... needed for Android.
ouch
|
2013-12-17 19:06:22 -08:00 |
Ricardo Quesada
|
5c9b8db0cb
|
Updates project files file Linux and Android
|
2013-12-17 18:47:46 -08:00 |
Ricardo Quesada
|
33c4f891a0
|
Adds 'CC' to renderer files
|
2013-12-17 18:41:09 -08:00 |
James Chen
|
b9625cbdfc
|
Merge pull request #4521 from dumganhar/develop
[scripting] Ignores Director::getRenderer for bindings.
|
2013-12-17 18:17:23 -08:00 |
James Chen
|
8d086f9d02
|
[scripting] Ignores Director::getRenderer for bindings.
|
2013-12-18 10:15:42 +08:00 |
Ricardo Quesada
|
3720650e5a
|
Merge pull request #4520 from ricardoquesada/renderer_license
Adds correct License to Renderer files
|
2013-12-17 18:13:09 -08:00 |
Ricardo Quesada
|
f369a8eec3
|
Adds correct License to Renderer files
|
2013-12-17 18:12:15 -08:00 |
Ricardo Quesada
|
a62b56fc46
|
Merge pull request #4518 from ricardoquesada/renderer_with_love
Cleanup RenderCommand code
|
2013-12-17 18:03:07 -08:00 |
Ricardo Quesada
|
3f3071fbb6
|
Cleanup RenderCommand code
RenderCommand code is cleaner
|
2013-12-17 18:02:11 -08:00 |
Ricardo Quesada
|
edf6150c8c
|
Merge pull request #4516 from ricardoquesada/renderer_is_not_singleton
The Renderer is not a singleton
|
2013-12-17 17:51:22 -08:00 |
Ricardo Quesada
|
d6be81b7a8
|
The Renderer is not a singleton
In order to access, you have to get it from the Director
`Director::getInstance()->getRenderer()`
|
2013-12-17 17:50:17 -08:00 |
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 |