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

14557 Commits

Author SHA1 Message Date
James Chen 2a38d4fe94 issue #2171: Fixing compilation errors for Linux port. 2013-12-17 14:50:40 +08:00
James Chen 27c506809f Merge pull request #4500 from pyrasis/develop 
[Win32] fix compile error.
 2013-12-16 22:22:04 -08:00
James Chen d74ebe18a9 issue #2171: NULL —> nullptr for Android warning of CCBAnimationManager.cpp. 2013-12-17 14:19:35 +08:00
James Chen 4e01769cd5 issue #2171: [New Renderer] Fixing compilation errors for Android. 2013-12-17 14:18:41 +08:00
Lee, Jae-Hong 2a38a2c154 [Win32] fix argument type. 
- argument of interface is ssize_t.
 2013-12-17 15:11:37 +09:00
Ricardo Quesada 8bd838ddfc Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-16 20:43:51 -08:00
Ricardo Quesada c7d350c83e Merge branch 'develop' into newRenderer 2013-12-16 20:43:43 -08:00
Ricardo Quesada 3a25d9079d Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-16 13:58:27 -08:00
Ricardo Quesada 1e423f8198 Merge branch 'newRenderer' of github.com:ricardoquesada/cocos2d-x into newRenderer 2013-12-16 13:58:04 -08:00
Ricardo Quesada 5c178f1c93 Merge branch 'develop' into newRenderer 2013-12-16 13:57:29 -08:00
Huabing.Xu 6abb6639b5 remove android properties change by eclipse 2013-12-16 19:22:40 +08:00
James Chen 41bb9eb4b8 Update AUTHORS [ci skip] 2013-12-16 17:48:59 +08:00
James Chen 3a1ffca890 Update CHANGELOG [ci skip] 2013-12-16 17:46:38 +08:00
James Chen 7deb3810c4 Merge pull request #4492 from zhiqiangxu/develop 
closed #3407: an obvious bug in CCControlUtils::CCRectUnion.
 2013-12-16 01:44:59 -08:00
Nite Luo 545000a213 Add mouse scrolling support for extension test 2013-12-16 17:40:34 +08:00
Dhilan007 f7a448814c issue #3341:fix Incorrect at TextureCache::addImageAsync for repeatedly execute for the same image 2013-12-16 17:12:53 +08:00
minggo d2ded2d780 [ci skip] 2013-12-16 15:28:47 +08:00
Huabing.Xu d63d3b3c24 remove manually JS binding functions 2013-12-16 14:45:21 +08:00
James Chen 7a1e13acab Merge pull request #4494 from CocosRobot/updategeneratedsubmodule_1387175807 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-15 22:39:08 -08:00
CocosRobot 1e645cfcd5 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-16 06:36:50 +00:00
Dhilan007 0cf17f5658 label : fix some error on android when the GLSL versions is 1.0 2013-12-16 14:36:11 +08:00
youyou 81cdbea9c8 change Array to Vector, Dictionary to Map 2013-12-16 14:34:09 +08:00
minggo eb883f735b Merge pull request #4489 from pyrasis/android_shadowstroke 
fix CCImage bug on android platform.
 2013-12-15 22:31:18 -08:00
James Chen 80b2a237a4 Merge pull request #4490 from dumganhar/bind-ssize_t 
[scripting] Adds conversions for ssize_t.
 2013-12-15 22:30:07 -08:00
Huabing.Xu 6aa2908c13 rename： 
1. class: GridNode->NodeGrid
2. function: setNodeGrid->setGrid  getNodeGrid->getGrid setGridTarget->setTarget
3. file: CCGridNode.h&cpp->CCNodeGrid.h&cpp
 2013-12-16 14:21:05 +08:00
James Chen ce96725f83 Removes FileUtils::getFileData binding. 2013-12-16 14:14:12 +08:00
James Chen 3a11dafda7 Uses reinterpret_cast instead of static_cast for jsval_to_ssize and luaval_to_ssize. 2013-12-16 14:13:24 +08:00
James Chen 464054d251 Updates Bindings-generator. 2013-12-16 13:01:20 +08:00
James Chen e32979592a Skips Texture2D::getPixelFormatInfoMap 2013-12-16 13:01:20 +08:00
James Chen adb45d3c68 Adds conversions for ssize_t. 2013-12-16 13:01:20 +08:00
xuzhiqiang f797dea827 bug fix 2013-12-16 12:27:30 +08:00
Dhilan007 32f23ebdba fix bad position for performance test about Label. 2013-12-16 11:04:52 +08:00
Huabing.Xu b1eacd52cb Merge branch 'develop' into develop_gridNode 
* develop:
  fix compile error related to ssize_t.
  issue #2771: add and change some physics API, and add more documents
  [AUTO] : updating submodule reference to latest autogenerated bindings
  Some fixes for XXX:getDescription.
  Reverts CCSpriteBatchNode.h
  size_t —> ssize_t in CCTMXLayer.cpp
  issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc
  Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define
  [AUTO] : updating submodule reference to latest autogenerated bindings
  More renames of description() to getDescription()
  getDescription() works as expected
  fix compiling error after fixing conflicts
  fix compiling error after fixing conflicts
  use ssize_t for index
  use ssize_t for index and capacity
  use ssize_t for capacity and index in containers
  Fix:Remove some needless lua binding functions and resolve a bug
 2013-12-16 10:43:49 +08:00
minggo 53092b359b Merge pull request #4486 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-12-15 18:30:48 -08:00
boyu0 2444f407b2 issue #3162: fix test title 2013-12-16 04:13:49 +08:00
boyu0 c15ad14ed3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-16 03:45:06 +08:00
boyu0 f9f816caf9 issue #3162: change log to cpp file 2013-12-16 03:42:54 +08:00
Lee, Jae-Hong 2807e785c0 fix CCImage bug on android platform. 
- android.graphics.Bitmap bytes are aleady RGBA
- delete swapAlphaChannel and swapAlpha
 2013-12-15 21:07:55 +09:00
Ricardo Quesada d6b1081f67 Merge branch 'newRenderer' of github.com:ricardoquesada/cocos2d-x into newRenderer 2013-12-14 19:28:35 -08:00
Ricardo Quesada 3838268fd0 Merge branch 'develop' into newRenderer 2013-12-14 19:28:01 -08:00
Ricardo Quesada 524751e56f Merge branch 'develop' into newRenderer 2013-12-13 11:54:48 -08:00
youyou 917bd8c3d9 change Array to Vector 2013-12-13 19:40:38 +08:00
James Chen df07ae609d Merge pull request #4487 from Dhilan007/compile_error_ssize 
fix compile error related to ssize_t.
 2013-12-13 02:51:55 -08:00
boyu0 23af9dfd8d issue #3162: reset submodule 2013-12-13 18:15:59 +08:00
boyu0 defae416f3 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug3162_opacity_incorrect 2013-12-13 18:09:39 +08:00
Dhilan007 4e2e423615 fix compile error related to ssize_t. 2013-12-13 17:53:03 +08:00
boyu0 2dbb2d496f issue #2771: add and change some physics API, and add more documents 2013-12-13 17:36:58 +08:00
James Chen d32ed53ca4 Merge pull request #4485 from CocosRobot/updategeneratedsubmodule_1386925833 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-13 01:26:02 -08:00
CocosRobot 4114b682ca [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-13 09:10:37 +00:00
James Chen ca4e7049ac Merge pull request #4484 from dumganhar/pr4479 
Merge PR 4479
 2013-12-13 01:03:43 -08:00