codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-25 00:28:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6119 commits 27 branches 0 tags 134 MiB
Commit graph

721 commits

Author SHA1 Message Date
Michael Schmatz
ca7376b794 Worked around mongoose toObject 
Also tried elementary memory leak fix
 2014-02-13 17:10:01 -08:00
Scott Erickson
4001d1c7fe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-13 16:42:49 -08:00
Scott Erickson
476cc87628 Set up the ladder to be able to compete against other sessions. 2014-02-13 16:42:35 -08:00
Michael Schmatz
128df09ce3 Fixed session by converting toObject 2014-02-13 16:29:02 -08:00
Nick Winter
9a835ffc0a Re-enabled spell tab entry docs. 2014-02-13 16:09:32 -08:00
Michael Schmatz
d33c39c21e Added continuous simulation and fix for "no team" 2014-02-13 15:59:40 -08:00
Michael Schmatz
d6e99273bc Quick fix for team not being detected 2014-02-13 15:42:00 -08:00
Michael Schmatz
ad0590f9ba Merged in Scott's changes manually 2014-02-13 15:14:10 -08:00
Michael Schmatz
480de71eb6 Leaderboard is starting to work 2014-02-13 15:02:49 -08:00
Michael Schmatz
40c26bb395 Scoring queues mostly working 2014-02-13 12:59:24 -08:00
Scott Erickson
ccbb521b59 Set up a temporary hack to get 2014-02-13 10:42:25 -08:00
Michael Schmatz
14530b779a Refactored scoring submissions, added beginnings of spectator view 2014-02-13 10:37:44 -08:00
Nick Winter
8a80b9770d More work on docs. Got rid of Docs.coffee. 2014-02-12 18:54:45 -08:00
Nick Winter
dc8c4394e1 Spell palette entries now using property docs from components. 2014-02-12 16:42:09 -08:00
Scott Erickson
2f48925e86 Added a list of goals as a property to levels for when they won't be added by scripts. Set up the editor to be able to edit these values. 2014-02-12 12:27:02 -08:00
Michael Schmatz
76b949ac1e Various changes before merge 2014-02-11 15:47:06 -08:00
Michael Schmatz
58bfddeebf Background simulation is now showing signs of life! 2014-02-11 12:58:23 -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
Michael Schmatz
0cbf669474 Added teamSpells persistence 2014-02-10 16:31:21 -08:00
Michael Schmatz
465ea22b1a More progress with queues and client-side simulation 2014-02-10 13:18:39 -08:00
Scott Erickson
3f2fde0fa9 Tweaked the level schema nextLevel property to only be an object. 2014-02-10 12:11:53 -08:00
Michael Schmatz
824af18e39 Improved Mongo queueing and various refactors 2014-02-10 10:30:08 -08: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
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
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
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
cde7a4798f Added team as a property to goals in the level schema. 2014-02-06 16:03:08 -08:00
Michael Schmatz
24043eaee9 Refactored queue files and moved scoring queue out of commons queue 2014-02-06 14:32:35 -08:00
Michael Schmatz
609547a37c Refactored queue routing structure 2014-02-06 13:25:11 -08:00
Michael Schmatz
3ccaa6796a Improved routes and put in session access 2014-02-05 16:41:01 -08:00
Sébastien Moratinos
8e841b397d delete unused code on server 2014-02-06 00:16:47 +01:00
Michael Schmatz
b174b10642 Added message class for SQS, basic scoring routes 2014-02-05 15:07:15 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -08:00
Michael Schmatz
308f34bc76 Merge branch 'feature/task-queue' of github.com:codecombat/codecombat into feature/task-queue 
Conflicts:
	server_setup.coffee
 2014-02-05 09:42:25 -08:00
Michael Schmatz
5c328d09f5 Added scoring and queue modules 2014-02-05 09:39:14 -08:00
Michael Schmatz
177eb60e48 Merge pull request #342 from codecombat/master 
Merge server refactor into task queue
 2014-02-05 09:38:18 -08:00
