Michael Schmatz
824af18e39
Improved Mongo queueing and various refactors
2014-02-10 10:30:08 -08:00
Nick Winter
26016f48e2
Skip protectAPI for now. Defer worker termination until after it reports stats.
2014-02-09 18:44:31 -08:00
justin
719dbea3bf
Add indentation to fix template engine output
2014-02-09 12:31:15 -05:00
Yinkan Li
6ced32a1de
update Chinese (simplified)
...
update ‘…’ to ‘……’
add ‘ ’ before and after for each english in Chinese
add ‘。’ for some value
add translation value for ‘email_notifications_description’
update ‘customize_wizard’
update ‘:’ to ‘:’
update ‘!’ to ‘!’
2014-02-09 16:43:13 +08:00
Andrew Wong
3927795c06
Merge remote-tracking branch 'cocomaster/master'
2014-02-08 20:27:19 -08:00
Cassio Cardoso
8d383bc7ea
Update pt-BR.coffee
...
Work in progress.
2014-02-08 23:25:46 -02:00
Nick Winter
eb3f57ce34
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-08 15:32:23 -08:00
Nick Winter
f2bcf019fa
Should update code when other player changes it again.
2014-02-08 15:32:14 -08:00
Nick Winter
6bcd18a208
Merge pull request #348 from 9034725985/patch-1
...
use https when linking to wikipedia
2014-02-08 14:40:43 -08:00
Kushal
40eead0341
use https when linking to wikipedia
...
Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :)
https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/
2014-02-08 16:31:52 -06:00
Michael Schmatz
8c2926c300
Replaced capped collection with 1-hour expiry index
2014-02-08 14:21:37 -08:00
Michael Schmatz
aabc8324c1
Session ranking is now functional
...
Need to add database persistence next
2014-02-08 14:21:16 -08:00
Scott Erickson
74ddb1135a
Tweaked collision to make missiles not collide with one another.
2014-02-08 12:27:56 -08:00
Scott Erickson
ab2bae6bc2
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-08 11:56:00 -08:00
Nick Winter
22433b14ae
Tweaked about avatar formatting.
2014-02-08 10:30:28 -08:00
Nick Winter
d417f0e693
Merge branch 'master' into production
2014-02-08 10:21:34 -08:00
Nick Winter
2e7a1fd0ef
Working on the contribute pages -- #314 .
2014-02-08 10:21:12 -08:00
Michael Schmatz
9742923ad6
Fixed typo
2014-02-08 10:18:41 -08:00
Michael Schmatz
b9569a310a
Implemented task logging and new score calculations
2014-02-08 10:11:43 -08:00
Nick Winter
2a740f777e
Starting to add contributor avatars.
2014-02-07 18:38:17 -08:00
Scott Erickson
d3111f545d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-07 16:47:54 -08:00
Nick Winter
b2bf4db222
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-07 16:47:38 -08:00
Scott Erickson
126055cad2
Added a url for looking up a user's icon.
2014-02-07 16:11:07 -08:00
Michael Schmatz
350384f5cb
Implementing task log object
2014-02-07 15:52:24 -08:00
Scott Erickson
0365998658
Began work on a ladder view.
2014-02-07 15:51:05 -08:00
Michael Schmatz
73b0d98538
Merge branch 'master' into feature/task-queue
...
Conflicts:
server/commons/mapping.coffee
2014-02-07 14:31:34 -08:00
Michael Schmatz
f87d25c192
Updated level session schema to contain scoring metrics
2014-02-07 14:29:20 -08:00
Michael Schmatz
ecf578ad3c
Prototyped client response methods, refactored queue routes
2014-02-07 14:24:42 -08:00
Nick Winter
11c63d262d
Merge pull request #347 from monetita/patch-1
...
Update he.coffee
2014-02-07 13:59:27 -08:00
Michael Schmatz
4b0e384668
Refactored and added sample objects/errors
2014-02-07 12:36:56 -08:00
Scott Erickson
fa809308b2
Set up some new session handlers for the upcoming multiplayer, allowing one session for each team.
2014-02-07 11:50:40 -08:00
Scott Erickson
9105888685
Added a team property to the level session schema.
2014-02-07 11:49:37 -08:00
Scott Erickson
72b1b989d8
Tweaked the world to return points that are not 0,0, as that's what the world reports non-existent thangs at.
2014-02-07 11:49:16 -08:00
Scott Erickson
c3bd9cef80
Merge remote-tracking branch 'origin/master'
2014-02-07 11:05:43 -08:00
Nick Winter
2efb9a0ea1
Simple team switch links in multiplayer menu.
2014-02-07 10:51:21 -08:00
monetita
89f6282d50
Update he.coffee
2014-02-07 19:12:46 +02:00
Nick Winter
837cc94f38
Merge branch 'master' into production
2014-02-06 17:31:46 -08:00
Nick Winter
86de427204
Messing with team setting.
2014-02-06 17:31:08 -08:00
Scott Erickson
ee24263232
Added handling for thang type goesTo animation properties.
2014-02-06 17:00:02 -08:00
Nick Winter
2a3e47b08f
Using playable team config from Alliance system.
2014-02-06 16:05:41 -08:00
Scott Erickson
cde7a4798f
Added team as a property to goals in the level schema.
2014-02-06 16:03:08 -08:00
Michael Schmatz
b93b5d3062
Added xavismeh to french translators
2014-02-06 14:42:56 -08:00
Michael Schmatz
7dcc351e75
Merge pull request #346 from xavismeh/i18n-fr
...
Improved FR translation
2014-02-06 14:39:42 -08:00
Michael Schmatz
24043eaee9
Refactored queue files and moved scoring queue out of commons queue
2014-02-06 14:32:35 -08:00
Nick Winter
642d88fe93
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 14:00:31 -08:00
Nick Winter
6af2d34f59
Fixed a ton of memory leaks, but not all of them.
2014-02-06 14:00:27 -08:00
Michael Schmatz
609547a37c
Refactored queue routing structure
2014-02-06 13:25:11 -08:00
Scott Erickson
1e184c9590
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-06 13:23:04 -08:00
Scott Erickson
6484f787c5
Tweaked layer order updating to fallback to sorting by x if y and z are the same.
2014-02-06 13:22:47 -08:00
Michael Schmatz
721ca5f9ca
Credits for FR translation
...
Merged in xavismeh's translation changes
Dummy credits commit
2014-02-06 20:57:30 +01:00