Nick Winter
7807fdbbc6
Merged pt-PT locale conflicts.
2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff
Merged.
2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d
Merge pull request #763 from OlenaGapak/patch-1
...
Update uk.coffee
2014-04-01 10:26:55 -07:00
Nick Winter
b316a3e078
Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing
2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408
added two programming quotes
2014-04-01 17:16:35 +02:00
swapnesh
497563bc0a
Added more names for #53
2014-04-01 17:50:33 +05:30
OlenaGapak
1799310261
Update uk.coffee
...
ukrainian localization
2014-04-01 14:59:46 +03:00
jaudhaen
be9edb74af
updated dutch locale
2014-04-01 09:26:42 +02:00
Ting-Kuan
e076440d1b
Move Noty to vendor folder.
2014-04-01 02:41:04 -04:00
Ting-Kuan
085d181ed3
Use Noty to produce warning message while adding component with not added system.
2014-04-01 00:47:50 -04:00
Michael Schmatz
f084588adf
Merge pull request #758 from dkundel/master
...
update de.coffee
2014-03-31 16:06:38 -07:00
Nick Winter
0bd8321345
Updated Mondo Bizarro i18n comma.
2014-03-31 16:02:56 -07:00
Dominik Kundel
a9b225ec03
fixed indentation de.coffee
2014-04-01 00:55:45 +02:00
Nick Winter
8c013c1192
Fixed 101: added level completion status to /play.
2014-03-31 15:48:22 -07:00
Dominik Kundel
069a7a41e4
update de.coffee
2014-04-01 00:34:51 +02:00
Michael Schmatz
b021b65ee1
Copied new i18n tags to all languages
2014-03-31 15:31:38 -07:00
Alexei Nikitin
0473ce2df1
Update ru.coffee
2014-03-31 15:11:56 -07:00
Alexei Nikitin
6ff8d0fbe3
Update en.coffee
2014-03-31 15:10:51 -07:00
Bia41
898018ac91
Updated pt-PT locale
...
Added some translations for European Portuguese.
2014-03-31 22:53:08 +01:00
Jazzis18
c3e4b4d279
Update ru.coffee
...
Добавил пробел в начало строки переменной join_desc_3, а то в тексте получалось слитно всё.
2014-04-01 03:34:45 +06:00
Nick Winter
a319e183b6
Fixed a little mistake with user signup.
2014-03-31 14:02:15 -07:00
Nick Winter
382422829e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-31 13:56:17 -07:00
Nick Winter
389323953b
Fixed #180 .
2014-03-31 13:56:13 -07:00
Alexei Nikitin
4c3e8671a3
Update ru.coffee
2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f
Update en.coffee
2014-03-31 13:32:11 -07:00
Nick Winter
d8a194f895
Actually using loading screen template.
2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6
Re-added a minor fix that got lost.
2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331
Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master
2014-03-31 12:42:53 -07:00
Dominik Kundel
725a8bc2d9
updated locales
2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c
Merge remote-tracking branch 'upstream/master'
2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856
Update ru.coffee
2014-03-31 11:32:01 -07:00
Alexei Nikitin
aeddb64f90
Update base.jade
2014-03-31 11:09:44 -07:00
tmrdja
dfe6bce351
Added contextmenu
...
Added contextmenu
2014-03-31 18:33:14 +02:00
Bia41
167ee90a70
#673 Replaced .once with @listenToOnce
...
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
2014-03-31 05:02:13 +01:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc
Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions.
2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1
Merged
2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d
Added Thang names
2014-03-30 20:43:48 +01:00
tmrdja
f8de6162d1
Added contextmenu
...
Added contextmenu with Delete and Duplicate button
2014-03-30 19:38:54 +02:00
tmrdja
470a79e6b0
Added contextmenu
2014-03-30 19:33:21 +02:00
Nick Winter
6bff295d2e
Linking up Prabh's Coin Mania level.
2014-03-29 18:04:29 -07:00
Nick Winter
1b92654a44
Merged.
2014-03-29 17:45:01 -07:00
Nick Winter
54f4e8d1e9
Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor
2014-03-29 17:38:14 -07:00
Nick Winter
a79fe37ca1
Merged; made a couple tweaks.
2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88
Update ru.coffee
2014-03-29 17:28:44 -07:00
Dominik Maier
78c18b03b6
Merged new tips
2014-03-30 00:48:31 +01:00
Dominik Maier
fb607d06fa
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
2014-03-30 00:38:45 +01:00
Nick Winter
c58a1682f4
Fixed #519 for real, I think.
2014-03-29 14:09:45 -07:00
Nick Winter
e08265a725
Merge pull request #730 from Darredevil/master
...
Added setGoalState
2014-03-29 14:04:33 -07:00
Nick Winter
b6e0f9037f
Merge pull request #731 from herby/locale
...
some more Slovak
2014-03-29 14:02:38 -07:00
Nick Winter
bd0ecd76e5
Fixed SearchView projections.
2014-03-29 13:22:21 -07:00
Ting-Kuan
130d322d60
Move error_view's dom to template file.
2014-03-28 23:51:15 -04:00
Herbert Vojčík
f0298f4596
some more Slovak
2014-03-29 03:18:45 +01:00
Darredevil
c4de6ef996
Added setGoalState
2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103
Added setGoalState
2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d
Added setGoalState
2014-03-29 03:52:02 +02:00
Nick Winter
5bcaf2c746
Fixed #64 (I hope; let's UX test.)
2014-03-28 17:06:21 -07:00
Nick Winter
cf81d51a89
Fixed #46 .
2014-03-28 15:23:12 -07:00
Nick Winter
5e30ab091b
Updated i18n tags.
2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3
Merged.
2014-03-28 13:08:30 -07:00
Jasper D'haene
7f6510823a
merged
2014-03-28 20:59:05 +01:00
Nick Winter
c4a56dc9a5
Added a thing which highlights the guide every 5 minutes until clicked. Fixed #11 .
2014-03-28 12:22:53 -07:00
Jasper D'haene
fa6ef5aa49
added authors to quotations
2014-03-28 19:58:33 +01:00
Nick Winter
62f2fe80c3
Updated CoordinateDisplay styles; fixed #10 .
2014-03-28 11:55:24 -07:00
Nick Winter
ff7e2d5d47
Fixed #728 .
2014-03-28 11:02:23 -07:00
Jasper D'haene
cd3019296c
added tips/quotes to loading bar
2014-03-28 19:01:31 +01:00
Nick Winter
62867534a7
Fixed #727 .
2014-03-28 09:52:07 -07:00
Scott Erickson
84cb0bfd0d
Merge pull request #713 from Sighne/master
...
Migrate .on, .once - ThangTypeEditView
2014-03-28 09:34:29 -07:00
Michael Schmatz
20c54400b8
Merge pull request #722 from dc55028/master
...
fr.coffee: fixed typos and translated glen_description
2014-03-28 09:16:35 -07:00
Michael Schmatz
e0f50d04a8
Uncomment translations
2014-03-28 09:13:08 -07:00
Dominik Kundel
267d033997
initial coffeescript support. No proper highlighting of executing parts and errors are not displayed inline
2014-03-28 14:42:08 +01:00
Dominik Kundel
35a16b47ff
Merge remote-tracking branch 'upstream/master'
2014-03-28 14:37:14 +01:00
Dom
15590252f1
Update fr.coffee
...
fixed other typos and translated a definition
2014-03-28 00:38:31 +01:00
Arni Mc.Frag
0388376d99
Update ca.coffee
2014-03-28 00:29:54 +01:00
Dom
6f02748311
Update fr.coffee
...
fixed typos
2014-03-28 00:29:31 +01:00
Nick Winter
5763cdca87
Merge pull request #718 from Darredevil/patch-4
...
Added funny tip
2014-03-27 15:19:28 -07:00
Darredevil
a91e067549
Added funny tip
2014-03-28 00:13:40 +02:00
Darredevil
f4a81f43a2
Added funny tip
2014-03-28 00:13:30 +02:00
Nick Winter
b0b37aa9d8
Made play/pause and scrubber look even more disabled when disabled.
2014-03-27 15:07:37 -07:00
Nick Winter
2677751dc5
Merge branch 'lbox-prog' of git://github.com/Shrihari/codecombat into Shrihari-lbox-prog
2014-03-27 14:58:06 -07:00
Nick Winter
31119f402a
Cleaned up readyToRank logic a bit.
2014-03-27 14:55:45 -07:00
Nick Winter
1cab83236c
Merge branch 'master' of git://github.com/jayant1992/codecombat into jayant1992-master
2014-03-27 14:22:44 -07:00
Nick Winter
7ab5adcdac
Merge pull request #700 from pedrofgsrj/loginAutocomplete
...
Fixed issue #597
2014-03-27 14:20:58 -07:00
Nick Winter
127c4a4e0f
Refactored defaults for Aether's fancy options, and overriding them with query parameters. Reduced non-dev-mode script debug logging.
2014-03-27 13:36:33 -07:00
Laura Lebbah
5d894ea053
Migrate .on, .once - ThangTypeEditView
2014-03-27 21:33:59 +01:00
Nick Winter
c076bb1da8
Tweaking some styles; perhaps fixed #6 .
2014-03-27 13:15:22 -07:00
Ting-Kuan
6012a3ce9e
Show error message when editor fails to initiate.
2014-03-27 14:35:20 -04:00
AKeeper
d21fbbfe4d
Update ru.coffee
2014-03-27 16:48:30 +02:00
Aditya Raisinghani
deb3ddeece
Longer modals are now scrollable.
2014-03-27 12:31:29 +05:30
Pedro Sobrinho
38bf27020a
Fixed issue #597
2014-03-26 20:55:03 -04:00
Alexei Nikitin
780743a40d
Update ru.coffee
2014-03-26 15:57:16 -07:00
Alexei Nikitin
2ffc2efaa5
Update ru.coffee
2014-03-26 15:42:03 -07:00
Jayant Jain
648df5eb41
Updated rank my game check, fixes #666
2014-03-27 03:36:27 +05:30
Scott Erickson
37beb1bc6b
Made the ladder tab better able to handle unloaded gplus and facebook apis.
2014-03-26 14:53:09 -07:00
Scott Erickson
092810eba2
Fixed a small error in the migration.
2014-03-26 14:44:11 -07:00
Scott Erickson
8001e58848
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
...
Conflicts:
app/models/SuperModel.coffee
2014-03-26 14:39:01 -07:00
Scott Erickson
fae9034dfc
Merge branch 'master' of https://github.com/swapkh91/codecombat into swapkh91-master
...
Conflicts:
app/models/SuperModel.coffee
2014-03-26 14:29:16 -07:00
Scott Erickson
462d365ce0
Sorted the friend sessions a bit.
2014-03-26 14:22:04 -07:00
Scott Erickson
781b33092c
Added a google plus connect button.
2014-03-26 14:19:05 -07:00
Scott Erickson
132b22f14a
Got the gplus friends loading now.
2014-03-26 13:50:01 -07:00
Nick Winter
544070e578
Fix for infinite loop fix.
2014-03-26 12:34:45 -07:00
Nick Winter
515b8723a3
Simulator handles more errors.
2014-03-26 12:12:43 -07:00
Nick Winter
ac222c27e8
"Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 12:12:18 -07:00
Scott Erickson
ad70a7f0c6
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
2014-03-26 11:48:47 -07:00
Scott Erickson
3b8cba291d
Removed some unnecessary callbacks.
2014-03-26 11:48:40 -07:00
Nick Winter
127eb3cef6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:32:49 -07:00
Nick Winter
aec4669780
Merge pull request #687 from kgy01/master
...
Hide arrow's shadow if buried
2014-03-26 11:27:11 -07:00
Nick Winter
cab343b0b3
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14
Added infinite loop handling to Simulator.
2014-03-26 11:25:05 -07:00
Jayant Jain
71294f14b2
Updates fb and g+ functions to be called on api load, fixes #695
2014-03-26 22:03:20 +05:30
Glen De Cauwsemaecker
5825b2676b
Added myself to the signature.
2014-03-26 04:46:49 +01:00
swapnesh
1118324b41
Migrate from .on, .once to .listenTo, .listenToOnce
2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/de.coffee
bower.json
2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603
Merge pull request #688 from 1c7/master
...
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc
Translate some word from English -> Chinese. (zh-HANS.coffee)
2014-03-25 23:15:17 +08:00
kgy01
29aad01697
hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition
2014-03-25 08:48:26 -04:00
kgy01
a420064bc1
hide spear's shadow if buried
2014-03-25 08:31:38 -04:00
Glen De Cauwsemaecker
305e2f6d68
Merge pull request #685 from JasperDhaene/master
...
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 13:27:13 +01:00
kgy01
3cc422a281
Merge remote-tracking branch 'upstream/master'
2014-03-25 08:10:30 -04:00
kgy01
c48863fae6
Hide arrow's shadow if buried
2014-03-25 08:06:37 -04:00
Aditya Raisinghani
6208e8e324
Additional fixes for double scrollbars of modals.
2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9
Fixed issue with two scroll bars appearing.
2014-03-25 16:36:24 +05:30
JasperDhaene
748081b4a7
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 09:25:20 +01:00
Shrihari
aee18523b0
Fix for #506
2014-03-25 13:28:22 +05:30
Darredevil
4bb1ee5c74
Update ro.coffee
2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e
Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat
2014-03-25 01:13:30 +01:00
Scott Erickson
bda499b561
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:43:08 -07:00
Scott Erickson
2c329a256f
Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties.
2014-03-24 14:42:56 -07:00
Nick Winter
97613f12b4
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:38:35 -07:00
Nick Winter
a42e33764e
Merged, fixed.
2014-03-24 14:38:18 -07:00
Scott Erickson
53118984ff
Undid a listenTo on a jQuery elem.
2014-03-24 14:29:53 -07:00
Scott Erickson
57f6f4d244
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 14:27:28 -07:00
Scott Erickson
e9b3db2eb9
Fixed destroy to not break stopListening, which uses off.
2014-03-24 14:27:10 -07:00
Ruben Vereecken
a3f65ace7a
Created differentation between nl-BE and nl-NL
2014-03-24 22:21:34 +01:00
Nick Winter
e6e216fcd3
Mergred Diplomats.
2014-03-24 14:20:40 -07:00
Ruben Vereecken
3f3eeab02a
Fixed NaN in ladder in case a player has never played before
2014-03-24 19:46:50 +01:00
Michael Schmatz
83bfc28a9e
Partially refactored scoring callback pyramid of hell
2014-03-24 10:58:43 -07:00
Scott Erickson
f55cef5ced
Merge branch 'migrateBBevents' of https://github.com/Shrihari/codecombat into Shrihari-migrateBBevents
2014-03-24 10:38:57 -07:00
Shrihari
093cc66fa0
Reverted few wrong migrations
2014-03-24 22:56:32 +05:30
Shrihari
f085b0d319
Refactored cast-button events
2014-03-24 22:41:27 +05:30
Shrihari
0160538b44
More migrations
2014-03-24 22:28:34 +05:30
Scott Erickson
bf039ed485
Merge pull request #642 from gintau/feature_-_select_dependents_(extant_component_treema)
...
Select dependents when a extant component is selected.
2014-03-24 09:31:27 -07:00
Scott Erickson
6de62154bd
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-24 09:28:06 -07:00
Shrihari
69ee16f77f
Fixed wrong migrations
2014-03-24 21:37:09 +05:30
Nick Winter
92c87dc4ad
Merge branch 'fix/scroll-spell-debug-view' of git://github.com/gintau/codecombat into gintau-fix/scroll-spell-debug-view
2014-03-24 08:28:48 -07:00
Ting-Kuan
e9118142db
Fix issue #662
2014-03-24 10:54:59 -04:00
Shrihari
5845125b43
Migrate .on, .once - Fixed a small error
2014-03-24 12:32:29 +05:30
Shrihari
67f5270bfc
Migrate .on, .once - Batch 1
2014-03-24 12:23:41 +05:30
Akaza Akari
3e4d7d745a
Script-based movement for all CocoSprites for #140
2014-03-23 23:19:18 -07:00
Nick Winter
5852b87aa3
A little longer debounce is better.
2014-03-23 18:55:44 -07:00
Nick Winter
808762c229
Merge pull request #663 from domenukk/master
...
fixes codecombat/codecombat#655
2014-03-23 18:11:40 -07:00
Dominik Maier
f66e210c73
regarding codecombat/codecombat#655 debounce debounces.
2014-03-24 01:18:36 +01:00
Nick Winter
dbeb3d445b
Give focus back to spell view on palette click.
2014-03-23 16:48:30 -07:00
Dominik Maier
dcbd55a864
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
2014-03-24 00:47:41 +01:00
Nick Winter
4a47c5b517
Dead Thangs sink down a bit in the layer order.
2014-03-23 16:21:36 -07:00
Nick Winter
656b34fc34
Fixed comment gutter icons jumping all over the place.
2014-03-23 16:00:23 -07:00
Glen De Cauwsemaecker
d6178aa2cc
Fixed a small error
2014-03-24 00:46:44 +01:00
Glen De Cauwsemaecker
724592601c
Merge branch 'master' of github.com:JasperDhaene/codecombat
2014-03-24 00:45:09 +01:00
Dominik Maier
0dee3d042f
fixes codecombat/codecombat#655 completely
...
Removes asynchronous name checking, though, if it ever worked.
2014-03-23 23:04:39 +01:00
JasperDhaene
58601e95f6
finished review of nl.coffee
2014-03-23 22:54:30 +01:00
Nick Winter
9fbd008f59
Merge branch 'ItsLastDay-arrow'
2014-03-23 14:15:24 -07:00
Nick Winter
d85dd9f62c
Bringing in #664 , but only when maximizesArc is on.
2014-03-23 14:15:06 -07:00
Mikhail Koltsov
13338afe3d
Now absolutely done scaling ( #46 )
...
also commented math's out.
2014-03-23 23:51:46 +04:00
Mikhail Koltsov
446726acc9
done rotating, looks good in Zone of Danger ( #46 )
2014-03-23 22:13:07 +04:00
Dominik Maier
459a1f9e48
fixes codecombat/codecombat#655
2014-03-23 18:41:15 +01:00
Nick Winter
111973e1c8
Maybe this will be better - more on #650 .
2014-03-23 10:29:08 -07:00
Nick Winter
7ba959045a
A slight enhancement to #650 , plus fixing CocoModels thinking they're modified when schema defaults have been added.
2014-03-23 10:00:16 -07:00
Scott Erickson
8ca5f23749
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-23 09:30:46 -07:00
JasperDhaene
e5d2c07ff1
general revision until line 254
2014-03-23 17:30:45 +01:00
Scott Erickson
72b88a3ee9
First pass on setting up gplus friends on the ladder page.
2014-03-23 09:30:01 -07:00
Mikhail Koltsov
edeeb3c3eb
some work on arrows
2014-03-23 20:21:11 +04:00
Nick Winter
1789723d4d
Merge pull request #650 from dpen2000/Issue390
...
Fix #390
2014-03-23 09:14:41 -07:00
Nick Winter
f8f5f718bb
Merge pull request #660 from dpen2000/SimulatorTextFix
...
Fix "Simulating game between" line to only have one "and"
2014-03-23 09:13:20 -07:00
Nick Winter
4c1dc0d7f9
Merge pull request #661 from M-r-A/patch-2
...
Update ru.coffee
2014-03-23 09:11:52 -07:00
Nick Winter
90832f6015
Merge pull request #653 from 3rr3s3v3n/patch-1
...
Translating Multiplayer lines
2014-03-23 09:11:11 -07:00
JasperDhaene
dde626e759
Update nl.coffee - small revisions/additions
2014-03-23 16:57:33 +01:00
Alexei Nikitin
20e111d307
Update ru.coffee
2014-03-23 07:30:14 -07:00
dpen2000
970552a6d6
Fix "Simulating game between" line to only have one "and"
2014-03-23 13:35:24 +00:00
3rr3s3v3n
f4de280cee
Translating more Lines.
...
Password remains password in Italian, such as VS.
2014-03-23 11:53:39 +01:00
3rr3s3v3n
5ef6f6974f
Translation actived!
...
I removed the # mark from the lines I've translated yesterday.
2014-03-23 11:39:35 +01:00
Nick Winter
fd2d9b6833
Merge pull request #658 from ItsLastDay/editor_tweaks
...
Added tooltip in level-editor (issue #174 )
2014-03-22 17:30:52 -07:00
Nick Winter
487b2aae9b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 14:28:25 -07:00
Nick Winter
eec46dcb48
Don't try to draw a grid if it's not going to work (no lands).
2014-03-22 14:28:18 -07:00
Mikhail Koltsov
2316773cb1
removed Label requierment
2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46
Added labels above selected thangs in level-editor (issue #174 )
2014-03-22 23:17:15 +04:00
Michael Schmatz
c3b745b271
Added Catalan language file
2014-03-22 11:30:58 -07:00
Nick Winter
76ec738213
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 10:54:38 -07:00
Nick Winter
5e311cdefa
Fixed css for IE warnings.
2014-03-22 10:54:35 -07:00
Nick Winter
96fe1e42f0
Merge pull request #657 from adi2412/reloadCode
...
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 22:56:41 +05:30
Mikhail Koltsov
baf8adcc74
added nothing
2014-03-22 20:50:50 +04:00
Nick Winter
29e7b8e5c1
Fixed mail to correctly capture the matches.
2014-03-22 09:48:36 -07:00
Michael Schmatz
5141873725
Added resimulateAllSessions method
2014-03-22 09:07:01 -07:00
Nick Winter
808cf9280b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-22 08:53:02 -07:00
Nick Winter
d289ca825e
Fixed Simulator to actually use protectAPI.
2014-03-22 08:52:47 -07:00
3rr3s3v3n
6b660dade2
Translating Multiplayer lines
...
Ok, I tried to translate in italian some lines ;) hope this helps.
2014-03-22 10:38:32 +01:00
therealbond
7d03c2e520
Merge branch 'master' of https://github.com/therealbond/codecombat
2014-03-22 02:05:19 -04:00
therealbond
b2c500369b
Added more names for #53
2014-03-22 01:56:32 -04:00
Scott Erickson
0df09f7f35
Fixed an ever-reloading bug.
2014-03-21 21:11:51 -07:00
Scott Erickson
2cdfbf1c48
Merged conflicts.
2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/templates/play/ladder/ladder_tab.jade
app/views/play/ladder/ladder_tab.coffee
2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce
Added facebook friends to the ladder page.
2014-03-21 19:50:54 -07:00
dpen2000
6c151acaa7
Optimizations of markToRevert: Switch to using $.extend instead of _.cloneDeep and only when type is not a "ThangType"
2014-03-22 02:22:08 +00:00
dpen2000
60ca991c58
Fix #390
...
The issue here was configSchema is an attribute within attributes and so revertAttributes and attributes get the same instance of it when clone is used. Later calls to _.equals fail when only configSchema has changed.
2014-03-22 01:34:24 +00:00
Nick Winter
b91f3200c2
Merge pull request #649 from jayant1992/master
...
Fixes #641 , the list of levels in editor reloads properly upon changing ...
2014-03-21 17:46:10 -07:00
Nick Winter
e101fb04eb
For #648 : Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627 .
2014-03-21 17:42:13 -07:00
Nick Winter
5abe0746ba
Merge pull request #648 from dpen2000/lastLevel
...
Implement saving lastLevel in database re #627
2014-03-21 17:27:31 -07:00
Jayant Jain
860c3a34d3
Fixes #641 , the list of levels in editor reloads properly upon changing language
2014-03-22 05:51:44 +05:30
Nick Winter
dfcdcaa678
No email addresses for non-admins on CLA submissions.
2014-03-21 17:20:47 -07:00
Nick Winter
4bc1e6805b
Improved page title. Fixed Twitter card image.
2014-03-21 17:06:51 -07:00
dpen2000
a35d0cb651
Implement saving lastLevel in database re #627
2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1
Adding CLAs view.
2014-03-21 16:22:47 -07:00
Nick Winter
893f446b0a
Merge pull request #645 from dpen2000/autocastDelay
...
Save autocastDelay as a setting on User re #627
2014-03-21 16:01:00 -07:00
dpen2000
b1b0579cb3
Save autocastDelay as a setting on User re #627
2014-03-21 22:46:14 +00:00
dpen2000
6363c40fe2
Update cla.jade
...
p -> a. Using html syntax to avoid linking full stop.
2014-03-21 21:59:31 +00:00
Ting-Kuan
0db309f526
Select dependents when a extant component is selected.
2014-03-21 12:19:47 -04:00
Sérgio Batista
ee4858f725
Update pt-PT.coffee
...
Some new additions and minor fixes to old ones
2014-03-21 16:39:47 +01:00
Nick Winter
b30bf35945
Fixed #638 , I hope.
2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40
Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks
2014-03-21 07:25:33 -07:00
Mikhail Koltsov
096c59b6cf
fix some assymetry
2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e
Thang editor: components tab finally looks good and does not overlay other tabs
2014-03-21 15:40:32 +04:00
Mikhail Koltsov
45b87ed38e
finally got it right
2014-03-21 13:45:56 +04:00
Muhammad Nuzaihan Bin Kamal Luddin
eaa9443969
grammar mistake
2014-03-21 17:10:03 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
966e99510e
Probably too little commits at one time. more grammar fixes
2014-03-21 16:45:34 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cb8c146029
grammar fixes
2014-03-21 16:41:23 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d876f975e6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-21 16:33:18 +08:00
Mikhail Koltsov
0ece400a18
Level editor: selecting a thang now moves the scroll in existant-thang list
2014-03-21 11:54:55 +04:00
David Hallberg Jönsson
75138cb67b
Update sv.coffee
...
Updated some existing translations, mostly grammar corrections.
2014-03-21 08:40:37 +01:00
Muhammad Nuzaihan Bin Kamal Luddin
4804065c94
Comment out WIP. Uncomment missed line.
2014-03-21 15:07:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6f0915e7ce
Messed up with string interpolation
2014-03-21 15:03:40 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9a44c3fd31
Some important information
2014-03-21 14:53:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
b288e53a89
Put 'parti' in blockquotes so highlight difference from 'political party'
2014-03-21 14:47:11 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d71e13977f
More grammar issues.... sigh
2014-03-21 14:40:13 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
e51c3502c1
some grammar fixes
2014-03-21 14:36:42 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
d84bee3c3e
Fix malay grammatical errors
2014-03-21 14:27:43 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
9ec615f58c
Correct some punctuations and add new translations
2014-03-21 14:25:35 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
3b18a3f24e
Errors in Daftar masuk
2014-03-21 13:24:09 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
ffde1595da
Some small details on accounts
2014-03-21 13:14:50 +08:00
Nick Winter
424390ae84
Moved antiscroll init; disabled it for now because of bugginess.
2014-03-20 22:00:34 -07:00
Karthig
f52dced0ce
- initial implementation of antiscroll, squashed
2014-03-20 21:39:03 -07:00
Nick Winter
89d720dc30
Uncommented multiplayer modal i18n section for Polish.
2014-03-20 21:29:03 -07:00
Nick Winter
0c6a22e26d
Merge pull request #631 from TigroTigro/patch-3
...
Update pl.coffee
2014-03-20 21:27:53 -07:00
Nick Winter
53f39e9cc7
Pointed locale at correct file.
2014-03-20 21:25:20 -07:00
Nick Winter
f55654130e
Merge branch 'master' of git://github.com/muhammadn/codecombat into muhammadn-master
2014-03-20 21:23:12 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
3047d5c696
Minor changes
2014-03-21 10:47:46 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6e32b79921
and to dan
2014-03-21 10:46:27 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
cf4f8dc9b7
Add some must-have information in translation
2014-03-21 10:45:11 +08:00
Nick Winter
bba85745f7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-20 19:18:49 -07:00
Nick Winter
9e4908ade2
A couple ladder tweaks.
2014-03-20 19:18:46 -07:00
Muhammad Nuzaihan Bin Kamal Luddin
282fd50b3c
Major additions to MS locale in Codecombat
2014-03-21 09:58:52 +08:00
Muhammad Nuzaihan Bin Kamal Luddin
6eccb459cf
Additions to Bahasa Malaysia
2014-03-21 09:28:39 +08:00
J Phani Mahesh
edc90c4598
Fix login popup being displayed under trailer. ( #596 )
2014-03-21 06:44:21 +05:30
Scott Erickson
29b51c470c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-20 17:03:19 -07:00
Scott Erickson
431d3054b6
Set up Facebook to work when working on localhost.
2014-03-20 17:02:25 -07:00
Nick Winter
ca1e3742c0
Added simulation counts.
2014-03-20 15:40:02 -07:00
Scott Erickson
6e9daf59c9
Merge remote-tracking branch 'origin/master'
2014-03-20 14:40:29 -07:00
Glen De Cauwsemaecker
18cf143bfb
Corrected some errors in the swedisch local. file
2014-03-20 23:03:19 +01:00
Scott Erickson
22555790b5
Set up a trimmed down leaderboard showing just top players and your rank.
2014-03-20 14:40:17 -07:00
TigroTigro
a8716000a4
Update pl.coffee
2014-03-20 22:16:26 +01:00
iamhj
d0be8b36b6
Update sv.coffee
...
Added Swedish text to all the places where there wasn't any.
2014-03-20 20:13:54 +01:00
Scott Erickson
dbbf9ce8b3
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
...
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
2014-03-20 11:22:23 -07:00
Nick Winter
2f3c0b0cc6
Need updated Aether.
2014-03-20 10:43:24 -07:00
Nick Winter
81a459dc02
Merged and fixed indentation to two spaces instead of three.
2014-03-20 08:25:12 -07:00
OlenaGapak
d43c05b558
Update uk.coffee
...
ukrainian localization. spelling fixes, new translation
2014-03-20 15:05:58 +02:00
Mikhail Koltsov
a6523719e4
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
...
Conflicts:
app/locale/ru.coffee
2014-03-20 09:07:11 +04:00
Nick Winter
1ce67710c5
Merged.
2014-03-19 19:26:17 -07:00
kvasnyk
802f0069b7
Polish language translations bug fixes.
2014-03-20 03:03:03 +01:00
Nick Winter
b7e8f2ecb5
Merge pull request #605 from kvasnyk/master
...
Fix for #272 bug.
2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6
Less useless ladder refresh requests.
2014-03-19 18:26:38 -07:00
Nick Winter
9713f7d142
Merge branch 'arrow' of git://github.com/ItsLastDay/codecombat into ItsLastDay-arrow
2014-03-19 18:01:49 -07:00
Nick Winter
097c6bc2cd
Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed.
2014-03-19 17:25:56 -07:00
Nick Winter
87f16f2550
Merge branch 'Shrihari-range-radii'
2014-03-19 17:17:05 -07:00
Nick Winter
fec8e34a78
Merged.
2014-03-19 17:16:48 -07:00
Scott Erickson
954a3ac4cb
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-19 17:11:53 -07:00
Glen De Cauwsemaecker
225fd6d355
Fixed a spelling mistake I made yesterday.
2014-03-20 02:02:40 +01:00
Glen De Cauwsemaecker
dfbba38dd3
Merge github.com:codecombat/codecombat
2014-03-20 01:55:12 +01:00
Scott Erickson
b6c9b6276c
Tweaked logging of sprite building.
2014-03-19 17:11:45 -07:00
Glen De Cauwsemaecker
71a13a5670
Adding missing translations for the Dutch local file
2014-03-20 00:33:50 +01:00
Nick Winter
b580203a7d
Merge pull request #618 from fusspawn/master
...
Added Function.Prototype.bind shim to world worker
2014-03-19 16:18:25 -07:00
Fusspawn
b10b9fcb4e
Added Function.Prototype.bind shim to world worker to enable running on headless browsers
2014-03-19 23:12:35 +00:00
Glen De Cauwsemaecker
e2a7c15776
Merge conflicts resolved from Ruben's branch
2014-03-20 00:05:41 +01:00
OverProgram
f6e5ceb1ef
More Updates fore he.coffee
...
Here is some more translate to hebrow.
2014-03-19 20:18:30 +02:00
Nick Winter
777420ebd8
Merge pull request #614 from M-r-A/patch-2
...
Update ru.coffee
2014-03-19 09:28:39 -07:00
Nick Winter
6a5c24cc69
Merge pull request #616 from OverProgram/patch-1
...
Update he.coffee
2014-03-19 09:28:12 -07:00
Nick Winter
9edd5e751d
Merge pull request #615 from MartinDelille/translation
...
first multiplayer translations
2014-03-19 09:26:29 -07:00
OverProgram
00d17c6d2f
Update he.coffee
2014-03-19 16:13:41 +02:00
Alexei Nikitin
5b2a219ca5
Update ru.coffee
2014-03-19 03:42:38 -07:00
Alexei Nikitin
4a119cd6b0
Update ru.coffee
2014-03-19 02:53:13 -07:00
Glen De Cauwsemaecker
c98ee7314a
Applied Vietnamese translations made by Nguyen Thi Thien An via email.
2014-03-19 03:24:16 +01:00
Glen De Cauwsemaecker
91ff1bd4c6
Translated glen_description in dutch (Nederlands).
2014-03-19 02:49:55 +01:00
Glen De Cauwsemaecker
a523d74b2d
Added the glen_description i18n tag to all languages.
2014-03-19 02:47:25 +01:00
Glen De Cauwsemaecker
a9fc1cb35a
Added a newline
2014-03-19 02:34:23 +01:00
Glen De Cauwsemaecker
9f391408e7
Merge branch 'translations' of github.com:iulianR/codecombat into iulianR-translations
2014-03-19 02:27:55 +01:00
Glen De Cauwsemaecker
eab52f45e5
Applied proofread of Julian.
2014-03-19 02:21:45 +01:00
Glen De Cauwsemaecker
f7777ef501
Merge branch 'patch-2' of github.com:feugy/codecombat
2014-03-19 02:16:54 +01:00
Glen De Cauwsemaecker
5dc89529ca
Described myself.
2014-03-19 02:10:58 +01:00
iulianR
8735ed20d4
Updated ro.coffee
2014-03-19 02:06:02 +02:00
iulianR
bfac03a73c
Rearranged play_view.cofee for consistency
2014-03-19 01:57:21 +02:00
Mikhail Koltsov
dfe5cd8f41
Polished ru.coffee a bit
2014-03-19 03:29:53 +04:00
Nick Winter
96bc752747
Merge pull request #603 from feugy/patch-1
...
Add some french translations
2014-03-18 15:55:11 -07:00
Mikhail Koltsov
c9a08a0b25
thang editor: added i18n binding to 'Save' button
2014-03-19 01:43:27 +04:00
Martin Delille
93ec4f94fc
first translation shot
2014-03-18 22:37:10 +01:00
Mikhail Koltsov
62a1701063
even better positioning
2014-03-19 01:26:41 +04:00
Mikhail Koltsov
1cc3e79db9
fixed thang editor appearance: components view was overlapping with tabs.
...
Now looks neat, but still unclickable.
2014-03-19 01:21:11 +04:00
Scott Erickson
74e068af0b
Fixed some bugs from the migration from _.cloneDeep to $.extend
2014-03-18 13:47:51 -07:00
Scott Erickson
a461a14d6e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-18 13:08:34 -07:00
Scott Erickson
37a9b7f319
Switching from the slow _.cloneDeep to the fast $.extend
2014-03-18 13:08:26 -07:00
Jayant Jain
80f53d2c6b
Adds search bar for adding thangs in level editor
2014-03-19 00:41:03 +05:30
Nick Winter
358d7fa181
Dont' need to load sessions, too.
2014-03-18 11:52:23 -07:00
Nick Winter
4355813d69
Don't throw away fully loaded supermodels in between simulations or refresh tabs when not looking at them.
2014-03-18 11:26:15 -07:00
Shrihari
ee76e41c78
Range radii - renamed few variales for clarity
2014-03-18 18:33:39 +05:30
Shrihari
8f5e8efce0
Range radii - Some cleanup
2014-03-18 18:22:26 +05:30
Shrihari
ea24ae2fd8
Range radii - Some cleanup
2014-03-18 18:13:38 +05:30
Shrihari
22af95e7b9
Added 4 fallback colors for extra ranges
2014-03-18 18:06:44 +05:30
Shrihari
b283757315
Refactored buildRadius() to work with any range radius
2014-03-18 17:39:16 +05:30
Ruben Vereecken
04465eb72c
Wrapped up locale files
2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c
Merged in old locale
2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333
Ladder i18n refactoring
2014-03-18 10:18:38 +01:00
kvasnyk
5216432bf9
Fix for #272 bug.
2014-03-18 05:47:53 +01:00
Dominik Kundel
084ef5563b
Merge remote-tracking branch 'upstream/master'
2014-03-18 01:10:43 +01:00
Damien
65f148974c
Add to french diplomats list
2014-03-17 23:39:36 +01:00
Damien
71d248afef
Add some french translations
2014-03-17 23:38:41 +01:00
Nick Winter
a58faa1acd
Merged.
2014-03-17 14:07:37 -07:00
Nick Winter
2dd762a0d7
Merge pull request #600 from M-r-A/patch-2
...
Update ru.coffee
2014-03-17 14:01:48 -07:00
Nick Winter
2098bef39e
Fixed quoting problem.
2014-03-17 13:58:40 -07:00
Nick Winter
21ca74d76f
Merge branch 'patch-koreanlocale' of git://github.com/walkingtospace/codecombat into walkingtospace-patch-koreanlocale
2014-03-17 13:58:11 -07:00
Mikhail Koltsov
97f9e548e2
added perspectivizion for arrows (issue #46 )
2014-03-18 00:40:37 +04:00
Björn Kimminich
4ea7d0e9b2
Update de.coffee
2014-03-17 21:36:53 +01:00
Björn Kimminich
b0a361abb2
Update de.coffee
2014-03-17 20:32:57 +01:00
Alexei Nikitin
4860e2e7a1
Update ru.coffee
2014-03-17 12:00:28 -07:00
fist0512
9d75fa5588
Added korean locale and modified unnatural translation
2014-03-18 03:49:15 +09:00
armaldio
2eb84252f3
Update fr.coffee
2014-03-17 19:47:44 +01:00
Dominik Kundel
c55b608886
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/templates/play/level/modal/editor_config.jade
2014-03-17 19:39:38 +01:00
Nick Winter
bf323d59f2
Merge pull request #594 from ahmed80dz/patch-1
...
Update ar.coffee
2014-03-17 11:09:17 -07:00
Cassio Cardoso
970d5e46a2
Update pt-BR.coffee
...
Add multiplayer translation
2014-03-17 14:47:22 -03:00
ounis ahmed
aab91057f2
Update ar.coffee
2014-03-17 10:12:24 -07:00
BonnieBBS
9a9480ea83
Update zh-HANS.coffee
...
Some words about "Ambassador" have been translated. :D
2014-03-18 00:18:09 +08:00
Nick Winter
5fef126672
Merge pull request #592 from ImmortalJoker/patch-2
...
Update ru.coffee
2014-03-17 08:51:18 -07:00
Nick Winter
794b1472f6
Merge pull request #587 from cassiocardoso/patch-1
...
Update diplomat.jade
2014-03-17 08:50:45 -07:00
Nick Winter
df2c1b443e
Merge pull request #589 from yangxuan8282/patch-2
...
Update diplomat.jade
2014-03-17 08:49:30 -07:00
Nick Winter
98025f1ae2
Merge pull request #588 from yangxuan8282/patch-1
...
Update zh-HANS.coffee
2014-03-17 08:49:21 -07:00
Nick Winter
763f08a05e
Merge pull request #590 from ImmortalJoker/patch-1
...
Update uk.coffee
2014-03-17 08:49:09 -07:00
Krasnov Ehor
c9d916fb7a
Update ru.coffee
2014-03-17 17:49:07 +02:00
Krasnov Ehor
172ad1d17a
Update uk.coffee
2014-03-17 17:40:51 +02:00
BonnieBBS
abf90cf8f5
Update zh.coffee
...
Translated some of the words. :D
2014-03-17 23:38:13 +08:00
yangxuan8282
4b2bcc283f
Update diplomat.jade
...
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
2014-03-17 23:32:20 +08:00
yangxuan8282
43ecfec28f
Update zh-HANS.coffee
...
a little change,make grammar more idiomatic
2014-03-17 23:27:38 +08:00
Cassio Cardoso
2917255193
Update diplomat.jade
...
Add my username in brazilian portuguese diplomats list.
2014-03-17 11:51:55 -03:00
Scott Erickson
87b225b061
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-17 07:34:02 -07:00
Scott Erickson
564d267463
Removed a TODO.
2014-03-17 07:33:53 -07:00
Aditya Raisinghani
b5bef94eb3
Fixed issue with video on multiplayer page modal
2014-03-17 19:52:03 +05:30
Randi Katrine Hillerøe
5cecbeea40
Update diplomat.jade
...
Added my name to the contributors list.
2014-03-17 13:59:48 +01:00
Randi Katrine Hillerøe
a936964434
Update da.coffee
...
Added a few of the missing translations.
2014-03-17 13:55:58 +01:00
Nick Winter
6c2a78c060
Show videos in HD if possible. Use ready state on level loader.
2014-03-17 05:52:19 -07:00
Nick Winter
3d56cc4393
Merge pull request #584 from batista/patch-1
...
Update pt-PT.coffee for multiplayer
2014-03-17 05:26:57 -07:00
Sérgio Batista
641fa482d8
Update pt-PT.coffee for multiplayer
2014-03-17 13:13:45 +01:00
bbeasmile
03f309a441
Update hu.coffee
2014-03-17 13:01:17 +01:00
Nick Winter
36a90de7f9
Last bits of #546 .
2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50
Merged.
2014-03-17 04:37:54 -07:00
pouyio
f5e3e717f1
Update diplomat.jade
...
added a spanish translator
2014-03-17 12:33:35 +01:00
Nick Winter
fe56e82348
Merge pull request #581 from pouyio/patch-1
...
Update es.coffee
2014-03-17 04:31:24 -07:00
Nick Winter
833c310a91
Merge pull request #579 from ItsLastDay/popover
...
Fix for issue #496
2014-03-17 04:30:57 -07:00
pouyio
9092a7961d
Update es.coffee
2014-03-17 12:30:34 +01:00
Maximilian Bachhuber
5903dc1ae2
Update de.coffee
2014-03-17 12:27:46 +01:00
Nick Winter
287bf0398e
Embedded new video in multiplayer launch modal.
2014-03-17 03:18:13 -07:00
Mikhail Koltsov
df3739517d
fixed issue #496
2014-03-17 12:28:49 +04:00
Scott Erickson
db4ae0cd2d
Made some tips show up more rarely.
2014-03-17 00:12:11 -07:00
Scott Erickson
7555dce172
Tweaked the loading page progress bar.
2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f
More tweaks to the video.
2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0
Added a border to the home view video.
2014-03-16 22:46:57 -07:00
Nick Winter
65c53a9e43
Check anonymous for clicking link.
2014-03-16 22:17:56 -07:00
Scott Erickson
5ddd2b9109
Added a few more tips.
2014-03-16 22:11:21 -07:00
Scott Erickson
8eed311aea
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 22:01:41 -07:00
Scott Erickson
dc4252a94d
Moved the tips into the level loader screen and gave them i18n.
2014-03-16 22:01:21 -07:00
Nick Winter
566c9e6c9d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:48:37 -07:00
Nick Winter
b51f51f636
Fix for no Camera for creating Marks in the Thang Editor.
2014-03-16 21:48:28 -07:00
Scott Erickson
5a8d1b0a2b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:43:21 -07:00
Scott Erickson
de34896a9a
Playback is now disabled during casting. Also cleaned out some remaining hover logic.
2014-03-16 21:43:14 -07:00
Nick Winter
af57e88a1a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:33:50 -07:00
Nick Winter
f02f4e77d0
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
2014-03-16 21:33:46 -07:00
Scott Erickson
661c60ec50
Merge branch 'adi2412-simulator-teardown'
2014-03-16 21:14:56 -07:00
Scott Erickson
e88c79681d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 21:04:44 -07:00
Scott Erickson
c663bd74cf
Tweaks to the scrubber. Sliding it around no longer changes its play state; it only pauses playback if you click.
2014-03-16 21:04:36 -07:00
Nick Winter
3dd47ec98e
Propagated new multiplayer_launch i18n.
2014-03-16 20:56:48 -07:00
Nick Winter
fc93ede891
Merged some merging in the locales.
2014-03-16 20:54:34 -07:00
Nick Winter
cfab3061f5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 20:52:29 -07:00
Nick Winter
680c12707a
Merge pull request #567 from 2xG/patch-1
...
Update es-419.coffee
2014-03-16 20:51:58 -07:00
Nick Winter
f3a76da47c
Added i18n for multiplayer launch modal.
2014-03-16 20:50:49 -07:00
Nick Winter
ffb9ec2908
Merged.
2014-03-16 20:36:18 -07:00
Scott Erickson
17af4cec0c
Slight tweak.
2014-03-16 20:36:02 -07:00
Scott Erickson
dc32add6cb
Merge branch 'simulator-teardown' of https://github.com/adi2412/codecombat into adi2412-simulator-teardown
2014-03-16 20:34:03 -07:00
Nick Winter
9a64fb5dac
Work on /multiplayer modal.
2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
2014-03-16 20:28:02 -07:00
Scott Erickson
a3df986567
Added a tween for size changes.
2014-03-16 19:27:48 -07:00
honam bang
41d26f5709
Refactoring ModalView Templates
2014-03-17 11:00:25 +09:00
Scott Erickson
957fdd22e6
Tweaked the rank button to be much larger in the my matches tab.
2014-03-16 18:48:56 -07:00
Dominik Kundel
6a983dcb8c
changed name of event triggered when config is changed and introduced new event when language is changed
2014-03-17 02:14:04 +01:00
Scott Erickson
5cb42fa92c
Tweaked the video on the home page.
2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22
Removed the new button from the home view.
2014-03-16 17:48:16 -07:00
Darredevil
123de3a997
Update ro.coffee
2014-03-17 02:44:29 +02:00
Scott Erickson
e430a6c2de
Added multiplayer launch view.
2014-03-16 17:33:57 -07:00
Scott Erickson
3fa0124d7e
Removed wizard loading code from home view, for now anyway.
2014-03-16 17:21:17 -07:00
Scott Erickson
dd8ea18186
Merge remote-tracking branch 'origin/master'
2014-03-16 17:13:18 -07:00
Scott Erickson
f23e3285cd
Fixed a bug.
2014-03-16 17:12:55 -07:00
Nick Winter
b550708113
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967
Brawlwood protectAPI on!
2014-03-16 17:07:10 -07:00
Scott Erickson
209a1a3563
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 17:00:12 -07:00
Scott Erickson
eee8fbba2c
New level page with new artwork.
2014-03-16 16:59:48 -07:00
Nick Winter
1f1802dc38
A couple tweaks for #577 .
2014-03-16 16:04:17 -07:00
Nick Winter
753952e519
Merge pull request #577 from IngridMorstrad/templates
...
Templates
2014-03-16 16:00:24 -07:00
IngridMorstrad
dadf0dab86
refactored docs and reload
2014-03-17 02:57:15 +05:30
Nick Winter
aa4f1baf73
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
2014-03-16 13:23:01 -07:00
IngridMorstrad
57f24932fb
Removed redundant code for close button
2014-03-17 01:10:55 +05:30
IngridMorstrad
52115876bb
Refactored docs.jade to use the base template
2014-03-17 01:03:27 +05:30
honam bang
29a88ee128
Merge remote-tracking branch 'codecombat/master'
2014-03-17 02:20:44 +09:00
Nick Winter
125ffa9f43
Merged
2014-03-16 10:06:47 -07:00
honam bang
3940ba23b8
Merge branch 'master' of https://github.com/walkingtospace/codecombat
2014-03-17 01:47:16 +09:00
honam bang
34be8917cb
Fixes #546
2014-03-17 01:41:19 +09:00
Nick Winter
28b049d8a4
Adjusted some i19n commenting.
2014-03-16 09:10:17 -07:00
Nick Winter
f266db7aaa
Merge pull request #573 from AlessioPaternoster/master
...
#01 Updated Italian Local
2014-03-16 09:08:40 -07:00
IngridMorstrad
8d9a8aaf73
Change victory.jade to use the base template
2014-03-16 21:16:00 +05:30
honam bang
b42bf45ddb
Added korean locale
2014-03-16 23:40:10 +09:00
Alessio Paternoster
dd2a55928e
Updated Italian Local
2014-03-16 13:53:57 +01:00
Aditya Raisinghani
226ae29caf
Added CocoClass as superclass to Simulator and updated destroy method.
2014-03-16 13:37:17 +05:30
2xG
6efe87982c
Update es-419.coffee
...
small fix2
2014-03-16 01:10:29 -05:00
2xG
9107937f75
Update es-419.coffee
...
small fix
2014-03-16 01:09:31 -05:00
2xG
3765ffa87d
Update es-419.coffee
...
Few translated strings
2014-03-15 22:10:11 -05:00
Nick Winter
2e2c9459d8
Even better-looking loading background.
2014-03-15 16:06:35 -07:00
Nick Winter
4e14ff3b11
Merge pull request #565 from jayant1992/master
...
Bugfix for play, usability improvement for editor.
2014-03-15 15:32:17 -07:00
Nick Winter
38bfe222a0
Merge pull request #564 from Shrihari/range-radii
...
Added radii marks for voiceRange, visualRange and attackRange
2014-03-15 15:31:12 -07:00
Dominik Kundel
ce6533de59
changing ace edit mode based on setting
2014-03-15 23:14:57 +01:00
George Saines
417ff1e48d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 15:12:09 -07:00
Jayant Jain
93bb2d0893
Restricts wizard to level bounds when moving around
2014-03-16 03:11:55 +05:30
Jayant Jain
91515b1cea
Clicking a thang in the left list automatically pans to the sprite on the editor map
2014-03-16 03:11:40 +05:30
Shrihari
005a91cec2
Moved createMarks() to setupSprite() to optimize loading
2014-03-16 02:48:19 +05:30
Dominik Kundel
46133ab85d
added select statement for programming language
2014-03-15 22:00:29 +01:00
Shrihari
d186ae0a15
Added radii marks for voiceRange, visualRange and attackRange
2014-03-16 02:02:17 +05:30
TigroTigro
19d3f4af76
Update pl.coffee
...
Translated one tag which I earlier missed, edited the more_about_X tags to make them shorter and solve the unneeded line splitting which occured where they were displayed.
2014-03-15 21:29:44 +01:00
TigroTigro
30fb039675
Update pl.coffee
...
Translated new tags
2014-03-15 20:35:18 +01:00
Nick Winter
b210423419
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 12:31:43 -07:00
Nick Winter
ca75cc4a1a
Fixed #405 with a sledgehammer--just loading all Components before loading level editor.
2014-03-15 12:31:39 -07:00
Michael Schmatz
efba8a0654
Fixed control bar leaderboard button for #429
2014-03-15 11:34:59 -07:00
Nick Winter
e97bff6a3c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 11:34:53 -07:00
Nick Winter
4b9c7a3784
Fixed bug with sprites being offset incorrectly when starting with an action not in their ThangType.
2014-03-15 11:31:12 -07:00
Michael Schmatz
6dcbaddbbd
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
app/views/play/spectate_view.coffee
2014-03-15 09:20:44 -07:00
Michael Schmatz
2c6e667bb7
Added API for queue messages count
2014-03-15 09:20:13 -07:00
honam bang
e63e787a30
Removed spaces for coding convention
2014-03-15 08:30:47 -07:00
bang honam
70f3ca8f8e
Added a line for coding convention
2014-03-15 08:30:37 -07:00
Nick Winter
7b1f8d1114
Merge pull request #547 from jayant1992/master
...
Improved panning and zooming for editor
2014-03-15 08:05:02 -07:00
Nick Winter
95cd3782a1
Oops, don't keep sending ladder updates just to me.
2014-03-15 07:45:44 -07:00
Nick Winter
8276dbf2d1
Merge branch 'loading-view'
2014-03-14 19:44:33 -07:00
Nick Winter
b2efb1bba5
More work on the loading view.
2014-03-14 19:44:19 -07:00
Nick Winter
fc7d403785
Fixed two bugs with destroying sprites.
2014-03-14 17:15:07 -07:00
Nick Winter
efd0d82dea
Working on new loading view design.
2014-03-14 17:06:08 -07:00
Michael Schmatz
357b73be93
Fixed bug in next game button, fixed wizard positions
2014-03-14 16:14:35 -07:00
George Saines
c00c7ed56b
adding the new website background images
2014-03-14 15:24:36 -07:00
Michael Schmatz
075ea23be9
Fixed random sessions fetching
2014-03-14 12:54:54 -07:00
Scott Erickson
39ed6c3a43
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-14 11:58:42 -07:00
Scott Erickson
af8008596a
Made editing thangs in the level editor not so slow by avoiding calling level.serialize.
2014-03-14 11:58:29 -07:00
Michael Schmatz
71aa6cc2c6
Added random session pair choosing
...
Due to a bug I cannot test this immediately
2014-03-14 11:30:06 -07:00
Jayant Jain
ece932595c
Enables drag-panning for editor and region chooser
2014-03-14 23:57:00 +05:30
Jayant Jain
d8418f7bb2
Fixes issue where panning occurs upon mouse scroll at max/min zoom
2014-03-14 23:57:00 +05:30
Nick Winter
c0e966a08c
Propagated new editor i18n tags.
2014-03-14 10:24:07 -07:00
Nick Winter
5c76ca71e3
Added configuring of behaviors to the editor config.
2014-03-14 10:14:48 -07:00
Nick Winter
3c0b496033
Fix for if aceConfig doesn't exist yet.
2014-03-14 07:46:36 -07:00
Nick Winter
c28d2bb576
Merge pull request #545 from dkundel/master
...
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794
removed unnecessary comment
2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc
including i18n support for new editor config and minor styling changes
2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
2014-03-13 19:20:22 -07:00
Dominik Kundel
7e955c72b8
apply config to editor
2014-03-14 02:49:58 +01:00
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07:00
Dominik Kundel
8a5aeb6227
save editor config to database
2014-03-14 02:09:11 +01:00
Nick Winter
42a8862fa9
Merge pull request #541 from dkundel/master
...
Easy use of coordinates as discussed in #10 and minor fixes
2014-03-13 18:05:04 -07:00
Darredevil
88659aa191
Update ro.coffee
...
Check line 234
Also need alternative for the word "ladder" in this context, there is translation that makes sense(will try to see how other games translate it and come back)
2014-03-14 03:00:32 +02:00
Nick Winter
8b572f0647
Using isThang instead of instanceof Thang.
2014-03-13 17:59:17 -07:00
Dominik Kundel
6f2a04c5c0
added new editor config modal
2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32
added button to access new modal for editor config
2014-03-14 00:53:29 +01:00
Dominik Kundel
4cbdc3cb4b
highlight lines after insertion
2014-03-14 00:52:18 +01:00
Nick Winter
8ccd12866e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:46:53 -07:00
Scott Erickson
8431fd1e57
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:45:41 -07:00
Scott Erickson
abd50b9495
Fixed the new build queue system for levels where there are multiple builders for a single thang type.
2014-03-13 15:45:24 -07:00
Nick Winter
8554de7c4b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-13 15:35:31 -07:00
Nick Winter
e2d2e96cf5
Fixed several bugs with Thang selection and the SpellView and HUD.
2014-03-13 15:35:28 -07:00
Michael Schmatz
3262ad81f2
Merge branch 'master' of github.com:codecombat/codecombat
...
Conflicts:
app/views/play/spectate_view.coffee
2014-03-13 15:24:04 -07:00
Michael Schmatz
7aa506e58c
Various changes to spectate view
2014-03-13 15:22:35 -07:00
Scott Erickson
b2e9768127
Set up a build queue for async sprite sheet building, which lessens blocking the main thread.
2014-03-13 13:25:03 -07:00
Scott Erickson
c238b49f52
Fixed initial wizard position.
2014-03-13 11:07:08 -07:00
Nick Winter
485b179f5d
Added Opponent i18n placeholder to other locales, and restored some new placeholders to pl.coffee.
2014-03-13 10:33:20 -07:00
Nick Winter
2b41efe466
Resolved some merge conflicts.
2014-03-13 10:32:18 -07:00
Nick Winter
9d8b8e7395
Probably too mean to tell users that their password is wrong three times, so just once will do.
2014-03-13 10:27:32 -07:00
TigroTigro
206af3184d
Update diplomat.jade
2014-03-13 18:01:52 +01:00
Björn Kimminich
055241c994
Update de.coffee
2014-03-13 17:57:27 +01:00
TigroTigro
94e7e6185b
Update pl.coffee
2014-03-13 17:04:22 +01:00
TigroTigro
13fce18d5f
Update pl.coffee
2014-03-13 17:03:07 +01:00
Nick Winter
c8103154a9
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
2014-03-13 09:02:19 -07:00
Nick Winter
2d848b4cce
Merged some conflicts.
2014-03-13 08:39:53 -07:00
Nick Winter
4ad0fba860
Merge pull request #537 from jayant1992/master
...
UI and UX improvements to editor
2014-03-13 07:07:13 -07:00