Michael Schmatz
|
897fe6c63e
|
Improved error handling
|
2014-11-28 11:44:03 -05:00 |
|
Michael Schmatz
|
2574549a78
|
Improved error handling
|
2014-11-28 11:37:31 -05:00 |
|
Michael Schmatz
|
3475770f13
|
Merge branch 'master' into production
|
2014-11-28 11:09:07 -05:00 |
|
Michael Schmatz
|
0ac0065753
|
Fixed payments
|
2014-11-28 11:07:37 -05:00 |
|
Erlend Birkenes
|
744b856092
|
Fixed padding on language-dropdown
|
2014-11-28 12:10:57 +01:00 |
|
Matt Lott
|
fead762d04
|
Stopping tracking analytics for admins
|
2014-11-27 23:55:28 -05:00 |
|
Nick Winter
|
575358d3c1
|
Merge pull request #1811 from ebirkenes/translation
Added myself as translator on norwegian nb
|
2014-11-27 11:52:43 -08:00 |
|
Erlend Birkenes
|
434b71c887
|
Added myself as translator on norwegian nb
|
2014-11-27 20:45:27 +01:00 |
|
Nick Winter
|
4be9050ac4
|
Merge pull request #1810 from ebirkenes/translation
Translated the entire contributing page plus some other stuff to norwegian
|
2014-11-27 11:29:24 -08:00 |
|
Erlend Birkenes
|
5f7f1c2b65
|
Translated the entire contributing page plus some other stuff to norwegian.
|
2014-11-27 20:17:33 +01:00 |
|
Nick Winter
|
2d2a9ad681
|
Updated Hour of Code visitor counting.
|
2014-11-27 09:44:08 -08:00 |
|
Nick Winter
|
b5c7a4e0f2
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-11-27 07:28:31 -08:00 |
|
Nick Winter
|
f54377dbaf
|
Merge pull request #1807 from ebirkenes/translation
More norwegian translations.
|
2014-11-27 07:27:51 -08:00 |
|
Erlend Birkenes
|
37601efa17
|
More norwegian translations.
Conflicts:
app/locale/nb.coffee
|
2014-11-27 16:11:13 +01:00 |
|
Nick Winter
|
81495fd722
|
Added suspect code fragment to Known Enemy.
|
2014-11-26 19:30:23 -08:00 |
|
Nick Winter
|
0499702e10
|
Translated IFC Videira description to English, and added an image.
|
2014-11-26 19:22:39 -08:00 |
|
Nick Winter
|
bef466304d
|
Merge pull request #1805 from leocadiotk/patch-1
Update MainPlayView.coffee
|
2014-11-26 19:20:45 -08:00 |
|
Nick Winter
|
4e51289de8
|
Merge pull request #1800 from ShadowTrainer/patch-2
Update tr.coffee
|
2014-11-26 19:20:10 -08:00 |
|
Nick Winter
|
da94c755cb
|
Merge branch 'mestad-patch-1'
|
2014-11-26 19:19:43 -08:00 |
|
Nick Winter
|
12253fc472
|
Resolved nb.coffee merge conflicts.
|
2014-11-26 19:19:30 -08:00 |
|
Nick Winter
|
9b3e252754
|
Merge branch 'ShadowTrainer-patch-1'
|
2014-11-26 19:09:51 -08:00 |
|
Nick Winter
|
167595789d
|
Merged tr.coffee.
|
2014-11-26 19:09:39 -08:00 |
|
Nick Winter
|
4c900b8870
|
Working on paper doll equipping.
|
2014-11-26 19:06:57 -08:00 |
|
leocadiotk
|
d2b394aaf2
|
Update MainPlayView.coffee
|
2014-11-26 23:16:07 -02:00 |
|
Nick Winter
|
7a7d82e8e4
|
Merge pull request #1792 from ccdarkness/patch-1
Update zh-HANS.coffee
|
2014-11-26 16:51:07 -08:00 |
|
Nick Winter
|
6e7e11a884
|
Merge pull request #1791 from nadian/patch-1
Update id.coffee
|
2014-11-26 16:50:50 -08:00 |
|
Nick Winter
|
16e0c2b4fb
|
Merge pull request #1804 from ebirkenes/translation
Lots of translations to norwegian bokmål
|
2014-11-26 16:49:58 -08:00 |
|
Nick Winter
|
ab1e256b98
|
Merge pull request #1803 from ebirkenes/master
Fixed wrong I18n suffix in Thang Editor section on Community page.
|
2014-11-26 16:48:31 -08:00 |
|
Nick Winter
|
915a3243f5
|
Added feature image hair and thumb slots to the ThangType.
|
2014-11-26 16:29:48 -08:00 |
|
Erlend Birkenes
|
c8a34e78e8
|
Lots of translations to norwegian bokmål
|
2014-11-27 01:00:02 +01:00 |
|
Erlend Birkenes
|
83e41bb38e
|
Fixed wrong I18n suffix in Thang Editor section on Community page.
|
2014-11-27 00:41:29 +01:00 |
|
Nick Winter
|
53c6da5ef8
|
Allowing upload of paper doll images for items.
|
2014-11-26 14:18:17 -08:00 |
|
Nick Winter
|
318b499e3e
|
Merge branch 'master' into production
|
2014-11-26 12:57:10 -08:00 |
|
Nick Winter
|
fc18ed0153
|
Undisabled the new Adventurer levels we just emailed about.
|
2014-11-26 12:56:58 -08:00 |
|
Matt Lott
|
cf6450201f
|
Fix IE9 simulation problems
World.deserialize call had mixed up parameters.
flagHistory wasn’t being initialized.
Error logging using unsupported CoffeeScript splats invocation.
|
2014-11-26 15:40:18 -05:00 |
|
Nick Winter
|
72b2d069c0
|
Merge branch 'notno-master'
|
2014-11-26 12:36:26 -08:00 |
|
Nick Winter
|
e538808c76
|
Merge branch 'master' of git://github.com/notno/codecombat into notno-master
|
2014-11-26 12:34:35 -08:00 |
|
Nick Winter
|
12394b6bba
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-11-26 12:33:36 -08:00 |
|
Nick Winter
|
9feb4e6add
|
Using ACE to add syntax highlighting to code documentation.
|
2014-11-26 12:33:29 -08:00 |
|
Nathan Rosquist
|
da4116ee2e
|
Add tree_stand thangs to Generate Terrain modal in level editor. Use as border for grassy terrain.
|
2014-11-26 12:18:57 -08:00 |
|
Scott Erickson
|
c4fdcab6fe
|
The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.
|
2014-11-26 12:02:42 -08:00 |
|
Nick Winter
|
d6b9551aca
|
Merge branch 'master' into production
|
2014-11-26 11:05:24 -08:00 |
|
Nick Winter
|
e8ed205038
|
Added original data to all WorldMapView levels.
|
2014-11-26 11:03:24 -08:00 |
|
Nick Winter
|
55eaed0cd2
|
Updated AI/Vision pathfinding/line-of-sight default terrain updates.
|
2014-11-26 10:51:30 -08:00 |
|
Nick Winter
|
c701ca9eb0
|
Sorting items by tier instead of gems so that the unlock order will be consistent, and so that we can show the Ring of Speed early despite its high price.
|
2014-11-26 09:22:30 -08:00 |
|
Nick Winter
|
8624a82036
|
Merge branch 'master' into production
|
2014-11-26 08:53:44 -08:00 |
|
Nick Winter
|
2c0bf2fef1
|
Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed.
|
2014-11-26 08:53:06 -08:00 |
|
Nick Winter
|
3f9aa1ba79
|
Changed 'Your Skills' to 'Help' for hero level spell palette.
|
2014-11-26 07:39:13 -08:00 |
|
Nick Winter
|
18238a1781
|
Silhouetted items show what level they'd need to unlock after a while on hover from inventory modal.
|
2014-11-26 07:33:07 -08:00 |
|
Nick Winter
|
48e78aa0d0
|
Messed around with equip button and active item css.
|
2014-11-26 07:11:55 -08:00 |
|