codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-12 00:31:21 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2754 commits 27 branches 0 tags 134 MiB
Commit graph

2754 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
9a70abb104 Don't need to explicitly skip Mobile Artillery's next level now. 2014-04-03 16:37:24 -07:00
Glen De Cauwsemaecker
ed12b644ca More refactoring. localisation works almost again, and fixed some caused by previous refactoring. 2014-04-04 01:27:15 +02:00
Nick Winter
255cef83fb Fixed #738. 2014-04-03 16:16:53 -07:00
Darredevil
df3b51e5bd Update ro.coffee 2014-04-04 02:15:50 +03:00
Nick Winter
62f91d14b0 Merged. 2014-04-03 16:06:32 -07:00
Nick Winter
0ad4cc7c04 Merge branch 'patch-1' of git://github.com/Vindurrin/codecombat into Vindurrin-patch-1 2014-04-03 16:05:27 -07:00
Glen De Cauwsemaecker
6f2cfbf1e8 config system has been refactored and now works with powershell 2014-04-04 00:37:59 +02:00
Michael Schmatz
a89fe7d71b Merge pull request #780 from codecombat/master 
Merge master into production
 2014-04-03 15:20:07 -07:00
Michael Schmatz
9bb109dd7d First iteration of mobile styling! 2014-04-03 15:10:24 -07:00
Vindurrin
d58c70b456 Update es-ES.coffee 2014-04-03 16:11:09 -04:00
Digot
eca934d6a5 Update de.coffee 2014-04-03 21:58:12 +02:00
Aditya Raisinghani
1c3117836f Shifted nanoscroller to vendor. 2014-04-04 00:13:09 +05:30
Michael Schmatz
c434325ec0 Fixed line endings and locale error 2014-04-03 10:53:29 -07:00
Michael Schmatz
75b278b333 Fixed table overflow, added wrapper for histogram 2014-04-03 09:57:35 -07:00
Glen De Cauwsemaecker
12cf298467 Merge conflicts master 2014-04-03 17:42:08 +02:00
Glen De Cauwsemaecker
a2ac89094a Merge conflicts: ms.coffee 2014-04-03 17:38:46 +02:00
Michael Schmatz
3aa31c7246 Graphs with D3! 2014-04-02 18:41:11 -07:00
Glen De Cauwsemaecker
7690210eff progress 2014-04-03 02:17:28 +02:00
Nick Winter
943bcf3162 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-02 15:09:45 -07:00
Nick Winter
52de546727 Merged. 2014-04-02 15:09:40 -07:00
Michael Schmatz
f59cb9a743 Removed giant commented code section 2014-04-02 15:02:06 -07:00
Michael Schmatz
33e14ac406 Refactored simulator, removed duplication bug 
This merge is going to be terrible
 2014-04-02 15:00:45 -07:00
Nick Winter
6a51bd6837 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-02 14:43:09 -07:00
Nick Winter
670f94cc22 Fixed #418, no more print/save dialogues evaaarr. 2014-04-02 14:42:34 -07:00
Aditya Raisinghani
44979c074d Integrated nanoscroller. 2014-04-03 03:10:06 +05:30
Scott Erickson
0a78368217 Refactored user authentication again. Now the user object is inserted into main.html, which was renamed from index.html so the express static middleware wouldn't serve it. 2014-04-02 13:12:24 -07:00
Inez KEMENES
70d42b6eae Update hu.coffee 2014-04-02 16:00:15 +02:00
Inez KEMENES
9acde85c8c Update hu.coffee 2014-04-02 15:24:26 +02:00
Nick Winter
e65811fc2c Merge branch 'master' into production 2014-04-01 23:17:00 -07:00
Nick Winter
ddf0636e7e Revert logic for deleting model properties that interfered with signup. 2014-04-01 23:16:50 -07:00
Glen De Cauwsemaecker
381f4e906e More updates. 2014-04-02 04:52:41 +02:00
Glen De Cauwsemaecker
8926429987 Refactoring code to use powershell instead of the C++ utilities. In order to remove the VS2010dll dependancy 2014-04-02 04:31:20 +02:00
Nick Winter
71dadda177 Merge branch 'master' into production 2014-04-01 17:04:23 -07:00
Nick Winter
9e947ce7ab Fix for c94a7e for #356 2014-04-01 13:31:59 -07:00
Nick Winter
626a689553 Raised search fetch limit to head off exploding ThangType list. #377 2014-04-01 13:20:15 -07:00
Nick Winter
ae9769e3ce Added read only notification in editors. Fixed #374. 2014-04-01 13:15:30 -07:00
Nick Winter
c94a73e066 Fixed #356. 2014-04-01 12:13:11 -07:00
Nick Winter
ba3c4af536 Fixed last piece of #673. 2014-04-01 10:51:03 -07:00
Nick Winter
7807fdbbc6 Merged pt-PT locale conflicts. 2014-04-01 10:41:40 -07:00
Nick Winter
99c4704e1f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-01 10:31:42 -07:00
Nick Winter
bfa71d01ff Merged. 2014-04-01 10:31:22 -07:00
Nick Winter
477545d50d Merge pull request #763 from OlenaGapak/patch-1 
Update uk.coffee
 2014-04-01 10:26:55 -07:00
Nick Winter
b5f69687cf Fixed #488. 2014-04-01 10:23:39 -07:00
Nick Winter
b316a3e078 Merge branch 'dev/Warn_when_a_depended-on_System_is_missing' of git://github.com/gintau/codecombat into gintau-dev/Warn_when_a_depended-on_System_is_missing 2014-04-01 09:44:06 -07:00
Nick Winter
785cb342a2 Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master 2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408 added two programming quotes 2014-04-01 17:16:35 +02:00
swapnesh
497563bc0a Added more names for #53 2014-04-01 17:50:33 +05:30
OlenaGapak
1799310261 Update uk.coffee 
ukrainian localization
 2014-04-01 14:59:46 +03:00
Glen De Cauwsemaecker
3bd2a064c4 Merge pull request #761 from JasperDhaene/master 
updated dutch locale
 2014-04-01 10:13:31 +02:00
jaudhaen
be9edb74af updated dutch locale 2014-04-01 09:26:42 +02:00