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

12485 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nick Winter
389323953b Fixed #180. 2014-03-31 13:56:13 -07:00
Nick Winter
3555a697cc Merge pull request #752 from M-r-A/patch-1 
Missing l10n
 2014-03-31 13:37:41 -07:00
Alexei Nikitin
4c3e8671a3 Update ru.coffee 2014-03-31 13:33:22 -07:00
Alexei Nikitin
9e1e59bb3f Update en.coffee 2014-03-31 13:32:11 -07:00
Nick Winter
d8a194f895 Actually using loading screen template. 2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6 Re-added a minor fix that got lost. 2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331 Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master 2014-03-31 12:42:53 -07:00
Dominik Kundel
62b6387090 updated aether dependency to support coffeescript 2014-03-31 20:53:28 +02:00
Dominik Kundel
725a8bc2d9 updated locales 2014-03-31 20:48:07 +02:00
Dominik Kundel
1c6aea9c1c Merge remote-tracking branch 'upstream/master' 2014-03-31 20:35:32 +02:00
Alexei Nikitin
1719358856 Update ru.coffee 2014-03-31 11:32:01 -07:00
Alexei Nikitin
aeddb64f90 Update base.jade 2014-03-31 11:09:44 -07:00
tmrdja
dfe6bce351 Added contextmenu 
Added contextmenu
 2014-03-31 18:33:14 +02:00
Bia41
167ee90a70 #673 Replaced .once with @listenToOnce 
Replaced .once with @listenToOnce on CocoModel, as requested on Issue #673
 2014-03-31 05:02:13 +01:00
Nick Winter
01bc34d3ef Merge branch 'master' into production 2014-03-30 17:25:11 -07:00
Nick Winter
cb27124285 Fixed #135. 2014-03-30 17:24:07 -07:00
Nick Winter
8df80ad1bc Merged AKeeper's ru.coffee additions, taking into account M-r-A's suggestions. 2014-03-30 13:33:21 -07:00
Nick Winter
b0a4a97ff1 Merged 2014-03-30 12:54:48 -07:00
Bia
53c20d3b9d Added Thang names 2014-03-30 20:43:48 +01:00
Nick Winter
b2420a738f Merge branch 'master' into production 2014-03-30 11:00:56 -07:00
tmrdja
f8de6162d1 Added contextmenu 
Added contextmenu with Delete and Duplicate button
 2014-03-30 19:38:54 +02:00
tmrdja
470a79e6b0 Added contextmenu 2014-03-30 19:33:21 +02:00
Nick Winter
6bff295d2e Linking up Prabh's Coin Mania level. 2014-03-29 18:04:29 -07:00
Nick Winter
1b92654a44 Merged. 2014-03-29 17:45:01 -07:00
Nick Winter
54f4e8d1e9 Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor 2014-03-29 17:38:14 -07:00
Nick Winter
a610f66cbe Merge pull request #733 from smasher816/master 
Installer Changes
 2014-03-29 17:32:20 -07:00
Nick Winter
a79fe37ca1 Merged; made a couple tweaks. 2014-03-29 17:30:12 -07:00
Alexei Nikitin
ee5ee4bc88 Update ru.coffee 2014-03-29 17:28:44 -07:00
Nick Winter
05acfcfb1b Merge branch 'master' of git://github.com/domenukk/codecombat into domenukk-master 2014-03-29 17:06:44 -07:00
Rowan Decker
cad1448b9f Add Help Message 
Not everyone runs Ubuntu/Debian and is using apt-get, so add a friendly reminder to check with your distro's documentation for help.
 2014-03-29 18:59:10 -05:00
Dominik Maier
78c18b03b6 Merged new tips 2014-03-30 00:48:31 +01:00
Rowan Decker
8f3f9f8516 Update Completion Message 
Adds a link to the "MongoDB database import" section of the wiki, as this step must be completed before they can play any levels.

Also adds some whitespace :)
 2014-03-29 18:45:53 -05:00
Dominik Maier
fb607d06fa Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670 2014-03-30 00:38:45 +01:00
Rowan Decker
f88b7142e4 Fix Mac Download 
I had a copy-paste error when changing the mongo download links in my previous commit. This fixes that.

98adf2fe4f
 2014-03-29 18:36:01 -05:00
Rowan Decker
a6567de187 Fix Python Download 
bootstrap.sh was using the "open" command to open a link. While this may work on a Mac, the command does not exist on Linux. Instead we can now use a switch to use the correct command for the users OS.

Ohh and python.org/getit is a 404 -> Changed it to python.org/download
 2014-03-29 18:23:58 -05:00
Rowan Decker
98adf2fe4f Update Mongo 
This updates the installer script to use the latest mongo (v2.6 nightly)
 2014-03-29 18:04:36 -05:00
Nick Winter
c58a1682f4 Fixed #519 for real, I think. 2014-03-29 14:09:45 -07:00
Nick Winter
08cef0e380 Merge branch 'master' into production 2014-03-29 14:06:45 -07:00
Nick Winter
b84b86c6b5 Merge branch 'master' into production 2014-03-29 14:06:30 -07:00
Nick Winter
e08265a725 Merge pull request #730 from Darredevil/master 
Added setGoalState
 2014-03-29 14:04:33 -07:00
Nick Winter
b6e0f9037f Merge pull request #731 from herby/locale 
some more Slovak
 2014-03-29 14:02:38 -07:00
Nick Winter
bd0ecd76e5 Fixed SearchView projections. 2014-03-29 13:22:21 -07:00
Rowan Decker
1e2ada7b57 Use Global Gem Install 
Durring the setup the "sass" gem is installed. This works fine on Linux operating systems like Ubuntu. However, on some other distrobutions such as Arch Linux "gem install" defaults to the a local folder in the users home directory. When installed here the sass binary is not on the path and coco-brunch cannot find it (and thus crashes with an error). By adding the "--no-user-install" flag we are telling gem to install it globally no matter what the system default is thus fixing this problem.
 2014-03-29 15:08:55 -05:00
Ting-Kuan
130d322d60 Move error_view's dom to template file. 2014-03-28 23:51:15 -04:00
Herbert Vojčík
f0298f4596 some more Slovak 2014-03-29 03:18:45 +01:00
Darredevil
c4de6ef996 Added setGoalState 2014-03-29 03:54:16 +02:00
Darredevil
0a969bb103 Added setGoalState 2014-03-29 03:53:19 +02:00
Darredevil
e060d4b73d Added setGoalState 2014-03-29 03:52:02 +02:00
Nick Winter
5bcaf2c746 Fixed #64 (I hope; let's UX test.) 2014-03-28 17:06:21 -07:00
Nick Winter
bc9c30142b Merge branch 'master' into production 2014-03-28 15:27:30 -07:00