Commit graph

12620 commits

Author SHA1 Message Date
Michael Schmatz
389fa9a30b Merge pull request #220 from Elfisen/patch-2
spelling and grammar mistakes - fr.coffee
2014-01-16 14:26:10 -08:00
Nick Winter
43831c27ce Merge pull request #221 from GlenDC/master
Fixed issue #160 and updated my repository
2014-01-16 13:58:14 -08:00
GlenDC
553ad833ed Merge https://github.com/codecombat/codecombat 2014-01-16 22:27:09 +01:00
GlenDC
5cc24ea1b2 Logs now a warning in the console to give user the feedback that there are no programmable thangs which makws the level unplayable. 2014-01-16 22:26:34 +01:00
GlenDC
b557c43f60 Hotfix for previous commit, forgot to uncommit some stuff 2014-01-16 22:22:42 +01:00
GlenDC
926b31f62f Resolved issue #160 2014-01-16 22:18:38 +01:00
Nick Winter
9fc0af566e Merge branch 'master' into production 2014-01-16 12:46:23 -08:00
Allisson
580a439fab spelling and grammar mistakes - fr.coffee
Just a correction of what really hurt the eye
2014-01-16 21:15:39 +01:00
Nick Winter
1fb68ae717 Fixed bug with team assignments and spell permissions. 2014-01-16 11:37:04 -08:00
Michael Schmatz
d0f1510623 Merge branch 'pr/197'
Conflicts:
	app/locale/fr.coffee
2014-01-16 10:46:56 -08:00
Michael Schmatz
6e43daa98a Revert "Merge branch 'pr/190'"
This reverts commit 457accf729, reversing
changes made to 9df9f75f64.
2014-01-16 10:40:05 -08:00
Michael Schmatz
457accf729 Merge branch 'pr/190'
Conflicts:
	app/locale/fr.coffee
2014-01-16 10:33:00 -08:00
Michael Schmatz
9df9f75f64 Merge branch 'pr/200'
Conflicts:
	app/locale/fr.coffee
2014-01-16 10:24:55 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors'
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Scott Erickson
ba01101ae0 Cleanup from the system tracked properties refactoring. 2014-01-16 10:04:52 -08:00
Nick Winter
5fd1a937bb Merge branch 'master' into production 2014-01-16 09:21:52 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
3a63428c0c Add jquery fading
Also using the level:session-will-save callback
2014-01-16 17:13:14 +01:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Nick Winter
14f2db20eb Merge branch 'master' into production 2014-01-15 19:13:34 -08:00
Nick Winter
84e268a88c Removed some logs. 2014-01-15 19:03:10 -08:00
Scott Erickson
f230e8983c Fixed the level preview view. 2014-01-15 18:37:47 -08:00
Michael Schmatz
6bc3924af0 Merge pull request #208 from kengos/update_ja_coffee
Update ja.coffee
2014-01-15 15:58:53 -08:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master
Issue #30 is resolved + Added Dutch Translations + Hotfixes
2014-01-15 15:54:04 -08:00
GlenDC
a7368fb51e Converted line endings to unix endings for 3 files 2014-01-16 00:35:17 +01:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
GlenDC
556149f756 Resolved issue #162 2014-01-16 00:08:35 +01:00
Nick Winter
172d97ed83 Fixed #87 I hope; at least, dramatically reduced memory leakage. 2014-01-15 13:04:48 -08:00
Michael Schmatz
2b30d50895 Merge pull request #195 from smoratinos/server_refactor
refactor server http errors
2014-01-15 12:57:22 -08:00
Michael Schmatz
236c323b43 Merge pull request #194 from brunoporto/patch-1
Update pt-BR.coffee
2014-01-15 12:53:15 -08:00
Michael Schmatz
8154bc5092 Merge pull request #206 from smoratinos/master
Fix all server side test
2014-01-15 12:50:14 -08:00
Michael Schmatz
f9970f0ddb Merge pull request #203 from jaybi/patch-1
Update fr.coffee
2014-01-15 12:03:22 -08:00
Michael Schmatz
6d20d34048 Merge pull request #204 from rezahb/patch-3
Update fa.coffee
2014-01-15 12:00:50 -08:00
Michael Schmatz
0e40c8b20a Removed comma from diplomats template 2014-01-15 11:59:34 -08:00
Michael Schmatz
5c3ce7459c Merge pull request #192 from rezahb/patch-2
Update diplomat.jade
2014-01-15 11:59:00 -08:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
2014-01-15 20:58:39 +01:00
Sébastien Moratinos
e5ef0b707c Fix all server side test 2014-01-15 20:36:59 +01:00
kengos
8e6271854d Update ja.coffee 2014-01-16 00:06:38 +09:00
Rehb
ac86e08902 Update fa.coffee 2014-01-15 18:19:43 +03:30
GlenDC
6e5cf30c29 Hotfix for 2 url i18n tags. The Category wasn't prefixed. 2014-01-15 14:49:17 +01:00
GlenDC
8acc4d7071 Translated 1/3 of the Contribute web page as well. + Added a missing tag to the nl.coffee document. 2014-01-15 14:45:18 +01:00
GlenDC
72cb62f607 Translated the Legal page completly in Dutch. (nl.coffee) 2014-01-15 13:48:24 +01:00
jaybi
99f8343df4 Update fr.coffee
edited by jaybi
2014-01-15 12:32:09 +01:00
GlenDC
8f5e80d101 Translated most of the Dutch version. (It's my native language) 2014-01-15 03:39:20 +01:00
GlenDC
eba0665616 Hotfix for issue #30 2014-01-15 03:38:33 +01:00
Nick Winter
53f47bd4f5 Merge pull request #201 from mattinsler/master
Change license in package.json
2014-01-14 18:35:28 -08:00
Matt Insler
4d40907354 oops, wrong field name 2014-01-14 18:11:28 -08:00
Matt Insler
7639ac1f8b changed the license to the one on the website 2014-01-14 18:10:26 -08:00
Thomas Triboult
e713fe828f Translation of new elements 2014-01-15 02:36:39 +01:00