Sébastien Moratinos
f58acf0fbb rename some variables 2014-02-04 23:28:21 +01:00
Sébastien Moratinos
baf5ada19d use a mapping for handlers, schemas, and routes 2014-02-04 23:27:24 +01:00
Sébastien Moratinos
23a07303e3 move database setup (mongodb) out of db route (http endpoint) 2014-02-04 23:26:04 +01:00
Michael Schmatz
9401a4370e Merge branch 'feature/task-queue' into feature/level-runner-interface 
Conflicts:
	server.coffee
	server/db.coffee
 2014-02-04 10:26:16 -08:00
Michael Schmatz
a3b17c7d86 Put in basic client-side routes and created server side scoring routing file 2014-02-04 10:07:14 -08:00
Michael Schmatz
3256a5d65d Added support for replica set 2014-02-03 08:56:32 -08:00
Sébastien Moratinos
f27db34976 add server auth test (reset password) 2014-02-03 00:08:52 +01:00
Sébastien Moratinos
8895f12aff Fix error 500 when resetting password if bad input. 2014-02-03 00:08:07 +01:00
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08:00
Michael Schmatz
563c442e81 Added tests, moved some functions into module.exports 2014-01-31 11:09:15 -08:00
Nick Winter
d46716eec4 Merge pull request #299 from p-buse/eventcheck-regexp 
Added Regular Expression Event Checker
 2014-01-31 07:58:13 -08:00
Nick Winter
6e40fa09a6 Updated some Bootstrap event names. 2014-01-30 16:36:36 -08:00
Paul Buser
8881a880ea Merge branch 'master' of https://github.com/codecombat/codecombat into eventcheck-regexp 2014-01-29 23:57:47 -05:00
Scott Erickson
5173e7990b Added effect system to the component schema. 2014-01-29 12:28:57 -08:00
Michael Schmatz
4d1c772719 Refactored files and server 2014-01-27 11:14:44 -08:00
Michael Schmatz
45634e9413 Fixed queue bug and wrote tests 2014-01-25 10:10:03 -08:00
Scott Erickson
46dd4044aa I'm pretty sure it's working now. 2014-01-24 17:42:47 -08:00
Scott Erickson
eafa82357c MailChimp webhook fix. 2014-01-24 17:35:34 -08:00
Michael Schmatz
6f2461c8be Starting to test queue class 2014-01-24 17:25:02 -08:00
Scott Erickson
3122dd9594 More tweaks to the mail module. 2014-01-24 17:19:20 -08:00
Scott Erickson
7bc6d0f6ed No longer returning error messages when given bad input, because then MailChimp won't accept it as a webhook. 2014-01-24 13:55:23 -08:00
Scott Erickson
c4114f9f92 More fixes. 2014-01-24 13:47:25 -08:00
Scott Erickson
ced57ac35d More tweaks. 2014-01-24 13:22:56 -08:00
Scott Erickson
dd9c4007a2 Reverting back to super log mode cause it stopped working. 2014-01-24 13:14:31 -08:00
Michael Schmatz
c00321208d MongoQueue nearing completion 2014-01-24 12:57:18 -08:00
Scott Erickson
79032b1c35 Couple remaining fixes. 2014-01-24 12:54:15 -08:00
Scott Erickson
4450747671 Finished setting up the mailchimp webhook. 2014-01-24 12:53:41 -08:00
Scott Erickson
a71b688a15 Fixed the mailchimp webhook. 2014-01-24 12:39:05 -08:00
Scott Erickson
95186cc5ae Much improved the mailchimp webhook. 2014-01-24 12:23:14 -08:00
Scott Erickson
b2366c50af Came up with a better hacky logging system. 2014-01-24 11:55:44 -08:00
Scott Erickson
62770c35df Added a test webhook for MailChimp. 2014-01-24 11:48:00 -08:00
Scott Erickson
004e7cc79e Refactored some mail functions and constants to a new common module. 2014-01-24 11:47:14 -08:00
Michael Schmatz
750a2f6d0d Rewriting mongo queue 2014-01-24 11:20:44 -08:00
Paul Buser
30d8eb8256 Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-23 21:56:23 -05:00
Scott Erickson
dceb48ab04 Merge branch 'packagebyfeature' of https://github.com/smoratinos/codecombat into feature/server-refactor 2014-01-23 18:30:49 -08:00
Sébastien Moratinos
bbfc0eff69 server db route (handlers and schemas) 
- use associative arrays to store path/filename
- add more test for schemas
 2014-01-23 23:06:12 +01:00
