Kojo Idrissa
bad3b48af1
reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute"
2015-02-28 15:47:43 -06:00
laituan245
7a19c616c3
Fixed issue #2430
2015-03-01 06:19:35 +09:00
Kojo Idrissa
5812f954f7
added new loading message/tip from prior commit to en-GB & en-US.coffee files
2015-02-28 15:09:12 -06:00
Kojo Idrissa
39f04f0f8b
added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files
2015-02-28 15:03:40 -06:00
FedericoTomas
307556d0d1
Update es-419.coffee
...
now its done, thanks.
2015-02-28 17:03:57 -03:00
Imperadeiro98
2bac9b5607
Merge pull request #2425 from nixel2007/master
...
Update ru.coffee
2015-02-28 19:48:39 +00:00
Khoffee
b010a9b388
Update names.coffee
...
Added more names for issue #53
2015-02-28 13:24:20 -06:00
Fahad Iqbal
ea31862e85
Adding a few names
2015-02-28 12:44:54 -06:00
DotTry
d135ba2513
Added 10 names.
2015-02-28 12:39:30 -06:00
FedericoTomas
8cc99adfd6
Update es-419.coffee
...
Doing some work
2015-02-28 15:32:29 -03:00
Kojo Idrissa
d55e4fecba
Added multiple names
2015-02-28 11:58:20 -06:00
nixel2007
6902b7e246
Update ru.coffee
2015-02-28 18:48:36 +03:00
Nick Winter
44008be95f
Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level.
2015-02-27 21:37:55 -08:00
Matt Lott
86d167394e
Remove Segment analytics dependency
...
Call Google Analytics, Errorception, and Inspectlet directly.
2015-02-27 16:07:41 -08:00
Imperadeiro98
f2f1359e3b
Update pt-PT.coffee
2015-02-27 22:54:51 +00:00
Nick Winter
6596912fa4
Propagated i18n.
2015-02-27 14:37:05 -08:00
Nick Winter
00245c69ec
Actually activated the previous fix.
2015-02-27 14:07:07 -08:00
Nick Winter
8df779b5a3
Fixed issue of level editor getting super low res when resizing the window when not looking at the ThangsTabView.
2015-02-27 13:49:26 -08:00
Nick Winter
473f9304fd
Merge pull request #2412 from h3yduck/navbar_issue
...
Add "navigation bar" to user profile page (issue 2411)
2015-02-27 13:27:17 -08:00
Szabolcs Gelencser
b022a94cf1
Update hu.coffee
2015-02-27 21:51:42 +01:00
Michael Schmatz
d0d622445f
Fixed tracking for non production environments
2015-02-27 14:44:06 -05:00
Michael Schmatz
4efb73d8d7
Switch to new analytics server
2015-02-27 13:45:10 -05:00
Nick Winter
45d4b25c60
Fixed #1048 because I accidentally closed it and then didn't want to reopen it, so figured I might as well fix it as if I meant to do that the whole time.
2015-02-27 09:28:26 -08:00
Szabolcs Gelencser
58f2494c83
update campaign.schema.coffee also
2015-02-27 18:16:16 +01:00
Szabolcs Gelencser
dde3e8cf8f
Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired
2015-02-27 17:33:38 +01:00
Nick Winter
b4e9ee67f0
Added one-minute in-memory server caching for a bunch of common queries.
2015-02-26 17:20:27 -08:00
Nick Winter
9b34d4e166
Ooops, that was just for testing.
2015-02-26 16:04:57 -08:00
Szabolcs Gelencser
b138001205
for issue #2406
2015-02-26 23:42:37 +01:00
Nick Winter
e881aec7d7
Account button shouldn't show up for anonymous players.
2015-02-26 14:35:41 -08:00
Nick Winter
77bca72002
Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white.
2015-02-26 14:24:00 -08:00
Szabolcs Gelencser
eb30daf07a
use nav.profile for i18n
2015-02-26 21:57:05 +01:00
Szabolcs Gelencser
a6ad04af53
Add navbar to profile
2015-02-26 12:19:32 -08:00
Nick Winter
32a95afbd0
Allowing reordering of levels in Campaign. Reversing CampaignEditor levels before save so that when the save magically reverses them again, the order is preserved.
2015-02-26 11:33:07 -08:00
Matt Lott
52bc660391
Add external subs script
2015-02-26 08:44:56 -08:00
Nick Winter
7d2c99acd7
Added attack/health/speed tooltip explanations on hero picker stat comparison bars.
2015-02-26 08:02:22 -08:00
Imperadeiro98
d4c64457b4
Update en.coffee
2015-02-26 14:49:33 +00:00
Imperadeiro98
6a6cd83252
Fixed i18n in about page
2015-02-26 14:48:58 +00:00
Imperadeiro98
ed2f498917
Added i18n to subscribe price
2015-02-26 14:41:40 +00:00
Nick Winter
df4b98a9bf
Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.
2015-02-25 18:41:39 -08:00
Nick Winter
7e889a2a80
Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory.
2015-02-25 18:09:55 -08:00
Nick Winter
3be2b6406d
Admins are now automatically premium.
2015-02-25 17:45:01 -08:00
Nick Winter
c8c76e6b74
Trying to track down the cause of InventoryModal loading without a hero assigned.
2015-02-25 16:19:49 -08:00
Nick Winter
b6d8ceafb0
Updating team page and avatars.
2015-02-25 15:40:50 -08:00
Nick Winter
a2a78286da
Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.
2015-02-25 14:24:32 -08:00
George Saines
9adb59f9ad
fixing the buy gems background
2015-02-25 14:21:32 -08:00
Nick Winter
714ff0a249
Merge pull request #2408 from laituan245/master
...
Update hero-victory-modal.sass (Issue 1917)
2015-02-25 13:59:52 -08:00
laituan245
e73208f8e8
Update hero-victory-modal.sass
2015-02-26 06:03:17 +09:00
Nick Winter
15ca65f226
Further disabled employer portal for now.
2015-02-25 12:38:51 -08:00
Nick Winter
d58d151b8c
Got rid of debugging code that was making Hour of Code stuff always show up.
2015-02-25 12:32:59 -08:00
Nick Winter
a66e1c5389
Retoring next level highlight arrow for players who are very new when they click off a selected level.
2015-02-25 11:58:03 -08:00
Nick Winter
9be8c55d6f
Started some new Thang name categories for #53 .
2015-02-25 11:50:43 -08:00
Nick Winter
13f9d71cca
You can now use bitcoin to buy gems.
2015-02-25 11:33:51 -08:00
Nick Winter
1ab8274c43
Added a clear storage button to the campaign editor.
2015-02-25 11:09:15 -08:00
angryelven-jdd
6654cfb410
Update de-DE.coffee
...
translated subscription section
2015-02-25 16:05:06 +01:00
Nick Winter
1c14059d92
Better console logging for Vectors and shapes.
2015-02-24 18:21:33 -08:00
George Saines
88ebd5f46b
adding subscribe option to buy gems modal
2015-02-24 17:40:50 -08:00
Imperadeiro98
289ddb0a4f
Removed unneeded strong tag from last merge
2015-02-24 21:54:13 +00:00
Shady Kamal
431b9dca85
Update he.coffee
2015-02-24 23:42:47 +02:00
Nick Winter
be625cbfbe
Merge pull request #2403 from divyanshu013/master
...
Bug fix for long hero button text in Russian for #1918
2015-02-24 12:56:55 -08:00
Imperadeiro98
c174cc35fa
Merge pull request #2401 from popey456963/master
...
Update teacher.jade
2015-02-24 20:49:13 +00:00
Popey456963
e5c71d0c6a
Changed aimed to recommended
2015-02-24 20:46:49 +00:00
Popey456963
f79d90b81f
Changed requirement to recommended
2015-02-24 20:40:44 +00:00
divyanshu013
f2459f1b39
Bug fix for long hero button text in Russian for #1918
2015-02-25 02:08:08 +05:30
Popey456963
9419ec1d33
Update EN.coffee
...
For new Teacher.jade
2015-02-24 20:17:04 +00:00
Nick Winter
9dd07b024e
Fixed item shop not loading items with later letters of the alphabet, since there are now so many items.
2015-02-24 12:15:35 -08:00
Popey456963
dabf5ce57d
Added minimum age
2015-02-24 20:13:13 +00:00
Nick Winter
1c691283c4
Merge pull request #2400 from laituan245/iss2388
...
Add Profile to account page (Issue #2388 )
2015-02-24 11:57:19 -08:00
laituan245
23a9aa5e33
Changed the URL style
2015-02-25 04:53:20 +09:00
Imperadeiro98
49b6f4ff82
Merge pull request #2397 from divyanshu013/patch-1
...
Update hi.coffee
2015-02-24 19:52:09 +00:00
Nick Winter
592fd52699
Fixed ko.coffee inventory header.
2015-02-24 11:48:44 -08:00
Nick Winter
1e448abde2
Merged ko.coffee.
2015-02-24 11:47:33 -08:00
Divyanshu Maithani
17bdabcc7a
Update hi.coffee
2015-02-25 01:16:47 +05:30
Nick Winter
e48d996a60
Fixed #2286 .
2015-02-24 11:45:50 -08:00
Popey456963
ff8e18146e
Edited Teacher.Jade
...
Removed HoC references, Added Arrays and Expanded Acronym
2015-02-24 19:31:22 +00:00
Imperadeiro98
9f9e9cc639
Update pt-PT.coffee
2015-02-24 19:24:12 +00:00
Imperadeiro98
088d194755
Merge pull request #2396 from ITz7/patch-6
...
Update zh-HANT.coffee
2015-02-24 19:08:06 +00:00
Imperadeiro98
f42a2af8d7
Merge pull request #2395 from ITz7/patch-5
...
Update zh-HANS.coffee
2015-02-24 19:07:21 +00:00
laituan245
a78f864607
Add Profile to account page (Issue #2388 )
2015-02-25 04:03:46 +09:00
Nick Winter
4cbbcdad6d
Merge pull request #2359 from laituan245/master
...
Added ability to delete account
2015-02-24 09:30:22 -08:00
laituan245
a588a3b2c8
Some updates to the PR #2359
2015-02-25 02:12:39 +09:00
laituan245
eb53381083
Don't delete the User object, just remove all the properties except for _id
2015-02-24 22:36:12 +09:00
Aman Kumar
0df2dea469
Issue #2387 : Accounts setting toggle all fix
2015-02-24 17:25:18 +05:30
Divyanshu Maithani
335e1d96e8
Update hi.coffee
2015-02-24 02:48:20 -08:00
ITz7
5d6b2a890c
Update zh-HANT.coffee
...
wondered why Herotype isnt translated o.o
2015-02-24 14:41:18 +08:00
ITz7
a326361e42
Update zh-HANS.coffee
...
Many Minor Updates + FInalization :D
2015-02-24 14:36:46 +08:00
Nick Winter
c43ddda235
Reduced number of events being sent by cutting out simulator results.
2015-02-23 16:56:16 -08:00
Nick Winter
34a92838a5
Propagated i18n.
2015-02-23 16:01:06 -08:00
Nick Winter
69959caba5
Using common.play instead of home.play for a more-common use of it.
2015-02-23 15:59:42 -08:00
Nick Winter
88c55fa7fd
Fix for making ja start game text break lines in the right places. #2386
2015-02-23 15:57:43 -08:00
Nick Winter
4d35c2cefc
Merged.
2015-02-23 15:05:54 -08:00
Nick Winter
0f6404fea1
Being a tiny bit more idiomatic about CoffeeScript ranges.
2015-02-23 15:03:48 -08:00
Nick Winter
6d9e7a76ce
Merge pull request #2389 from amankr/bug/duplicates
...
Issue #2267 : Removed duplicates from TreemaData
2015-02-23 15:02:20 -08:00
Nick Winter
fb10de5023
Merge pull request #2376 from amankr/login
...
Issue #2082 : Campaign editor login fixed
2015-02-23 14:54:15 -08:00
Nick Winter
1513e20486
Merge pull request #2370 from amankr/newfeature
...
Issue #1785 : Empty level editor folders removed
2015-02-23 14:53:08 -08:00
Nick Winter
1314695382
Merge pull request #2385 from nixel2007/master
...
Update diplomat.jade
2015-02-23 14:50:04 -08:00
Nick Winter
61831e83c2
Merge pull request #2368 from rmarren1/master
...
Slight cleanup to level indicator code
2015-02-23 14:49:13 -08:00
Aman Kumar
d8a4803268
Issue #2267 : Removed duplicates from TreemaData
2015-02-24 03:18:35 +05:30
Coderaulic
21ddb9ca59
Update ja.coffee
...
Some minor fixes added based on last changes.
Can you tell me how to add a line break?
Is it " text \ text " for:
text
text
as output? Or "ABC '\' DEF" for:
ABC
DEF
Not familiar with line breaks in coffee script.
2015-02-23 12:24:00 -08:00
Imperadeiro98
6afad49d8f
Some fixes to last merge
2015-02-23 20:21:10 +00:00
Imperadeiro98
c375a8ed12
Merge pull request #2384 from etem/master
...
Update bg.coffee
2015-02-23 20:16:08 +00:00
Imperadeiro98
aad40bbe33
Merge pull request #2383 from musicogeek/patch-1
...
Update es-419.coffee
2015-02-23 20:12:01 +00:00
Imperadeiro98
7ea804458c
Merge pull request #2382 from ITz7/patch-3
...
Update zh-HANT.coffee
2015-02-23 19:59:01 +00:00
Imperadeiro98
0d0dc5597d
Merge pull request #2380 from ITz7/patch-2
...
Update zh-HANS.coffee
2015-02-23 19:57:54 +00:00
Imperadeiro98
9acea40089
Uncommented an header for last commit
2015-02-23 19:52:22 +00:00
Imperadeiro98
f392ffcb71
Merge pull request #2362 from leotada/patch-1
...
Translation PT-BR
2015-02-23 19:51:21 +00:00
nixel2007
a3afec0989
Update diplomat.jade
...
Fix >100% of translation.
2015-02-23 21:18:00 +03:00
Etem Hyusnev
7d7b77e753
Updated translation
2015-02-23 20:15:01 +02:00
Etem Hyusnev
3baf791e77
Updated translation
2015-02-23 19:00:09 +02:00
Etem Hyusnev
68b46778ad
Updated translation
2015-02-23 18:01:32 +02:00
Orlando Hernández
887936fd79
Update es-419.coffee
2015-02-23 11:29:19 -04:30
ITz7
56feac3f5f
Update zh-HANS.coffee
2015-02-23 23:47:37 +08:00
ITz7
2c301df0ba
Update zh-HANS.coffee
2015-02-23 22:36:58 +08:00
ITz7
8c64a69012
Update zh-HANT.coffee
2015-02-23 21:39:14 +08:00
ITz7
faa5b43902
Update zh-HANS.coffee
2015-02-23 19:58:38 +08:00
Etem Hyusnev
9280444f57
Updated translation
2015-02-23 09:11:23 +02:00
Nick Winter
63b24b9bf1
Properly showing the back of wizards' robes.
2015-02-22 21:50:56 -08:00
Etem Hyusnev
ce074921b4
Updated translation
2015-02-22 22:29:04 +02:00
divyanshu013
5ad23fc354
Fix for Campaign editor login not working for #2082
...
Overiding the login and signup listener clicks in CampaignEditorView so that
the child can call them.
2015-02-23 01:34:33 +05:30
divyanshu013
dc953431ec
Fix for long names in leader board for #2373
...
Reduced the max-width component to fit ellipsis properly.
2015-02-23 01:03:35 +05:30
Nick Winter
7d7db5dafe
Thang Editor can now drag Thangs to adjust registration points. Fixed missing terrain save property on ThangTypes. Fixed text search test. Added new Talus (mountain floors) to floor ThangType list for proper stretching.
2015-02-22 11:07:56 -08:00
Imperadeiro98
2e25beccd4
Uncommented some translations from last merge
2015-02-22 16:10:20 +00:00
Imperadeiro98
da4a160f54
Merge pull request #2377 from etem/master
...
Updated Bulgarian translation
2015-02-22 16:04:27 +00:00
Matt Lott
7e46b819c4
Stripe API version update fixes
...
Using customer sources instead of cards so we can update our API
version:
https://stripe.com/docs/upgrades?since=2014-11-05#api-changelog
2015-02-22 07:54:36 -08:00
Etem Hyusnev
3179546430
Updated Bulgarian translation
2015-02-22 17:43:44 +02:00
Aman Kumar
7f442a32a3
Issue #2082 : Campaign editor login fixed
2015-02-22 20:26:13 +05:30
Coderaulic
8915f0a98e
Update ja.coffee
...
Various translations added and some minor fixes.
2015-02-21 23:49:48 -08:00
Aman Kumar
436594555c
Issue #1785 : Empty level editor folders removed
2015-02-22 05:11:02 +05:30
Ryan Marren
b16c44da63
Merge remote-tracking branch 'upstream/master'
2015-02-21 17:31:30 -05:00
Ryan Marren
320e8c401a
level indicator code cleanup
2015-02-21 17:30:32 -05:00
Nick Winter
40ff7d4116
Harmonized enter shortcut for PlayHeroesModal.
2015-02-21 14:22:51 -08:00
Matt Lott
ecd9abc3b6
Merge pull request #2366 from rmarren1/master
...
Clarified level indicator for #2351
Fixes #2351
2015-02-21 11:41:35 -08:00
Ryan Marren
f850409dbe
made "level" display in other languages
2015-02-21 14:29:40 -05:00
Nick Winter
e3d13f6dd0
Merge pull request #2363 from ChaosCat/patch-1
...
Update he.coffee
2015-02-21 09:21:41 -08:00
Ryan Marren
a7dadc34aa
Added level indicator
2015-02-20 23:50:42 -05:00
Nick Winter
0e135ac07f
Fixed blank language selector row.
2015-02-20 15:20:44 -08:00
Shady Kamal
f32572e94c
Update he.coffee
...
+Another update for "he.coffe" file
2015-02-20 20:38:30 +02:00
Leonardo
de7f216d22
translation
...
translation.
2015-02-20 15:35:37 -02:00
enricpc
e113c7accb
Update ca.coffee
2015-02-20 08:51:29 +01:00
Nick Winter
ab252adf90
Better detection and error handling of unsupported WebGL context creation failures.
2015-02-19 19:57:10 -08:00
laituan245
d325623699
Added ability to delete account
2015-02-20 08:19:30 +09:00
sohalya
a3ce088657
Update fr.coffee
...
Some translations and french grammar corrections.
2015-02-19 17:21:46 +01:00
Shady
928748ff5f
Update he.coffee
...
a minor update for he.coffee
2015-02-19 14:16:23 +02:00
Nick Winter
8355ba5a6d
Replayable level awards now count up from where they were last time instead of from 0.
2015-02-18 18:01:22 -08:00
Nick Winter
f2a5c4bc5a
Merge pull request #2353 from amankr/sound
...
Volume bug fix #2202
2015-02-18 13:36:59 -08:00
Nick Winter
a81663f06a
CampaignView shouldn't use localStorage backups unless it's in editor mode.
2015-02-18 13:35:47 -08:00
Imperadeiro98
227a8edffa
Merge pull request #2350 from vampirelower/patch-2
...
Update uk.coffee
2015-02-18 20:45:49 +00:00
Aman Kumar
e4a3890f39
fixed volume bug #2202
2015-02-19 02:05:41 +05:30
Aman Kumar
a74c2a58e2
fixed volume bug #2202
2015-02-19 01:58:24 +05:30
Shady
a7bff7a011
Update he.coffee - 2
...
second update done
2015-02-18 22:16:12 +02:00
Edward Litvinchyck
ff4487d79f
Update uk.coffee
2015-02-18 21:10:33 +02:00