Commit Graph

15519 Commits

Author SHA1 Message Date
samuele3hu 31339d10e5 issue #3626:Add the deprecated support for the WebSocket and the XMLHttpRequest in the script 2014-01-17 10:19:57 +08:00
samuele3hu d49e28610b issue #3626:Resolve the error that the lua binding of the EventListenerAcceleration and the EventListenerCustom have been bound two times 2014-01-17 10:19:56 +08:00
samuele3hu 5859d3866a issue #3626:Update the lua test cases which used the “tolua.cast” function to add the module name for the second string param 2014-01-17 10:19:56 +08:00
samuele3hu 35d031ea06 issue #3626:Make the lua binding of the WebSocket and the XMLHttpRequest used in lua in the “cc” module 2014-01-17 10:19:56 +08:00
samuele3hu de698aaea7 issue #3626:Add lua binding for ScollView and TableView classes in the cocos2d::extension namespace and the related test cases 2014-01-17 10:19:55 +08:00
samuele3hu 811aa69d39 issue #3626:Add namespace’s support for manual lua binding functions for classes related OpenGL and update the related test cases 2014-01-17 10:19:55 +08:00
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 f2471b8caf Merge pull request 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 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 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 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 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 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 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 2014-01-16 14:23:52 -03:00
James Chen 47b978803e Merge pull request 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
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 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 from andyque/develop
closed . 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 . 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 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 
  Renderer performance fixes
  Console::log(format, va_args) is private
  fix compiling error
  Relieve inherit from LabelProtocol
  closed , 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 from hbbalfred/develop
closed : 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 from natural-law/develop
closed , 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 , Make sure the init method of Cocos2dxHelper only invoked once. 2014-01-16 11:26:23 +08:00
Ricardo Quesada 2f53cd4483 Merge pull request 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 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 from ricardoquesada/sprite_fixes
Sprite: removed _hasChildren
2014-01-15 18:38:04 -08:00