Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on Mar 7, 2014

• Merge branch 'master' of https://github.com/codecombat/codecombat

  sderickson

  committed
  12f1042

  Copy full SHA for 12f1042

• Fixed some level IDs.

  nwinter

  committed
  6e47416

  Copy full SHA for 6e47416

• Merge remote-tracking branch 'origin/master'

  sderickson

  committed
  8012add

  Copy full SHA for 8012add

• Made simulator level-independent

  

  Michael Schmatz

  committed
  45cd7e3

  Copy full SHA for 45cd7e3

• Merge remote-tracking branch 'origin/master'

  sderickson

  committed
  34278a8

  Copy full SHA for 34278a8

• Fixed a couple of the bugs with marks.

  sderickson

  committed
  a4edb76

  Copy full SHA for a4edb76

• Fixed CocoSprite getOffset to not apply scale to registration points.

  nwinter

  committed
  40e8968

  Copy full SHA for 40e8968

• Fixed the effect marks so they properly go away.

  sderickson

  committed
  5b11e13

  Copy full SHA for 5b11e13

• More fixes for empty string array serialization.

  nwinter

  committed
  b6335a3

  Copy full SHA for b6335a3

• Merge branch 'master' of https://github.com/codecombat/codecombat

  sderickson

  committed
  2fb1c18

  Copy full SHA for 2fb1c18

• Couple tweaks to the cocosprite for effect marks.

  sderickson

  committed
  1b61b92

  Copy full SHA for 1b61b92

Commits on Mar 6, 2014

• Fixed some event listeners on destroyed loaders.

  nwinter

  committed
  ea406bd

  Copy full SHA for ea406bd

• Merge remote-tracking branch 'origin/master'

  sderickson

  committed
  2ac5a94

  Copy full SHA for 2ac5a94

• Set up marks to all load dynamically, and set up effect marks, which appear above a thang's head and rotate between them if there are multiple.

  sderickson

  committed
  041f451

  Copy full SHA for 041f451

• Fixed array / string ThangState key serialization conflicts. Fixed #333.

  nwinter

  committed
  40a32d7

  Copy full SHA for 40a32d7

• Started some more name categories.

  nwinter

  committed
  a03403d

  Copy full SHA for a03403d

• Fixed Archer M names conflict.

  nwinter

  committed
  fddd210

  Copy full SHA for fddd210

• Merge pull request #477 from iraladson/patch-1

  Show description for b5c72e4
  nwinter

  committed
  b5c72e4

  Copy full SHA for b5c72e4

• Fixed i18n tag typo: adventurer_sumamry -> adventurer_summary.

  nwinter

  committed
  d3dd0eb

  Copy full SHA for d3dd0eb

• Merge pull request #484 from akaza-akari/cn-locale

  Show description for 49dac82
  nwinter

  committed
  49dac82

  Copy full SHA for 49dac82

• Merge branch 'enh-panning' of git://github.com/akaza-akari/codecombat into akaza-akari-enh-panning

  nwinter

  committed
  58069fc

  Copy full SHA for 58069fc

• Translated more strings

  

  Akaza Akari

  committed
  ad3019a

  Copy full SHA for ad3019a

• Translate passages on Contribute and About page

  

  Akaza Akari

  committed
  929d105

  Copy full SHA for 929d105

• Added volume manipulation, adjusted panning parameters

  

  Akaza Akari

  committed
  030da44

  Copy full SHA for 030da44

• Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master

  sderickson

  committed
  a6c4fe8

  Copy full SHA for a6c4fe8

• Made updatePosition use getWorldPosition

  

  Akaza Akari

  committed
  51d7bd6

  Copy full SHA for 51d7bd6

• Add thang sound panning for #454

  

  Akaza Akari

  committed
  99f4302

  Copy full SHA for 99f4302

Commits on Mar 5, 2014

• Temporary hack fix while mongodb text search is broken.

  sderickson

  committed
  aa3167f

  Copy full SHA for aa3167f

• Merge pull request #482 from Darredevil/patch-4

  Show description for fe8580b
  nwinter

  committed
  fe8580b

  Copy full SHA for fe8580b

• Update ro.coffee

  Show description for 398fa3c
  Darredevil

  committed
  398fa3c

  Copy full SHA for 398fa3c

• Merge pull request #481 from dkundel/master

  Show description for 2d69abf
  nwinter

  committed
  2d69abf

  Copy full SHA for 2d69abf

• highlight only the executing statement

  dkundel

  committed
  b0d571c

  Copy full SHA for b0d571c

• Merge branch 'master' of https://github.com/codecombat/codecombat

  sderickson

  committed
  7a2d5b4

  Copy full SHA for 7a2d5b4

• Fixed #480

  sderickson

  committed
  fc42043

  Copy full SHA for fc42043

• Tweaked an error message to be more generally useful.

  sderickson

  committed
  af265eb

  Copy full SHA for af265eb

Pagination

Previous

Next