James Chen
4302f3886d
issue #2789 : Adds performance test for Vector and CCArray.
2014-01-17 10:02:12 +08:00
Dhilan007
f5afa09de1
remove unneeded empty line.
2014-01-17 09:46:59 +08:00
Ricardo Quesada
f2471b8caf
Merge pull request #5068 from dabingnn/develop_renderer_tileMapTest
...
add performance test for New renderer: LargeTileMap test for quadCommand
2014-01-16 16:03:42 -08:00
Ricardo Quesada
218d9ceabc
Merge pull request #5097 from ricardoquesada/render_vbo_fixes
...
Renderer: When not using VAOs, call...
2014-01-16 15:03:29 -08:00
Ricardo Quesada
cb9761125b
Renderer: When not using VAOs, call...
...
... glBufferData() to update the contents, and not glBufferSubData()
since the performance is better
2014-01-16 15:02:39 -08:00
Ricardo Quesada
4bd2b9364a
Merge pull request #5096 from ricardoquesada/active_texture
...
Adds GL::activeTexture()
2014-01-16 13:44:56 -08:00
Ricardo Quesada
ce633b44ab
Adds GL::activeTexture()
...
`GL::activeTexture()` is the cached version of `glActiveTexture`
All code must use it.
2014-01-16 13:44:18 -08:00
Ricardo Quesada
a724fd9f6a
Merge pull request #5095 from ricardoquesada/missing_files
...
Adds missing files
2014-01-16 13:10:18 -08:00
Ricardo Quesada
d2bc2caa17
Adds missing files
2014-01-16 13:09:51 -08:00
Ricardo Quesada
367297c68c
Merge pull request #5094 from ricardoquesada/perf_more_fixes
...
Adds test '13' to Sprite Test
2014-01-16 13:08:28 -08:00
Ricardo Quesada
4dba667ea2
Adds test '13' to Sprite Test
...
...and also adds missing Image HD files
2014-01-16 13:07:56 -08:00
Ricardo Quesada
cbaae6a4e4
Merge pull request #5093 from ricardoquesada/sprite_perf_test_fixes
...
Remove Sprites works as expected
2014-01-16 12:23:10 -08:00
Ricardo Quesada
afb4077de5
Remove Sprites works as expected
2014-01-16 12:22:11 -08:00
Ricardo Quesada
f600ee640d
Merge pull request #5091 from luisparravicini/issue-3734
...
warnings in CCLabelBMFont.cpp when compiling in release mode
2014-01-16 09:39:24 -08:00
Luis Parravicini
3210e12e1c
fixes #3734
2014-01-16 14:23:52 -03:00
Dhilan007
53be67c653
update project file.
2014-01-16 18:12:53 +08:00
Dhilan007
671b008f3d
fix compiling error cause by sprintf_s.
2014-01-16 17:50:09 +08:00
James Chen
47b978803e
Merge pull request #5085 from heliclei/develop
...
[jenkins]add job trigger,to update github pull request status instantly
2014-01-16 01:36:23 -08:00
James Chen
74870aaf92
Update CHANGELOG [ci skip]
2014-01-16 17:21:07 +08:00
Dhilan007
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
heliclei
925a4f0f30
add reopen support
2014-01-16 16:22:04 +08:00
heliclei
df4cb47ab3
Merge remote-tracking branch 'upstream/develop' into develop
2014-01-16 16:17:44 +08:00
James Chen
191fc763f6
Update CHANGELOG [ci skip]
2014-01-16 16:12:15 +08:00
James Chen
21dc91bf78
Merge pull request #5082 from Dhilan007/develop_label
...
closed #3726:Fix crash when using unknown character.
2014-01-16 00:10:53 -08:00
James Chen
93beb44150
Update CHANGELOG [ci skip]
2014-01-16 15:35:46 +08:00
James Chen
d000d9739d
Merge pull request #5084 from andyque/develop
...
closed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate. This PR fixes that TestColliderDetector not working
2014-01-15 23:33:45 -08:00
heliclei
9de4c4fa70
[jenkins]add job trigger,to update github pull request status instantly
2014-01-16 15:16:12 +08:00
Dhilan007
547ab3ef0a
update subtitle.
2014-01-16 15:07:20 +08:00
andyque
4a6e137389
fixed #3683 . fixed convertToWorldSpaceAR of CCSkin returning error coordinate
2014-01-16 15:00:35 +08:00
Dhilan007
18bd978480
1.add label crash test
...
2.fix lose char when label have unknown character.
2014-01-16 14:37:07 +08:00
minggo
91b89fc647
Merge pull request #5083 from natural-law/android_bugs
...
Solve some bugs on android
2014-01-15 22:04:54 -08:00
Huabing.Xu
21d586d4ca
Merge branch 'develop' into develop_renderer_tileMapTest
...
* develop: (24 commits)
Update CHANGELOG [ci skip]
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
More renderer optimizations
[AUTO] : updating submodule reference to latest autogenerated bindings
Update CHANGELOG [ci skip]
Sprite: removed _hasChildren
Compilation fix: Updates cocos_files.json and removes unused in template.
use data.isNull() instead of !data.getBytes()
Update VS project file.
Updates CHANGELOG
SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
Updates Xcode, Android and Linux project
fixes #3720
Renderer performance fixes
Console::log(format, va_args) is private
fix compiling error
Relieve inherit from LabelProtocol
closed #3688 , Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong.
add check data valid in getStringFromFile
...
2014-01-16 12:47:32 +08:00
James Chen
778292738f
Update CHANGELOG [ci skip]
2014-01-16 12:03:42 +08:00
James Chen
da32bfd5d7
Update AUTHORS [ci skip]
2014-01-16 12:02:37 +08:00
James Chen
8dd999309b
Merge pull request #5070 from hbbalfred/develop
...
closed #3725 : Crash if file doesn't exist when using FileUtils::getStringFromFile
2014-01-15 20:01:15 -08:00
zhangbin
e7b584908e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into android_bugs
2014-01-16 11:58:49 +08:00
James Chen
f5c93fc9e6
Update CHANGELOG [ci skip]
2014-01-16 11:55:42 +08:00
James Chen
ae0993bc06
Merge pull request #5072 from natural-law/develop
...
closed #3688 , LabelAtlas set a shorter string than before, the effect will be wrong.
2014-01-15 19:54:01 -08:00
Dhilan007
afe49b3a2b
1.Fix crash bug when using unknown character
...
2.Fix text align mistake
2014-01-16 11:47:06 +08:00
zhangbin
3c816c3c85
closed #3723 , Make sure the init method of Cocos2dxHelper only invoked once.
2014-01-16 11:26:23 +08:00
Ricardo Quesada
2f53cd4483
Merge pull request #5081 from ricardoquesada/renderer_optimizations
...
More renderer optimizations
2014-01-15 19:11:59 -08:00
Ricardo Quesada
3b20ad5ab7
More renderer optimizations
2014-01-15 19:10:40 -08:00
James Chen
3dddfa885e
Merge pull request #5079 from CocosRobot/updategeneratedsubmodule_1389840190
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-15 18:47:54 -08:00
CocosRobot
beb7015d7e
[AUTO] : updating submodule reference to latest autogenerated bindings
2014-01-16 02:43:13 +00:00
James Chen
c6445b0640
Update CHANGELOG [ci skip]
2014-01-16 10:41:04 +08:00
Ricardo Quesada
f6ad3a9971
Merge pull request #5078 from ricardoquesada/sprite_fixes
...
Sprite: removed _hasChildren
2014-01-15 18:38:04 -08:00
James Chen
2e7516c582
Merge pull request #5041 from Dhilan007/develop_label
...
closed #3630:Uses a struct of TTF configuration for Label::createWithTTF to reduce parameters and make this interface more easily to use.
2014-01-15 18:37:40 -08:00
Ricardo Quesada
9b490a9124
Sprite: removed _hasChildren
...
_hasChildren has been replaced with !_children.empty()
2014-01-15 18:37:07 -08:00
James Chen
26ba0fcaa7
Merge pull request #5077 from dumganhar/compilation-error-fix
...
Compilation fix: Updates cocos_files.json and removes unused files in template.
2014-01-15 18:35:36 -08:00
James Chen
f62c041886
Compilation fix: Updates cocos_files.json and removes unused in template.
2014-01-16 10:27:35 +08:00