Ricardo Quesada
|
8d1f5afeef
|
Merge pull request #4538 from ricardoquesada/linux_and_android_fixes
Android and Linux fixes
|
2013-12-18 12:08:38 -08:00 |
Ricardo Quesada
|
b36d77b1c2
|
Android and Linux fixes
|
2013-12-18 12:07:51 -08:00 |
Ricardo Quesada
|
4155a743c4
|
Merge pull request #4537 from ricardoquesada/more_renderer_fixes
More renderer fixes
|
2013-12-18 12:01:06 -08:00 |
Ricardo Quesada
|
d1b555614e
|
removes `using namespace std` from header file
... in order to prevent possible collisions.
`using namespace XXX` MUST never be used in header files.
|
2013-12-18 11:45:30 -08:00 |
Ricardo Quesada
|
903844c7bd
|
Removes unneeded files
New functionality is merged into the 'official' classes
|
2013-12-18 11:44:45 -08:00 |
yinkaile
|
324732b867
|
change play arguments
|
2013-12-18 23:29:54 +08:00 |
yinkaile
|
7be834ea37
|
change play arguments
|
2013-12-18 22:57:18 +08:00 |
boyu0
|
d0b039ceda
|
fix compile errors.
|
2013-12-18 22:44:03 +08:00 |
yinkaile
|
57c33e0604
|
fixed compile error
|
2013-12-18 22:36:10 +08:00 |
yinkaile
|
d3a575e8cc
|
change for iterator and callfunc
|
2013-12-18 22:07:33 +08:00 |
yinkaile
|
026811ca59
|
Merge branch 'develop' into Array
Conflicts:
cocos/scripting/auto-generated
tools/bindings-generator
|
2013-12-18 22:03:16 +08:00 |
boyu0
|
71be55a9aa
|
revert AccelerometerSimulation.m
|
2013-12-18 19:02:49 +08:00 |
boyu0
|
50544a04a7
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
|
2013-12-18 18:53:44 +08:00 |
boyu0
|
f16384a105
|
fix more code with hungarian notation
|
2013-12-18 18:51:36 +08:00 |
boyu0
|
d16c67096a
|
revert submodules
|
2013-12-18 18:33:39 +08:00 |
boyu0
|
082c3d274a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into edit_hungarian_notation
|
2013-12-18 18:05:30 +08:00 |
James Chen
|
bc34ee7f02
|
Merge pull request #4533 from CocosRobot/updategeneratedsubmodule_1387360632
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-18 01:59:11 -08:00 |
CocosRobot
|
000958bf82
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2013-12-18 09:57:15 +00:00 |
James Chen
|
9c0d39c6f9
|
Merge pull request #4531 from dumganhar/extension-warning-fix
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
|
2013-12-18 01:48:14 -08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
Huabing.Xu
|
46d1d5bb91
|
add GridNode New renderer imp
|
2013-12-18 17:19:50 +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
|
ddc1328e6b
|
Small fix in CCValue.cpp. visitMap is a template that supports IntValueMap and ValueMap. IntValueMap is confused. ValueMapIntKey seems better.
|
2013-12-18 17:01:57 +08:00 |
James Chen
|
7719c692b8
|
More warning fixes.
|
2013-12-18 16:03:07 +08:00 |
James Chen
|
581ba49399
|
Diables CC_ENABLE_CACHE_TEXTURE_DATA in Renderer::initGLView since Renderer is not inherited from Object now. CCNotificationCenter will not be able to work.
Signed-off-by: James Chen <jianhua.chen@cocos2d-x.org>
|
2013-12-18 15:41:57 +08:00 |
James Chen
|
0695e32fff
|
Some warning fixes in SocketIO, ContriolButton, js_manual_conversion.h/.cpp.
|
2013-12-18 15:40:31 +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 |
Dhilan007
|
2a3390d3eb
|
increase label test pressure.
|
2013-12-18 10:46:02 +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 |