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
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
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
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
