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

5577 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
653cc8b004 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-29 16:43:05 -08:00
Nick Winter
067d3abd75 Improved handling of spawning Programmables in Tome after the fact. 2014-01-29 16:26:08 -08:00
Nick Winter
c27b8eea26 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-29 15:25:01 -08:00
Nick Winter
bd22b3ff60 O Box2Dweb, from whence thy malice? Fie, the evil thou hath wrought upoon Object.definePrototype! 2014-01-29 15:24:49 -08:00
Glen De Cauwsemaecker
67e575065b quick-fix for the de.coffee locale file 2014-01-29 22:54:23 +01:00
Glen De Cauwsemaecker
94328f202e Merge branch 'locale' of https://github.com/HiroP0/codecombat 2014-01-29 22:52:33 +01:00
Glen De Cauwsemaecker
ca1bb6a1ec Merge branch 'cz-translation' of https://github.com/vanous/codecombat 2014-01-29 22:36:55 +01:00
Glen De Cauwsemaecker
0290934906 Merge https://github.com/codecombat/codecombat 2014-01-29 22:31:45 +01:00
Glen De Cauwsemaecker
502675e64f added a powershell script for windows developers to install mongodb and add it as a service. 2014-01-29 22:31:04 +01:00
vanous
35397a356c fixing typo, caused by web editor 2014-01-29 22:28:04 +01:00
vanous
ea458a0edc fixing typo, caused by web editor 2014-01-29 22:27:22 +01:00
vanous
bfcf5b7e39 Halfway through czech translation 2014-01-29 22:25:33 +01:00
Scott Erickson
5173e7990b Added effect system to the component schema. 2014-01-29 12:28:57 -08:00
Nick Winter
e0108a3166 A few fixes for the Bootstrap 3 migration. Fixed #280. 2014-01-29 12:18:37 -08:00
Scott Erickson
f065406cf5 Merge branch 'feature/bootstrap3' 2014-01-29 10:40:34 -08:00
Scott Erickson
bac4fbcd7d Fixed naming. 
Improved tome updating of programmable spell thangs.
 2014-01-29 10:14:12 -08:00
Nick Winter
01efb2f92b Improvements to SpellDebugView hover. 2014-01-29 08:38:37 -08:00
Michael Glass
04f0aa9473 Fixed some German langues issues. Translated good deal of legals page. 2014-01-28 21:20:25 -08:00
Nick Winter
c3f5c1c334 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 15:24:12 -08:00
Nick Winter
fb7739727c Updates for Aether's protectAPI stuff. 2014-01-28 15:24:08 -08:00
Michael Schmatz
b0e633786c Merge pull request #291 from vanous/cz-translation 
Initial work at czech translation
 2014-01-28 14:58:16 -08:00
vanous
58569cdd2c Misunderstood the first translation line. Fixed. 2014-01-28 22:53:55 +01:00
vanous
c8260e97ae Correcting typo 
Correcting typo causing The Travis CI build could not complete due to an error
 2014-01-28 22:48:12 +01:00
vanous
470b06d888 Initial work at czech translation 2014-01-28 22:25:58 +01:00
Scott Erickson
065a1c4c27 New editor layout. 2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:17 -08:00
Scott Erickson
e89dc9103f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-28 12:27:21 -08:00
Scott Erickson
55ea4d86e4 Made the level editor layout more stretchy. 2014-01-28 12:27:11 -08:00
Scott Erickson
00872f80f9 Fixed the bug where opening a modal or switching a tab while having a thang to add selected would create a thang. 2014-01-28 11:54:16 -08:00
Michael Schmatz
91b1ab14e4 Merge pull request #289 from codecombat/refactor/server.coffee 
Refactored server.coffee
 2014-01-28 11:07:34 -08:00
Scott Erickson
e2db421d1c Fixed cloning. 2014-01-28 09:22:23 -08:00
Scott Erickson
9336a637ce Merge branch 'master' into feature/bootstrap3 2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188 Systems part of #266. 2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1 Component part of #266. 2014-01-27 21:06:27 -08:00
Scott Erickson
ec37e4b7af Merge branch 'master' into feature/bootstrap3 2014-01-27 19:36:18 -08:00
Scott Erickson
baf8003dc6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-27 19:35:40 -08:00
Scott Erickson
0b7224e2f4 Tweaked the home page button. #279 2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
43193aab4a Removed a buggy transition. 2014-01-27 18:58:27 -08:00
Scott Erickson
fa8928c187 Fixed the wizard sprite on the home page again. 2014-01-27 18:55:25 -08:00
Scott Erickson
a239ba3465 Removed some more .controls from forms. 2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Michael Schmatz
57cfb2bac6 Removed server side tests due to lack of mongodb text search 2014-01-27 18:32:56 -08:00
Michael Schmatz
1e83c7bef2 Added mongodb to be started on VM boot 2014-01-27 18:28:21 -08:00
Michael Schmatz
2f33ea41f8 Added server tests to TravisCI 2014-01-27 18:22:28 -08:00
Michael Schmatz
a2028268b9 Disabled failing tests 2014-01-27 18:11:33 -08:00
Scott Erickson
096d318e96 Fixed #283 2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5 Fixed #278 2014-01-27 16:59:34 -08:00