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
Cody Bond
31b2682548
Merge pull request #2 from codecombat/master
...
Added more names for #53
2014-03-22 01:57:30 -04:00
therealbond
b2c500369b
Added more names for #53
2014-03-22 01:56:32 -04:00
Nick Winter
3e87d54663
I guess we don't edit simulate counts on the client.
2014-03-21 21:14:48 -07: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
Nick Winter
491c40758c
Merge pull request #646 from dpen2000/patch-1
...
Update cla.jade
2014-03-21 15:04:54 -07:00
dpen2000
6363c40fe2
Update cla.jade
...
p -> a. Using html syntax to avoid linking full stop.
2014-03-21 21:59:31 +00:00
Nick Winter
5a2b5667cf
Merge pull request #640 from batista/patch-1
...
Update pt-PT.coffee
2014-03-21 08:44:20 -07: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
Glen De Cauwsemaecker
2ed31733e9
Merge pull request #639 from iamhj/patch-2
...
Update sv.coffee
2014-03-21 14:02:02 +01: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
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
