Dominik Maier
|
f66e210c73
|
regarding codecombat/codecombat#655 debounce debounces.
|
2014-03-24 01:18:36 +01:00 |
|
Dominik Maier
|
dcbd55a864
|
regarding codecombat/codecombat#655 -> adds asynchronous name checking that actually works.
|
2014-03-24 00:47:41 +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 |
|
Dominik Maier
|
459a1f9e48
|
fixes codecombat/codecombat#655
|
2014-03-23 18:41:15 +01: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 |
|
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 |
|
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 |
|
Michael Schmatz
|
5141873725
|
Added resimulateAllSessions method
|
2014-03-22 09:07:01 -07:00 |
|
Michael Schmatz
|
9e535e19c6
|
Added resimulateAllSessions route
|
2014-03-22 09:05:53 -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 |
|
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 |
|
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 |
|