Commits

Branch selector

master

User selector

All users

Datepicker

All time

Commit history

Commits on Feb 10, 2017

• Merge pull request #1484 from jareguo/temp

  Show description for d358293
  jareguo

  authored
  d358293View commit details

  Copy full SHA for d358293

  Browse repository at this point

• use babel compiler

  jareguo

  committed
  1029c9dView commit details

  Copy full SHA for 1029c9d

  Browse repository at this point

Commits on Feb 9, 2017

• Merge branch 'v1.4'

  Show description for 0192e50
  jareguo

  committed
  0192e50View commit details

  Copy full SHA for 0192e50

  Browse repository at this point

Commits on Feb 8, 2017

• Merge pull request #1478 from jareguo/v1.4

  Show description for e4b407a
  jareguo

  authored
  e4b407aView commit details

  Copy full SHA for e4b407a

  Browse repository at this point

• fix prefab loading issue

  jareguo

  committed
  bd6750fView commit details

  Copy full SHA for bd6750f

  Browse repository at this point

Commits on Feb 7, 2017

• Merge pull request #1477 from knoxHuang/v1.4

  Show description for c917812
  jareguo

  authored
  c917812View commit details

  Copy full SHA for c917812

  Browse repository at this point

• fix CCParticleSystem error for fireball/issues/5155

  knoxHuang

  committed
  df4e421View commit details

  Copy full SHA for df4e421

  Browse repository at this point

• Merge pull request #1476 from knoxHuang/v1.4

  Show description for 3b1f1cd
  pandamicro

  authored
  3b1f1cdView commit details

  Copy full SHA for 3b1f1cd

  Browse repository at this point

• fix native error for fireball/issues/5169

  knoxHuang

  committed
  744f4b2View commit details

  Copy full SHA for 744f4b2

  Browse repository at this point

Commits on Feb 6, 2017

• Merge pull request #1475 from knoxHuang/v1.4

  Show description for 5f6511a
  pandamicro

  authored
  5f6511aView commit details

  Copy full SHA for 5f6511a

  Browse repository at this point

• fix initWithVertexShaderByteArray bug to CCGLProgram for fireball/issues/5160

  knoxHuang

  committed
  7b4828eView commit details

  Copy full SHA for 7b4828e

  Browse repository at this point

• Merge pull request #1474 from pandamicro/v1.4

  Show description for 4734728
  nantas

  authored
  4734728View commit details

  Copy full SHA for 4734728

  Browse repository at this point

• Use rAF when frameRate is 30

  

  pandamicro

  committed
  b95de39View commit details

  Copy full SHA for b95de39

  Browse repository at this point

• Do not retain/release actions in new memory model

  

  pandamicro

  committed
  35e2bd8View commit details

  Copy full SHA for 35e2bd8

  Browse repository at this point

• Avoid texture memory leak

  

  pandamicro

  committed
  73cf8a2View commit details

  Copy full SHA for 73cf8a2

  Browse repository at this point

• Merge pull request #1473 from knoxHuang/v1.4

  Show description for b7bda37
  jareguo

  authored
  b7bda37View commit details

  Copy full SHA for b7bda37

  Browse repository at this point

• fix particleSystem bug for fireball/issues/5155

  knoxHuang

  committed
  a218ca9View commit details

  Copy full SHA for a218ca9

  Browse repository at this point

• Remove cc.spriteFrameCache

  

  pandamicro

  committed
  7313332View commit details

  Copy full SHA for 7313332

  Browse repository at this point

Commits on Feb 4, 2017

• Merge pull request #1469 from jareguo/master

  Show description for 842267a
  jareguo

  authored
  842267aView commit details

  Copy full SHA for 842267a

  Browse repository at this point

• Merge pull request #1472 from pandamicro/v1.4

  Show description for 8b39c26
  jareguo

  authored
  8b39c26View commit details

  Copy full SHA for 8b39c26

  Browse repository at this point

• Fix color red channel extraction issue

  

  pandamicro

  committed
  7e2878cView commit details

  Copy full SHA for 7e2878c

  Browse repository at this point

• Merge pull request #1471 from natural-law/tiledmap-crack

  Show description for 9e5bafc
  nantas

  authored
  9e5bafcView commit details

  Copy full SHA for 9e5bafc

  Browse repository at this point

• Solve the cracks in TiledMap.

  

  zhangbin

  committed
  31b29fcView commit details

  Copy full SHA for 31b29fc

  Browse repository at this point

Commits on Feb 3, 2017

• refine CCClass

  jareguo

  committed
  5f9e469View commit details

  Copy full SHA for 5f9e469

  Browse repository at this point

• remove unused prototype properties

  jareguo

  committed
  89aedebView commit details

  Copy full SHA for 89aedeb

  Browse repository at this point

• Merge pull request #1468 from cocos-creator/v1.4

  Show description for c861b7d
  jareguo

  authored
  c861b7dView commit details

  Copy full SHA for c861b7d

  Browse repository at this point

• Merge pull request #1467 from jareguo/v1.4

  Show description for cfad0d0
  jareguo

  authored
  cfad0d0View commit details

  Copy full SHA for cfad0d0

  Browse repository at this point

• should enable try catch for life-cycle methods in edit mode

  jareguo

  committed
  7e7c58aView commit details

  Copy full SHA for 7e7c58a

  Browse repository at this point

• Merge pull request #1466 from jareguo/master

  Show description for 90b7e1b
  jareguo

  authored
  90b7e1bView commit details

  Copy full SHA for 90b7e1b

  Browse repository at this point

• reviewed

  jareguo

  committed
  42ba8c1View commit details

  Copy full SHA for 42ba8c1

  Browse repository at this point

• fix _priorityIn

  jareguo

  committed
  037a322View commit details

  Copy full SHA for 037a322

  Browse repository at this point

• remove unused prototype properties

  jareguo

  committed
  36a7328View commit details

  Copy full SHA for 36a7328

  Browse repository at this point

• minify ClassManager

  jareguo

  committed
  78cb8d4View commit details

  Copy full SHA for 78cb8d4

  Browse repository at this point

• refactor scheduler

  jareguo

  committed
  f3a069fView commit details

  Copy full SHA for f3a069f

  Browse repository at this point

• Merge pull request #1463 from jareguo/master

  Show description for 73dc2eb
  jareguo

  authored
  73dc2ebView commit details

  Copy full SHA for 73dc2eb

  Browse repository at this point