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

14042 Commits

Author SHA1 Message Date
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
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
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
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
minggo 53092b359b Merge pull request #4486 from boyu0/iss2771_physical 
[ci skip]issue #2771: physical
 2013-12-15 18:30:48 -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
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
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
James Chen 189cf1a076 Some fixes for XXX:getDescription. 2013-12-13 16:51:57 +08:00
James Chen ed93c114e5 Reverts CCSpriteBatchNode.h 2013-12-13 16:47:42 +08:00
James Chen bb5ef615dd Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into pr4479 
Conflicts:
	cocos/2d/CCSpriteBatchNode.h
 2013-12-13 16:44:22 +08:00
James Chen 7a8f2ae235 size_t —> ssize_t in CCTMXLayer.cpp 2013-12-13 16:41:03 +08:00
boyu0 4befb50307 issue #2771: add PhysicsWorld function set/getUpdateRate and set/getSpeed. Change name PhysicsQueryRectCallbackFunc and PhysicsPointQueryCallbackFunc to PhysicsRectQueryCallbackFunc and PhysicsQueryPointCallbackFunc 2013-12-13 16:26:26 +08:00
James Chen a52eafc3b8 Merge pull request #4483 from samuele3hu/developConversion 
Fix:Add more lua binding functions of ScriptHandlerMgr and some constants define
 2013-12-13 00:23:28 -08:00
samuele3hu 6c49131ed6 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion 2013-12-13 15:51:03 +08:00
samuele3hu 98bd84c436 Fix:Add lua binding of ’registerScriptHandler’、’unregisterScriptHandler’ and ’removeObjectAllHandlers’ of ScriptHandlerMgr and some constants define 2013-12-13 15:50:12 +08:00
Dhilan007 8b9cfd7d35 fix compiling error on linux and android. 2013-12-13 12:58:16 +08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
Ricardo Quesada 6ca6068cb7 Merge branch 'develop' into newRenderer 2013-12-12 14:58:47 -08:00
Ricardo Quesada 4c1acfe841 Merge pull request #4481 from CocosRobot/updategeneratedsubmodule_1386888533 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-12-12 14:58:11 -08:00
CocosRobot 644e2d923c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-12-12 22:48:57 +00:00
Ricardo Quesada 61cc365d9e Merge branch 'develop' into newRenderer 
Conflicts:
	cocos/2d/CCGLProgram.h
	cocos/2d/CCLabelTTF.h
 2013-12-12 14:41:42 -08:00
Ricardo Quesada 015d51b1ac Merge pull request #4480 from ricardoquesada/console_improvements 
Console improvements
 2013-12-12 14:39:54 -08:00
Ricardo Quesada f4c68e4eef More renames of description() to getDescription() 2013-12-12 14:38:12 -08:00
Ricardo Quesada a8c317bd83 getDescription() works as expected 
renames `description` to `getDescription`. Adds `virtual`  to it.
Adds `getDescription` to missing nodes.
 2013-12-12 14:30:22 -08:00
Ricardo Quesada ff57d9fa35 Merge branch 'newRenderer' of github.com:darkdukey/cocos2d-x into newRenderer 2013-12-12 11:44:21 -08:00
Ricardo Quesada 29a15c885a Merge branch 'develop' into newRenderer 2013-12-12 11:44:09 -08:00
Ricardo Quesada 4ab98ee8e7 Merge branch 'develop' into newRenderer 2013-12-12 09:14:30 -08:00
James Chen 3721ffde64 Merge pull request #4478 from samuele3hu/developConversion 
Fix:Remove some needless lua binding functions and resolve a bug
 2013-12-12 02:04:00 -08:00
minggo 21e2b341f1 fix compiling error after fixing conflicts 2013-12-12 14:59:33 +08:00
minggo 16efe94946 fix compiling error after fixing conflicts 2013-12-12 14:48:27 +08:00