Michael Schmatz
7c6974955a Ditching mubsub, moving to a slower yet more extensible method of local queueing 2014-01-23 12:37:18 -08:00
Michael Schmatz
1c2eeff399 Unifying SQS with mubsub interface 2014-01-23 10:52:43 -08:00
Scott Erickson
72360be965 MailChimp tweak. 2014-01-23 09:28:21 -08:00
Michael Schmatz
671f6d6ffd Refactored and simplified 2014-01-22 23:48:47 -08:00
Michael Schmatz
d9b2a36875 More refactoring, added message loop example 2014-01-22 23:41:26 -08:00
Michael Schmatz
ccd94f0f1f Refactored and added more functionality to remote queue class 2014-01-22 23:13:14 -08:00
Michael Schmatz
9157bd150d Starting to receive messages from SQS! 2014-01-22 21:41:29 -08:00
Michael Schmatz
3df58843c6 Updated environment variable names 2014-01-22 18:41:14 -08:00
Michael Schmatz
2373d97137 Put in configuration, aws-sdk, subclassing Queue 2014-01-22 18:29:02 -08:00
Michael Schmatz
a62427fe34 Added aws-sdk and created queue file 2014-01-22 17:48:11 -08:00
Sébastien Moratinos
e7ca7c4c1a remove unused modules 2014-01-23 01:01:45 +01:00
Sébastien Moratinos
729cd300b7 server reorganize files and folder by features 
- move and rename files
- use associative arrays which store handlers for 'dynamically'
  load module from de db route
- store models_path in test/server/common,
  a global model variable has the same name that the filename of the model
 2014-01-23 01:01:40 +01:00
Sébastien Moratinos
771099d43e server : move routes files (HTTP endpoint) in a new "routes" folder 2014-01-23 01:01:30 +01:00
Paul Buser
2b7d18bbfa Merge remote-tracking branch 'upstream/master' into eventcheck-regexp 2014-01-21 21:32:17 -05:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
fabb40384c Added 'kind' as a property to thang types. 2014-01-20 22:38:52 -08:00
Scott Erickson
222fa6100b Set up the level editor to lazily load thang types. 2014-01-20 17:20:04 -08:00
Scott Erickson
dad21e0338 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-20 09:13:30 -08:00
Scott Erickson
d1176f7ee6 Fixed getDocumentForIdOrSlug to be better at recognizing slugs. 2014-01-20 09:13:18 -08:00
Michael Schmatz
5bc2814342 Fixed CLA signing bug 
Fat arrows to the rescue!
 2014-01-18 10:16:58 -08:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
9ba8fe451c Fixed errors to run 'res.end()' 2014-01-17 10:30:47 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Sébastien Moratinos
fa218f7167 refactor server http errors 
- error.coffee centralize all http errors response
- unauthorized = 401 and forbiden = 403
 2014-01-14 23:19:34 +01:00
Paul Buser
b0ad3f5700 Add regex event checker in level.coffee 2014-01-13 16:56:08 -05:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
Scott Erickson
391207d00f Fixes for unit portraits. 2014-01-08 22:30:00 -08:00
Sébastien Moratinos
00cffa2570 undo a line wrapping, because this change the logic in common schema. 2014-01-08 22:48:19 +01:00
Sébastien Moratinos
abb20a6b8a code style : wrap some lines that exceeds 120 characters, replace some '=>' by '->' 2014-01-08 20:27:13 +01:00
Scott Erickson
94cb6ea4e1 Fixed up the search optimization and installed thang portraits into the level editor. 2014-01-06 17:11:57 -08:00
Scott Erickson
68313b42ba Searches now use projections, way faster. 2014-01-06 15:44:20 -08:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
Scott Erickson
a99073fc5e Fixed account recovery on dev server. 2014-01-06 12:14:12 -08:00
Scott Erickson
1ad9f5e283 Fixed the CLA date property setting. 2014-01-05 16:02:50 -08:00
Scott Erickson
9f5c7634ee Turned off mailchimp API calls during development. 2014-01-03 14:30:39 -08:00
Scott Erickson
ff3e2ba37f Turned off sending mail on the dev environment. 2014-01-03 14:28:26 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00