Glen De Cauwsemaecker
|
724592601c
|
Merge branch 'master' of github.com:JasperDhaene/codecombat
|
2014-03-24 00:45:09 +01:00 |
|
Glen De Cauwsemaecker
|
131b963bfb
|
Merge github.com:codecombat/codecombat
|
2014-03-24 00:44:46 +01:00 |
|
Nick Winter
|
e9238daab6
|
Merge branch 'master' into production
|
2014-03-23 15:35:21 -07:00 |
|
Nick Winter
|
b922b9dd20
|
Increased number of matches played.
|
2014-03-23 15:34:38 -07: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 |
|
Glen De Cauwsemaecker
|
4c62dfaff1
|
Language selection added, with a bug in it yet
|
2014-03-23 17:32:54 +01: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 |
|
Glen De Cauwsemaecker
|
cea0f4c263
|
license agreement added to the setup.
|
2014-03-23 03:05:16 +01:00 |
|
Glen De Cauwsemaecker
|
6ae8464e6d
|
Made the get_var system easier and cleaner to use
|
2014-03-23 02:33:03 +01:00 |
|
Glen De Cauwsemaecker
|
a9a6f0242b
|
Introduction implemented and fixed errors in previously submitted code.
|
2014-03-23 01:41:53 +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 |
|
Scott Erickson
|
ad600fe459
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-22 10:13:01 -07:00 |
|
Scott Erickson
|
004bcb8b97
|
Added the new WebGL enhanced classes for EaselJS.
|
2014-03-22 10:12:47 -07:00 |
|
Scott Erickson
|
1224fa8d91
|
Reverted soundjs, because the latest version is different/buggy.
|
2014-03-22 10:12:02 -07:00 |
|
Mikhail Koltsov
|
baf8adcc74
|
added nothing
|
2014-03-22 20:50:50 +04:00 |
|
Nick Winter
|
bc063bde0e
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-22 09:48:40 -07:00 |
|
Nick Winter
|
29e7b8e5c1
|
Fixed mail to correctly capture the matches.
|
2014-03-22 09:48:36 -07:00 |
|
Scott Erickson
|
3d308f03dc
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-03-22 09:40:34 -07:00 |
|
Scott Erickson
|
643140fc98
|
Updated createjs.
|
2014-03-22 09:40:23 -07:00 |
|
Michael Schmatz
|
d0232a36d9
|
Added resimulateSession method
|
2014-03-22 09:19:21 -07:00 |
|
Michael Schmatz
|
13a74ba560
|
Added resimulateAllSessions route
|
2014-03-22 09:17:14 -07:00 |
|