Commit Graph

1813 Commits

Author SHA1 Message Date
samuele3hu fdac224a7b issue #3626:Add namespace’s support for manual lua binding functions for classes in the cocostudio and cocos2d::gui namespace 2014-01-17 10:19:55 +08:00
samuele3hu 510fce7b12 issue #3626:Add namespace’s support for manual lua binding of functions about physics 2014-01-17 10:19:55 +08:00
samuele3hu b72f309076 issue #3626:Add namespace’s support for manual lua binding of classes in the cocos2d::extension and cocosbuilder namespace and update the related test cases 2014-01-17 10:19:54 +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 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
Luis Parravicini 3210e12e1c fixes #3734 2014-01-16 14:23:52 -03: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 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
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
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 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
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
hbb 5ef9eef0ae use data.isNull() instead of !data.getBytes() 2014-01-16 10:09:04 +08:00
Dhilan007 a410c38e54 Update VS project file. 2014-01-16 09:55:13 +08:00
Ricardo Quesada 9388253606 SpriteBatchCommand and ParticleBatchCommand use the BatchCommand
BatchCommand is being used by SpriteBatchCommand and ParticlesBatchCommand

This improves performance in batches
2014-01-15 16:07:38 -08:00
Ricardo Quesada 65602a4574 Updates Xcode, Android and Linux project
with new BatchCommand
2014-01-15 16:06:47 -08:00
Ricardo Quesada f8dc8f0b38 Renderer performance fixes
QuadCommand no longer stores a copy of the quads.
Instead it just stores a reference and the MV matrix.
Later, the Renderer when it copies the Quads to the queue, it will
convert the Quads to world coordinates
2014-01-15 14:35:26 -08:00
Ricardo Quesada 4278f024b8 Console::log(format, va_args) is private
log(format, va_args) -> static _log(format, va_args)
in order to prevent possible resolution errors with overloaded
functions.
2014-01-15 11:17:21 -08:00
Dhilan007 68eddf3cd7 fix compiling error 2014-01-15 17:29:07 +08:00
Dhilan007 629f111f7d Relieve inherit from LabelProtocol 2014-01-15 17:21:08 +08:00
zhangbin 04d8c7514c closed #3688, Solve the bug : LabelAtlas set a shorter string than before, the effect will be wrong. 2014-01-15 16:35:08 +08:00
hbb 8fac676a82 add check data valid in getStringFromFile
so far no check would be crashed when getData faild.
maybe return an empty string is better.
2014-01-15 12:39:56 +08:00
zhangbin 60009a818e closed #3712, Add relative path for CCFileUtils.h in CCConsole.cpp. 2014-01-15 12:05:17 +08:00
Ricardo Quesada 226054e810 Merge pull request #5067 from ricardoquesada/compile_error_fix
ooops
2014-01-14 18:55:34 -08:00
Ricardo Quesada f0537f17da ooops 2014-01-14 18:55:14 -08:00
CocosRobot 3b208337fe [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 02:39:20 +00:00
CocosRobot 82797d8434 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-15 01:37:15 +00:00
Ricardo Quesada 2efeb32352 Merge pull request #5063 from ricardoquesada/performance_test_fixes
Performance Test fixes
2014-01-14 17:24:49 -08:00
Ricardo Quesada c267c479db Performance Test fixes
* SpritePerfTest: 3 new tests added
* SpritePerfTest: random() always use the same seed
* SpritePerfTest: Fixed tests 8 and 9 on retina display machines
* Console: Added 3 new commands: 'config', 'fileutils dump', 'textures'
2014-01-14 17:22:45 -08:00
Nite Luo a18788ff0a Fix artifects when VBO is full 2014-01-14 16:45:40 -08:00
James Chen cd1c408e6b Merge pull request #5054 from dumganhar/iss3698-retina-mac
closed #3698: Wrong display when dragging window through retina and non-retina screen.
2014-01-13 23:02:49 -08:00
James Chen 7e1fd18f76 FLT_MIN —> FTL_EPSILON. 2014-01-14 14:38:34 +08:00
Dhilan007 92d345156b un-define clash with the existing macro definition in platform/win32/CCStdC.h 2014-01-14 14:20:22 +08:00
James Chen 83a42dc760 closed #3698: Wrong display when dragging window through retina and non-retina screen. 2014-01-14 13:59:00 +08:00
Dhilan007 a1d8e8bdb1 fix compiling error cause by macro define on window platform. 2014-01-14 12:28:24 +08:00
CocosRobot c49aa1f125 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-13 23:07:44 +00:00
Ricardo Quesada 6eed3a2b27 Adds missing copyright headers in some files 2014-01-13 14:48:12 -08:00
Ricardo Quesada f2c3d2f3ae Camera and Node fixes
OrbitCamera: added getters (public). Setters moved from `protected` to `public
	: Improved API. Instead of using "out" parameters for getters, it returns a `kmVec3`
 	: Setters receives `kmVec3` as well. Old API is still supported

Node: `setAdditionalTransform` doesn't get `dirty` on the next frame.
	Instead, once the additional transform is set, in order to remove it the user needs to pass
	the identity matrix
2014-01-13 12:52:07 -08:00
Dhilan007 fd481d64a0 1.update lua binding configuration for label.
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00