Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3165 from sunzhuoshi/master 

Fixed bad js constant names and added config macro for "spine" extension
This commit is contained in:
James Chen 2013-07-16 02:36:49 -07:00
parent c6c50eb55a ec7456a43c
commit b71e9d83e1
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/cocos-ext.h
View File

@ -45,7 +45,7 @@
#include "physics_nodes/CCPhysicsDebugNode.h" #include "physics_nodes/CCPhysicsDebugNode.h"
#include "physics_nodes/CCPhysicsSprite.h" #include "physics_nodes/CCPhysicsSprite.h"
#endif #endif
#include "spine/spine-cocos2dx.h" #include "spine/spine-cocos2dx.h"
#include "Components/CCComAttribute.h" #include "Components/CCComAttribute.h"

22
scripting/javascript/bindings/js/jsb_cocos2d_constants.js
View File

@ -93,17 +93,17 @@ cc.TMX_TILE_VERTICAL_FLAG = 0x40000000;
cc.TEXT_ALIGNMENT_CENTER = 0x1; cc.TEXT_ALIGNMENT_CENTER = 0x1;
cc.TEXT_ALIGNMENT_LEFT = 0x0; cc.TEXT_ALIGNMENT_LEFT = 0x0;
cc.TEXT_ALIGNMENT_RIGHT = 0x2; cc.TEXT_ALIGNMENT_RIGHT = 0x2;
cc.TEXTURE2_D_PIXEL_FORMAT_A8 = 0x3; cc.TEXTURE_2D_PIXEL_FORMAT_A8 = 0x3;
cc.TEXTURE2_D_PIXEL_FORMAT_A_I88 = 0x5; cc.TEXTURE_2D_PIXEL_FORMAT_AI88 = 0x5;
cc.TEXTURE2_D_PIXEL_FORMAT_DEFAULT = 0x0; cc.TEXTURE_2D_PIXEL_FORMAT_DEFAULT = 0x0;
cc.TEXTURE2_D_PIXEL_FORMAT_I8 = 0x4; cc.TEXTURE_2D_PIXEL_FORMAT_I8 = 0x4;
cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC2 = 0x9; cc.TEXTURE_2D_PIXEL_FORMAT_PVRTC2 = 0x9;
cc.TEXTURE2_D_PIXEL_FORMAT_PVRTC4 = 0x8; cc.TEXTURE_2D_PIXEL_FORMAT_PVRTC4 = 0x8;
cc.TEXTURE2_D_PIXEL_FORMAT_RG_B565 = 0x2; cc.TEXTURE_2D_PIXEL_FORMAT_RGB565 = 0x2;
cc.TEXTURE2_D_PIXEL_FORMAT_RGB5_A1 = 0x7; cc.TEXTURE_2D_PIXEL_FORMAT_RGB5A1 = 0x7;
cc.TEXTURE2_D_PIXEL_FORMAT_RG_B888 = 0x1; cc.TEXTURE_2D_PIXEL_FORMAT_RGB888 = 0x1;
cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A4444 = 0x6; cc.TEXTURE_2D_PIXEL_FORMAT_RGBA4444 = 0x6;
cc.TEXTURE2_D_PIXEL_FORMAT_RGB_A8888 = 0x0; cc.TEXTURE_2D_PIXEL_FORMAT_RGBA8888 = 0x0;
cc.TOUCHES_ALL_AT_ONCE = 0x0; cc.TOUCHES_ALL_AT_ONCE = 0x0;
cc.TOUCHES_ONE_BY_ONE = 0x1; cc.TOUCHES_ONE_BY_ONE = 0x1;
cc.TRANSITION_ORIENTATION_DOWN_OVER = 0x1; cc.TRANSITION_ORIENTATION_DOWN_OVER = 0x1;