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

Merge pull request #12946 from pandamicro/v3 

[ci skip] Gen bindings for v3.7.1 branch
This commit is contained in:
pandamicro 2015-07-22 10:45:23 +08:00
parent 4153806c26 9b11e32252
commit f0962669a9
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -37,5 +37,5 @@ before_install:
# whitelist
branches:
only:
- v3.7-release
- v3.7.1
- v3

2
tests/js-tests/src/Particle3DTest/Particle3DTest.js
View File

@ -27,7 +27,7 @@ if(cc.sys.isNative)(function(){
var Particle3DTestIdx = -1;
const PARTICLE_SYSTEM_TAG = 0x0001;
var PARTICLE_SYSTEM_TAG = 0x0001;
jsb.fileUtils.addSearchPath("res/Sprite3DTest");
jsb.fileUtils.addSearchPath("res/Particle3D/materials");

12
tests/js-tests/src/Physics3DTest/Physics3DTest.js
View File

@ -27,13 +27,13 @@ var Physics3DTestIdx = -1;
var physicsScene = null;
const START_POS_X = -0.5;
const START_POS_Y = -2.5;
const START_POS_Z = -0.5;
var START_POS_X = -0.5;
var START_POS_Y = -2.5;
var START_POS_Z = -0.5;
const ARRAY_SIZE_X = 4;
const ARRAY_SIZE_Y = 3;
const ARRAY_SIZE_Z = 4;
var ARRAY_SIZE_X = 4;
var ARRAY_SIZE_Y = 3;
var ARRAY_SIZE_Z = 4;
var Physics3DTestDemo = cc.Layer.extend({
_title:"Physics3D Test",

6
tests/js-tests/src/TerrainTest/TerrainTest.js
View File

@ -189,7 +189,7 @@ var TerrainSimple = TerrainTestDemo.extend({
});
var TerrainWalkThru = (function(){
const PlayerState = {
var PlayerState = {
LEFT : 0,
RIGHT : 1,
IDLE : 2,
@ -197,8 +197,8 @@ var TerrainWalkThru = (function(){
BACKWARD : 4
};
const PLAYER_HEIGHT = 0;
const camera_offset = cc.math.vec3(0, 45, 60);
var PLAYER_HEIGHT = 0;
var camera_offset = cc.math.vec3(0, 45, 60);
var Player = jsb.Sprite3D.extend({
_targetPos:null,