Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,482 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

14482 Commits

Author SHA1 Message Date
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
James Chen 2892e8be3f Refactors Data class, adds FileUtils::getStringFromFile, FileUtils::getDataFromFile and deprecates FileUtils::getFileData. 2013-12-18 14:58:17 +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
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
Huabing.Xu 25fc3d3c2a Merge branch 'develop' into develop_gridNode 
* develop: (105 commits)
  update armature to new render
  iOS & Mac project fix.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  use size_t replace unsigned int for record redeque::size returned value.
  issue #2171: Updates CMakeLists.txt.
  issue #2171: Binds New renderer classes, ignores NewTextureAtlas.
  issue #2171: Adds header files of renderer in cocos2d.h.
  issue #2171: Reorder renderer files for iOS & mac project.
  issue #2171: small fix in ccTypes.h
  issue #2171: Don’t ‘using namespace std;’ in header file.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  issue #2171: Ignores Director::getFrustum.
  issue #2171: Fixing compilation errors for Linux port.
  issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp.
  issue #2171: [New Renderer] Fixing compilation errors for Android.
  [Win32] fix argument type. - argument of interface is ssize_t.
  Update AUTHORS [ci skip]
  Update CHANGELOG [ci skip]
  Add mouse scrolling support for extension test
  issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image
  ...

Conflicts:
	cocos/2d/CCNode.cpp
	cocos/2d/cocos2d.vcxproj.filters
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 2013-12-17 18:16:05 +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