Nick Winter
3cfabf8122
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-08-19 12:16:23 -07:00
Imperadeiro98
c701976e65
Merge pull request #2951 from teresacream/patch-1
...
Update zh-HANT.coffee
2015-08-19 11:39:38 +01:00
Imperadeiro98
4503483535
Merge pull request #2954 from AkaKaras/patch-3
...
add few translations
2015-08-19 11:38:57 +01:00
AkaKaras
896f11c621
add few translations
...
just translate few words
2015-08-18 22:03:24 -04:00
Nick Winter
36494acc5a
Merge pull request #2949 from trotod/fix-interface-audio
...
Fix some campaign interface audio
2015-08-18 16:19:38 -07:00
Imperadeiro98
557d4ceb42
Uncommented some headers
2015-08-18 22:38:30 +01:00
Imperadeiro98
48a42939a1
Merge pull request #2953 from javatlacati/patch-1
...
Update it.coffee
2015-08-18 22:37:02 +01:00
RUSLAN LÓPEZ CARRO
4aa0c61a74
Update it.coffee
2015-08-18 16:29:43 -05:00
Imperadeiro98
d5398f1376
Merge pull request #2950 from AkaKaras/patch-2
...
there has a typos at #963
2015-08-18 22:28:43 +01:00
Imperadeiro98
de98d865c2
Uncommented a couple headers
2015-08-18 21:00:58 +01:00
Imperadeiro98
3caec5c36a
Merge pull request #2952 from javatlacati/patch-6
...
Update es-ES.coffee
2015-08-18 20:59:29 +01:00
Nick Winter
e041c288cc
Merge pull request #2948 from Imperadeiro98/master
...
Use playSound in PlayItemsModal.coffee
2015-08-18 12:40:36 -07:00
RUSLAN LÓPEZ CARRO
bec730741c
Update es-ES.coffee
2015-08-18 12:16:04 -05:00
teresacream
1607cbdfeb
Update zh-HANT.coffee
2015-08-18 22:27:20 +08:00
AkaKaras
2fa01b660a
there has a typos at #963
...
the word 吧is misused, should use 把 instead
2015-08-18 10:23:40 -04:00
Matt Lott
0fee075470
🐛 Fix sponsored subscription error logging bug
2015-08-17 15:49:49 -07:00
Imperadeiro98
56291fc417
Use playSound in PlayItemsModal.coffee
2015-08-17 20:34:34 +01:00
David Liu
a242c41557
Play sound on Buy Gems press
...
Partial solution to #2916 .
2015-08-16 18:59:21 -07:00
David Liu
18ac0e06a2
Cut out extra sound on Items/Achievements press
...
Removes event listener on supermodel 'loaded-all' event.
Fixes #2915
2015-08-16 18:59:21 -07:00
Nick Winter
742b924933
Merge pull request #2947 from christotsvetanov/master
...
Translate a part of the Bulgarian file
2015-08-16 06:08:04 -07:00
jpss256
4120a31890
Translate a part of the Bulgarian file
2015-08-16 11:49:02 +03:00
Nick Winter
6f2b1b2a41
Added back an index we need on LevelSession, but in code this time instead of just from the shell as 'weird query index'.
2015-08-15 12:44:19 -07:00
Nick Winter
32ca453dec
Added /play/ladder/levelID/clan/clanID clan-specific ladder pages.
2015-08-15 06:45:38 -07:00
Nick Winter
bda2483738
Added league-based ladder game simulation.
2015-08-15 05:38:47 -07:00
Imperadeiro98
bc18e9c7dd
Merge pull request #2944 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-08-15 11:12:05 +01:00
Ikuyadeu
d5cd08108a
Update ja.coffee
2015-08-15 18:57:20 +09:00
Matt Lott
978f0df7d3
🐛 Fix InspectletJS script loading
...
Original embed code was not correct for delayed script loading.
2015-08-14 14:02:19 -07:00
Nick Winter
42b7efab76
Merge pull request #2941 from laituan245/master
...
Fixed #2729 (bug in the article preview button)
2015-08-14 12:55:23 -07:00
Lai Tuan
5795399aaa
Fixed #2729
2015-08-15 04:04:00 +09:00
Imperadeiro98
a90656976b
Merge pull request #2940 from jhoon/translations-es
...
Add translations up teacher's section
2015-08-14 11:45:41 +01:00
Jhoon Saravia
e69bd91afe
Add translations up teacher's section
2015-08-13 23:34:24 -05:00
Nick Winter
f757f220be
Refactored scoring.coffee into separate files per route plus a scoringUtils file, and cleaned up a few of the verbose methods.
2015-08-13 11:17:38 -07:00
Matt Lott
05a9013164
Remove deprecated prepaid schema properties
2015-08-13 11:13:15 -07:00
Nick Winter
621e143544
Fixed bug with game menu not highlighting guide tab.
2015-08-13 11:09:26 -07:00
Matt Lott
4804f3965f
🐛 Fix prepaid schema for redeemers property
2015-08-13 10:57:47 -07:00
Matt Lott
7f48191017
Migrate prepaids to v2 schema script
2015-08-13 10:25:25 -07:00
Nick Winter
52aa877f46
Cleaned up an old file.
2015-08-13 08:30:18 -07:00
Nick Winter
a52e9a3189
Fixed #2939 .
2015-08-13 05:58:46 -07:00
Imperadeiro98
818043bf7f
Merge pull request #2938 from jhoon/patch-2
...
Added some translations in Spanish
2015-08-13 11:22:18 +01:00
Jhoon Saravia
182614400a
Add some translations in Spanish
2015-08-12 23:15:03 -05:00
Matt Lott
9c39bf7656
Update prepaids to support multiple redeemers for a single code
...
Will remove deprecated properties after updating production.
2015-08-12 15:51:18 -07:00
Nick Winter
49dc71a157
Added a Bloc coupon code after A Mayhem of Munchkins.
2015-08-12 10:25:56 -07:00
Nick Winter
ccf889480f
Removed unnecessary newConsole line in headless client.
2015-08-11 08:50:43 -07:00
Nick Winter
3dac0e4a99
Merge pull request #2932 from trotod/fix-headless-simulator
...
Fix the headless simulator
2015-08-11 05:14:35 -07:00
Imperadeiro98
dcd09137c1
Merge pull request #2934 from Ikuyadeu/patch-1
...
Update ja.coffee
2015-08-11 12:30:04 +01:00
Ikuyadeu
d9cc779261
Update ja.coffee
2015-08-11 20:09:45 +09:00
Imperadeiro98
e205450d79
Fixed some mistakes in last merge
2015-08-11 10:59:05 +01:00
Imperadeiro98
758d84dc12
Merge pull request #2933 from matheusmbar/patch-2
...
Update pt-BR.coffee
2015-08-11 10:57:31 +01:00
Matheus Marques
cad071f384
Update pt-BR.coffee
2015-08-11 02:05:16 -03:00
David Liu
7d64087e29
Fix the headless simulator
...
Shims `lscache`, support io.js < v3.0.0. Make simulating `one-game`
possible.
Tested on Linux with Node.js v0.10.40 and v0.12.7; as well as io.js
v2.5.0.
It still won't work with io.js v3.0.0 because `webworker-threads`
doesn't compile properly, so that's another problem.
2015-08-10 18:12:53 -07:00