Commit graph

2506 commits

Author SHA1 Message Date
Nick Winter
127eb3cef6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:32:49 -07:00
Nick Winter
aec4669780 Merge pull request #687 from kgy01/master
Hide arrow's shadow if buried
2014-03-26 11:27:11 -07:00
Nick Winter
cab343b0b3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-26 11:25:20 -07:00
Nick Winter
773df44b14 Added infinite loop handling to Simulator. 2014-03-26 11:25:05 -07:00
Jayant Jain
71294f14b2 Updates fb and g+ functions to be called on api load, fixes #695 2014-03-26 22:03:20 +05:30
Glen De Cauwsemaecker
050e0f92fd Added step-by-step guide wiki url in tips 2014-03-26 14:34:38 +01:00
Glen De Cauwsemaecker
4d09d6b472 Removed ssh option (less is more) and placed now the repository in a subdir so that the db can be placed in the env path as well. 2014-03-26 14:31:48 +01:00
Glen De Cauwsemaecker
71608bf2ef Added ssh clone option: 2014-03-26 14:27:39 +01:00
Glen De Cauwsemaecker
6fdcbde61a Git setup works. 2014-03-26 14:18:34 +01:00
Glen De Cauwsemaecker
5825b2676b Added myself to the signature. 2014-03-26 04:46:49 +01:00
Glen De Cauwsemaecker
a4f6b518ec At the end of the installation the user can now read a readme file with more information, if he wants to. 2014-03-26 04:33:05 +01:00
Glen De Cauwsemaecker
37d7358e78 git setup can now also be done manually 2014-03-26 04:19:01 +01:00
Glen De Cauwsemaecker
10d13775ee Installation of software can now be skipped 2014-03-26 03:43:34 +01:00
Glen De Cauwsemaecker
a9f88a275a Added the missing headers and the main setup file is now as good as complete. 2014-03-26 03:28:24 +01:00
Glen De Cauwsemaecker
f702f58bdf Added github header and made a script root for it. 2014-03-26 03:15:52 +01:00
Glen De Cauwsemaecker
892907adf0 installation system finished 2014-03-26 03:05:50 +01:00
Glen De Cauwsemaecker
366a3676d8 Download app cleaned up 2014-03-26 02:45:49 +01:00
Glen De Cauwsemaecker
ffa8094a1d Installation almost over. 2014-03-26 01:46:07 +01:00
swapnesh
1118324b41 Migrate from .on, .once to .listenTo, .listenToOnce 2014-03-26 03:25:11 +05:30
Dominik Kundel
fe8a4901de Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/locale/de.coffee
	bower.json
2014-03-25 17:07:36 +01:00
Michael Schmatz
06f46af603 Merge pull request #688 from 1c7/master
Translate some word from English -> Chinese.  (zh-HANS.coffee)
2014-03-25 08:44:29 -07:00
1c7
ed2e17aedc Translate some word from English -> Chinese. (zh-HANS.coffee) 2014-03-25 23:15:17 +08:00
kgy01
29aad01697 hide Arrow and Spear if buried use ['Arrow', 'Spear'] for condition 2014-03-25 08:48:26 -04:00
kgy01
a420064bc1 hide spear's shadow if buried 2014-03-25 08:31:38 -04:00
Glen De Cauwsemaecker
305e2f6d68 Merge pull request #685 from JasperDhaene/master
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 13:27:13 +01:00
kgy01
3cc422a281 Merge remote-tracking branch 'upstream/master' 2014-03-25 08:10:30 -04:00
kgy01
c48863fae6 Hide arrow's shadow if buried 2014-03-25 08:06:37 -04:00
Aditya Raisinghani
6208e8e324 Additional fixes for double scrollbars of modals. 2014-03-25 16:50:02 +05:30
Aditya Raisinghani
84db5289f9 Fixed issue with two scroll bars appearing. 2014-03-25 16:36:24 +05:30
JasperDhaene
748081b4a7 Added myself to the diplomate list, fixed typos and made corrections to Dutch locale 2014-03-25 09:25:20 +01:00
Shrihari
aee18523b0 Fix for #506 2014-03-25 13:28:22 +05:30
Glen De Cauwsemaecker
0050bef8f1 Added additional software and added the github url's of codecombat to the config file. 2014-03-25 03:48:16 +01:00
Glen De Cauwsemaecker
de7a717b16 buggy version of installation works. 2014-03-25 03:37:05 +01:00
Glen De Cauwsemaecker
0e7530e96d Merge pull request #682 from Darredevil/patch-3
Update ro.coffee
2014-03-25 03:02:23 +01:00
Darredevil
4bb1ee5c74 Update ro.coffee 2014-03-25 02:55:07 +02:00
Glen De Cauwsemaecker
3382750c7e Merge branch 'dutch_diff' of github.com:rubenvereecken/codecombat 2014-03-25 01:13:30 +01:00
Glen De Cauwsemaecker
b3c28028c8 Update, latest source code for the 2 c++ utilities 2014-03-25 01:07:09 +01:00
Glen De Cauwsemaecker
e16c0dc66a Parsing correct all the downloads. 2014-03-25 01:06:22 +01:00
Glen De Cauwsemaecker
0bdc4fe4fc Latest version of the windows automatic setup. 2014-03-25 00:04:42 +01:00
Scott Erickson
bda499b561 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:43:08 -07:00
Scott Erickson
2c329a256f Removed all the setting properties to null in destroy methods that don't need them since destroy nullifies all properties. 2014-03-24 14:42:56 -07:00
Nick Winter
97613f12b4 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:38:35 -07:00
Nick Winter
a42e33764e Merged, fixed. 2014-03-24 14:38:18 -07:00
Scott Erickson
53118984ff Undid a listenTo on a jQuery elem. 2014-03-24 14:29:53 -07:00
Scott Erickson
57f6f4d244 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-24 14:27:28 -07:00
Scott Erickson
e9b3db2eb9 Fixed destroy to not break stopListening, which uses off. 2014-03-24 14:27:10 -07:00
Ruben Vereecken
a3f65ace7a Created differentation between nl-BE and nl-NL 2014-03-24 22:21:34 +01:00
Nick Winter
e6e216fcd3 Mergred Diplomats. 2014-03-24 14:20:40 -07:00
Ruben Vereecken
3f3eeab02a Fixed NaN in ladder in case a player has never played before 2014-03-24 19:46:50 +01:00
Michael Schmatz
83bfc28a9e Partially refactored scoring callback pyramid of hell 2014-03-24 10:58:43 -07:00