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 |
|
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 |
|
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 |
|
Glen De Cauwsemaecker
|
3f72db08aa
|
Merge github.com:codecombat/codecombat
|
2014-03-21 03:27:02 +01:00 |
|
Glen De Cauwsemaecker
|
4d09844de8
|
new variable system implemented and refactored a lot of files already.
|
2014-03-21 03:26:26 +01: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 |
|
Michael Schmatz
|
e56748d2f6
|
Tweaking scoring queue algorithms
|
2014-03-20 18:51:11 -07:00 |
|
Muhammad Nuzaihan Bin Kamal Luddin
|
6eccb459cf
|
Additions to Bahasa Malaysia
|
2014-03-21 09:28:39 +08:00 |
|
Nick Winter
|
d9230324ca
|
Merge pull request #634 from phanimahesh/fix/login-popup-under-video
Fix login popup being displayed under trailer. (#596)
|
2014-03-20 18:24:07 -07: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
|
f7e1b338a6
|
Removed a line for debugging the ladder friends fetching handler.
|
2014-03-20 17:03:06 -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 |
|
Glen De Cauwsemaecker
|
18cf143bfb
|
Corrected some errors in the swedisch local. file
|
2014-03-20 23:03:19 +01:00 |
|
Scott Erickson
|
6e9daf59c9
|
Merge remote-tracking branch 'origin/master'
|
2014-03-20 14:40:29 -07: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 |
|
Michael Schmatz
|
4d617d44f6
|
Fixed queue
|
2014-03-20 11:31:26 -07: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 |
|
Michael Schmatz
|
64aa6c95fd
|
Changed timeouts and initial session visibility time
|
2014-03-20 08:47:40 -07:00 |
|
Michael Schmatz
|
9e8a31f2df
|
Removed sort by scheduled visibility time
|
2014-03-20 08:44:41 -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 |
|
Scott Erickson
|
034a18c960
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-19 19:43:55 -07:00 |
|
Scott Erickson
|
5f45c5cf27
|
Added a handler for looking up friends on a leaderboard.
|
2014-03-19 19:42:42 -07: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
|
6bcf263d90
|
Merge branch 'production'
|
2014-03-19 17:26:24 -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 |
|