Scott Erickson
21c93e85ed
Fixed a bug with tearing down angels.
2014-02-11 11:30:47 -08:00
Michael Schmatz
612a374b3f
Progress on simulator
2014-02-11 11:27:39 -08:00
Nick Winter
f9bb6de3ff
Typoooo
2014-02-11 09:33:35 -08:00
Nick Winter
c61e2496d8
Trying a faint gold coin noise when you kill something worth money.
2014-02-11 09:28:26 -08:00
Michael Schmatz
c0d43ea32b
Merge branch 'master' into feature/task-queue
2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3
Simulation button
2014-02-10 17:09:51 -08:00
Nick Winter
7d5db41f5d
God prepares Workers for Angelic consumption ahead of time.
2014-02-10 17:09:19 -08:00
Michael Schmatz
0cbf669474
Added teamSpells persistence
2014-02-10 16:31:21 -08:00
Michael Schmatz
cc3b93a0f8
Transfer teamSpellMap from tome to levelBus
2014-02-10 16:18:39 -08:00
Nick Winter
f812241bd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-10 14:50:35 -08:00
Nick Winter
9507be4c9a
Turned off includeFlow for horrific performance reasons on project-dota for now.
2014-02-10 14:19:54 -08:00
Michael Schmatz
465ea22b1a
More progress with queues and client-side simulation
2014-02-10 13:18:39 -08:00
Scott Erickson
9f5b51da19
Made goals for other teams invisible.
2014-02-10 12:49:38 -08:00
Scott Erickson
d95b66df0a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-10 12:12:49 -08:00
Scott Erickson
97d823cc48
Made the LatestVersionReferenceNode use projection results.
2014-02-10 12:12:22 -08:00
Scott Erickson
3f2fde0fa9
Tweaked the level schema nextLevel property to only be an object.
2014-02-10 12:11:53 -08:00
Isaac
23554315e2
Merge branch 'master' of github.com:LightAndLight/codecombat
2014-02-11 04:33:12 +10:00
Isaac
d36630323c
Removed my silly helper server helper script
2014-02-11 04:32:09 +10:00
Isaac
3351bfce2f
Modified python scripts to support both python2.7 and python3 natively
2014-02-11 04:30:58 +10:00
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