Commit graph

741 commits

Author SHA1 Message Date
Scott Erickson
f3d1a43bbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 10:19:01 -08:00
Nick Winter
ea99a7b139 Turned off Olark for now. 2014-02-06 10:17:54 -08:00
Scott Erickson
9fd12b15bf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-06 09:29:13 -08:00
Nick Winter
847faf4d10 Possibly hooked up scaleFactorX and scaleFactorY. 2014-02-06 08:27:49 -08:00
Trent Ohannessian
b021c32bac correct systems tab view test describe 2014-02-06 09:24:56 -06:00
Nick Winter
2a8d0eb694 Updates for ThangsList refreshing its Thangs. 2014-02-05 20:08:28 -08:00
Nick Winter
cc3465fd6f Improvement for errors updating action of non-existent Thangs in HUD. 2014-02-05 15:54:34 -08:00
Scott Erickson
6728712064 Fixed the thang components edit view in both locations now. 2014-02-05 15:39:08 -08:00
Scott Erickson
25e2895b64 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-05 15:18:23 -08:00
Nick Winter
cec52d70f3 Improvements to how Tome subviews manage Thang updates. 2014-02-05 15:16:59 -08:00
Sébastien Moratinos
8e841b397d delete unused code on server 2014-02-06 00:16:47 +01:00
Scott Erickson
7041a12244 Fixed display of actions using container in the thang editor. 2014-02-05 15:16:07 -08:00
Scott Erickson
f900009770 Actions without a container or animation to show don't show anything. 2014-02-05 14:57:05 -08:00
Scott Erickson
88beb4db5f Fixed the positioning of the thang components view in the thang editor. 2014-02-05 14:39:56 -08:00
Scott Erickson
323d3570ec Fix for the dynamic programming level of project dota. 2014-02-05 13:39:41 -08:00
Scott Erickson
966155593c Various fixes. 2014-02-05 11:03:32 -08:00
Michael Schmatz
63b5b50f96 Allowed multiple versions of MongoDB 2014-02-05 08:53:04 -08:00
Michael Schmatz
32bae5362e Merge pull request #340 from smoratinos/master
server refactor db routes
2014-02-05 08:45:49 -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
84636360f4 Merge pull request #339 from smoratinos/master
refactor server test directory
2014-02-04 12:25:06 -08:00
Sébastien Moratinos
319a8d3941 add unit test 2014-02-04 08:36:25 +01:00
Sébastien Moratinos
aa83f77fd6 refactor server test folder 2014-02-04 08:36:15 +01:00
Nick Winter
99aa9eab64 Merge pull request #336 from GlenDC/master
Added Ascii art, script improvements, readme files and automatic package script
2014-02-03 20:49:50 -08:00
GlenDC
98c58bed6b Merge https://github.com/codecombat/codecombat 2014-02-04 02:21:44 +01:00
GlenDC
c6e3352353 Added a packer batch file to generate new version of the windows dev setup. 2014-02-04 02:20:24 +01:00
GlenDC
c4fa90b12c Added Ascii Art header, readme file for installation and readme file for after installation is finished 2014-02-04 01:24:25 +01:00
Nick Winter
1dc0af9c65 Merge pull request #332 from GlenDC/master
Gitignore added (for utilities directory) and small update to the Automatic Windows Dev Setup
2014-02-03 16:07:08 -08:00
GlenDC
7aa78e4ce3 Small Update for the AWDS 2014-02-04 01:00:53 +01:00
GlenDC
8b1bb7a303 Added a gitignore file for the Windows Automatic Dev setup 2014-02-04 01:00:08 +01:00
Michael Schmatz
704039dd9f Removed unnecessary installer folders 2014-02-03 14:54:03 -08:00
Scott Erickson
6533196bc7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-03 14:01:30 -08:00
Scott Erickson
81912d25d1 Added a handler for when components or systems go rogue, so they don't take down the level editor quite so hard. 2014-02-03 14:01:20 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Glen De Cauwsemaecker
912b6140ac Merge https://github.com/codecombat/codecombat 2014-02-03 19:19:52 +01:00
Glen De Cauwsemaecker
54b8f8655d Script now has the functionality to download packed software and unpack it to a customizble position. This is applied to the mongo-db install as an example. 2014-02-03 19:19:24 +01:00
Michael Schmatz
9d5c0e2dbf Merge pull request #325 from codecombat/replicaset
Implemented automated failover and updated mongoose in package.json
2014-02-03 10:03:10 -08:00
Michael Schmatz
1f7fae4971 Updated mongoose to 3.8 2014-02-03 09:44:33 -08:00
Michael Schmatz
3256a5d65d Added support for replica set 2014-02-03 08:56:32 -08:00
Glen De Cauwsemaecker
ed93e56b38 Implemented a new check system for the ropeskipping game 2014-02-03 14:53:05 +01:00
Glen De Cauwsemaecker
e920054695 Resolved category-issues for the da.coffee language file. 2014-02-03 13:04:45 +01:00
Glen De Cauwsemaecker
0ead214584 Merge https://github.com/Einar-Rasmussen/codecombat 2014-02-03 12:59:00 +01:00
Einar Rasmussen
5d0084e95d Update da.coffee
Rådmand -> rådgiver since counselor != chancellor
2014-02-03 11:35:34 +00:00
Scott Erickson
ebc4985d30 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-02 16:58:57 -08:00
Scott Erickson
09bb669439 Fixed #300 2014-02-02 16:51:22 -08:00
Michael Schmatz
06667436e1 Merge pull request #323 from smoratinos/master
server auth reset password fix + test
2014-02-02 16:41:10 -08:00
Scott Erickson
d09de8b746 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-02 16:31:26 -08:00
Scott Erickson
4b3bfbb7e2 Fixed #317 2014-02-02 16:31:06 -08:00
GlenDC
08993aec59 Merge https://www.github.com/codecombat/codecombat 2014-02-03 01:02:13 +01:00