Commit graph

376 commits

Author SHA1 Message Date
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
19c7d7b3b8 Schema is more lenient for problem we occasionally see with opponent level sessions not having a submittedCodeLanguage. Play dungeon menu music on levels of undefined terrain type. 2014-10-31 18:05:29 -07:00
Nick Winter
cec8350232 Added Missile ThangType kind and a couple misc hero data tweaks. 2014-10-30 15:56:49 -07:00
Nick Winter
98fe639010 Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor. 2014-10-29 15:34:04 -07:00
Scott Erickson
6b0a196076 Added support for internationalizing audio scripts in levels. 2014-10-29 10:38:01 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Matt Lott
f4426f2e43 Save user code errors without 'Line N: ' prefix 2014-10-24 14:05:54 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Scott Erickson
0dc050abca Added i18nCoverage backend support. 2014-10-17 12:12:06 -04:00
Nick Winter
5c40f99d99 Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit. 2014-10-14 22:38:22 -07:00
Nick Winter
ee9e32af51 Hid play/pause button for first few levels. Hid submit button until run once or won for a few more levels. 2014-10-14 11:11:56 -07:00
Nick Winter
d79d40b98c Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin. 2014-10-14 09:54:36 -07:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Scott Erickson
627c56dbb5 Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema. 2014-09-26 11:07:01 -07:00
Nick Winter
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -07:00
Nick Winter
61aa2d8b6f Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code. 2014-09-25 13:29:20 -07:00
Nick Winter
a57cc0126e A few more tweaks for #1584. Hero victory now always goes to world map. 2014-09-23 17:13:41 -07:00
David Beckley
2acebb54c6 Fix #1005 2014-09-21 23:02:06 -07:00
Nick Winter
ae14bd1ced Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564. 2014-09-20 15:18:21 -07:00
Nick Winter
95e37fa3b2 Starting new front view (at /front for now) and play view (at /play-hero for now). 2014-09-17 18:56:08 -07:00
Nick Winter
1f71a1eaf9 Fixes for loading level previews early, creating new Components, and showing names of ShowsNames Thangs. 2014-09-16 20:19:52 -07:00
Nick Winter
eb4293fee5 Temp: ThangTypes don't require kind. 2014-09-08 13:02:39 -07:00
Nick Winter
b698200cf0 A few minor fixes. 2014-09-04 15:14:27 -07:00
Scott Erickson
ef8342efdd Refactored the achievement schema, un-nesting definitions and bringing the query operator into force. 2014-09-04 11:17:06 -07:00
Scott Erickson
65c0d74a79 Added a new searchStrings property to level components to improve their search. 2014-09-03 17:33:10 -07:00
Nick Winter
ba53cb06fe Tagged Levels and ThangTypes by terrains. Terrains now control default pathfinding in AI System. 2014-09-02 14:16:41 -07:00
Nick Winter
af42bafb15 Added default goals. Don't show System versions in the Systems list if they're 0. 2014-09-01 21:58:22 -07:00
Nick Winter
632559f7db Refactored LevelLoader to load sessions after levels, so that we can do the right thing with hero levels' sessions. Made levels default to type: 'hero'. 2014-09-01 20:53:53 -07:00
Nick Winter
72eb59b7c3 Fixed a few bugs. 2014-09-01 16:14:50 -07:00
Nick Winter
6df5ca00b2 Fixed #69. 2014-09-01 13:51:30 -07:00
Nick Winter
85a9a558ef Fixed #1329. 2014-08-30 13:43:56 -07:00
Scott Erickson
b4d9a787f0 Fixed the rest of the server tests. 2014-08-29 16:28:07 -07:00
Scott Erickson
8f95ad2787 Fixed a few bugs. 2014-08-28 15:42:46 -07:00
Scott Erickson
8b943d1c2c Merged conflicts. 2014-08-28 09:59:03 -07:00
Nick Winter
3f16aaab61 Fixed a few more Backbone Mediator event validation issues. 2014-08-27 16:31:44 -07:00
Nick Winter
ee9e453896 Fixed #828. Added many other minor refactorings. 2014-08-27 12:24:11 -07:00
Nick Winter
871cd4b3c9 Fixed #784. 2014-08-26 17:34:00 -07:00
Scott Erickson
f1bf160755 Fixed merge conflict. 2014-08-26 15:42:03 -07:00
Scott Erickson
5d804c6d9a Fixed merge conflict. 2014-08-26 15:41:59 -07:00
Nick Winter
741139db59 Apparently GitHub ids are integers, not strings. 2014-08-26 11:34:33 -07:00
Scott Erickson
f92a665b8b Merge conflicts. 2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e Merged/tweaked GitHub login. 2014-08-26 08:37:11 -07:00
Scott Erickson
1406a970ea Bunch of fixes to get the level editor working again. 2014-08-25 20:34:46 -07:00
Scott Erickson
297b3e3e63 Last schema refactoring. 2014-08-24 11:19:44 -07:00
Scott Erickson
78a4000e34 Refactoring defaults in schemas. 2014-08-23 16:06:41 -07:00
Scott Erickson
0721b49216 Refactoring defaults. 2014-08-23 15:51:59 -07:00
Scott Erickson
7d797b9cd9 Removed duplicate goal schemas from the deprecated script goal properties. 2014-08-23 11:08:27 -07:00
Scott Erickson
1c5db3f2b7 First round of getting the site to use the new defaults system, in particular the job profile view. 2014-08-23 11:07:52 -07:00
Scott Erickson
76b08f35bb Removed duplicate goal schemas from the deprecated script goal properties. 2014-08-21 15:44:51 -07:00
Nick Winter
df7f1b2b9b Now have 'free' rotationType, equivalent to previous default of undefined. 2014-08-19 22:33:33 -07:00
Scott Erickson
51a831a2e7 Tweaked the goal id field schema to be a bit more stringent. Forces the id to be a slug. 2014-08-18 16:40:18 -07:00
Scott Erickson
f8d4e42c67 Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork. 2014-08-18 15:25:45 -07:00
Scott Erickson
9ee3c6f3fe Added a description to the achievement icon. 2014-08-18 15:25:45 -07:00
Scott Erickson
8233df514e Added an acceptor field to patches. 2014-08-15 10:36:21 -07:00
Ruben Vereecken
40818fd7bc GitHub Login implemented 2014-08-15 16:20:45 +02:00
Matt Lott
98bed57751 Merge pull request #1441 from differentmatt/master
Instrument user code problems
2014-08-14 16:17:47 -07:00
Matt Lott
9752c4b18a Updating user_code_problem schema types 2014-08-14 15:47:02 -07:00
Nick Winter
0f983bdcf1 Crude steps towards using your hero equipment in items levels. 2014-08-14 15:12:15 -07:00
Matt Lott
9b79e2ca27 Instrument user code problems 2014-08-14 13:32:00 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
2014-08-13 10:43:42 +02:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Ruben Vereecken
3bfd341363 Goal states are now tracked in level sessions (state.goalStates) 2014-08-08 13:10:31 +02:00
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Scott Erickson
cc025942f8 Extended the LevelLoader to load thang types and components dynamically for hero levels. 2014-08-07 18:27:47 -07:00
Nick Winter
852dabc17a Fixes for item equipping, Component saving, and terrain randomization wall snapping/overlap avoidance. 2014-08-06 07:43:56 -07:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Ruben Vereecken
15c1939657 Started on achievement setup script 2014-07-28 14:17:25 +02:00
Ruben Vereecken
cde87e4fe5 Covered general patches with tests 2014-07-23 20:00:28 +02:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Michael Schmatz
e8ffb8980f Removed filterActive from filter alerts 2014-07-21 14:47:44 -07:00
Michael Schmatz
735a7082ee Correction to filter schema 2014-07-21 10:01:49 -07:00
Michael Schmatz
6bc436aec2 Added saved employer filter alerts to schema 2014-07-21 09:44:40 -07:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Michael Schmatz
321bce121c Edited task schema 2014-07-18 14:50:31 -07:00
Michael Schmatz
ccb2ad67ac Merge pull request #1342 from codecombat/feature/mail-system
Feature/mail system
2014-07-17 07:18:39 -07:00
Michael Schmatz
ae23679a26 Hard code mail tasks and add unsubscribe 2014-07-16 16:37:06 -07:00
Michael Schmatz
b74bdfbf51 Added metadata to mail sent schema 2014-07-16 12:12:11 -07:00
Michael Schmatz
bb3c583300 Add approved date to job profile 2014-07-16 10:51:45 -07:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02:00
Nick Winter
17ba4bc8a7 Starting to limit some property documentation to specific code languages. Fixed Criss-Cross squares on frame 0. Removed comment box highlighting from the gutter. 2014-07-11 18:07:00 -07:00
Scott Erickson
a3c524424c Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users 2014-07-10 11:13:28 -07:00
Nick Winter
9ee373428f Fixed some schema issues related to snippets and code languages. 2014-07-10 08:31:40 -07:00
Michael Schmatz
013ace65f6 Basic email structure plus distributed locking system 2014-07-09 16:24:14 -07:00
Nick Winter
44e5c2826c Proper Treema node behavior for different code languages in default code, property documentation, and snippets. 2014-07-09 11:59:27 -07:00
Ruben Vereecken
ac95d775e6 Users can now be gotten by slug 2014-07-09 20:23:05 +02:00
Michael Schmatz
08b9a8fdaa Various changes to education filter 2014-07-07 21:04:12 -07:00
Michael Schmatz
30745a25ca Consolidated iOS and Android into Mobile 2014-07-07 20:24:29 -07:00
Michael Schmatz
285c7ff049 Added school changes to schema 2014-07-07 20:05:28 -07:00
Michael Schmatz
cef8fe074a Add mobile developer to the schema 2014-07-07 20:03:02 -07:00
Michael Schmatz
30671d82f6 Removed PM and Management from filters 2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Michael Schmatz
0305374580 Add featured field to curation 2014-07-07 10:42:16 -07:00
Ruben Vereecken
51bc8e5a7c Merged master 2014-07-06 20:07:47 +02:00
Ruben Vereecken
601c4e2731 Merged with master 2014-07-05 16:47:16 +02:00
Tery Lim
a5476f90ed Minor cleanup for convention and readability 2014-07-05 18:48:08 +08:00
Ruben Vereecken
a367082cc4 Corrected statistic logic, wrote test case 2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b All edits are now tracked
intermediate

intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
1fe2c67ffe Added tests for repeatable achievements, including complicated xp
Intermediate
2014-07-04 19:27:37 +02:00
Tery Lim
9090ce7714 Merge master into branch 2014-07-04 22:37:16 +08:00
Michael Schmatz
e54b190918 Added shortDescription 2014-07-03 10:02:42 -07:00
Michael Schmatz
1adefbb3b6 Update user schema (to avoid cherry picking) 2014-07-02 11:50:44 -07:00
Tery Lim
618ade4946 Clean up mixed quotes 2014-07-01 12:23:22 +08:00
Michael Schmatz
2dd4ba6203 Increased max skills from 30 to 40 2014-06-30 16:43:31 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Tery Lim
f03f8da50a Remove extra spaces 2014-06-22 16:42:06 +08:00
Tery Lim
32868b565d Fix typo 2014-06-22 16:39:51 +08:00
Tery Lim
88c84911b7 Remove trailing comma 2014-06-22 16:39:07 +08:00
Michael Schmatz
51923459e0 Changed autocomplete to on by default 2014-06-19 10:44:44 -07:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Dominik Kundel
e756c83d9e preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:14:31 +01:00
Dominik Kundel
603766b8c5 preliminary autocomplete. THIS IS NOT A WORKING STATUS. ONLY COMMIT TO PULL CHANGES 2014-06-13 16:12:55 +01:00
Ruben Vereecken
bd2b289943 Recalculate script mainly finished 2014-06-12 19:40:59 +02:00
Ruben Vereecken
a61d0e5569 Added support for diminished exp for repeatables. Needs tweaking though. 2014-06-12 19:40:59 +02:00
Ruben Vereecken
5aa211cabd Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a Created a test environment for repeatables 2014-06-12 19:40:59 +02:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Scott Erickson
f0ff8c242e Migrating language to codeLanguage on systems and components because they conflict with the search system. 2014-06-10 13:20:14 -07:00
Michael Schmatz
4072c1b969 Basic functionality done, needs validation error handling
As well as formatting
2014-06-07 11:45:49 -07:00
Ruben Vereecken
8d2c62ba84 Got repeatables working flawlessly and improved the achievement popup by a great deal 2014-06-02 20:34:05 +02:00
Ruben Vereecken
d766a24e11 Achievements now popup when polled for by the client 2014-06-02 20:33:01 +02:00
Ruben Vereecken
aa3fedeb02 Achievements can have icons. Users now have their scores denormalized 2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f Achievement queries are now strings server sided but remain objects for the client 2014-06-02 20:32:00 +02:00
Ruben Vereecken
1b2a251c58 Achievement editor in place and looking mighty fine 2014-06-02 20:31:09 +02:00
Ruben Vereecken
c2d2f2a2b8 Refactorings performed necessary to have searchable for more uses 2014-06-02 20:31:09 +02:00
Ruben Vereecken
a3ca382dcd Used the feedback from Scott to improve endpoints 2014-06-02 20:29:12 +02:00
Ruben Vereecken
df60402d00 Added test 2014-06-02 20:29:12 +02:00
Ruben Vereecken
37b47d35de Got work done on detecting achievements 2014-06-02 20:29:12 +02:00
Ruben Vereecken
f2f4fef1e0 Wrote tests for the local mongo querier 2014-06-02 20:29:11 +02:00
Ruben Vereecken
99927d1345 Started on the local mongo querier 2014-06-02 20:29:11 +02:00
Ruben Vereecken
2f5090df8f Added schema objectIds and bettered the repeatable achievements 2014-06-02 20:29:11 +02:00
Ruben Vereecken
f5389fef99 Got the basic achievement schemas up. Still need proper references 2014-06-02 20:29:11 +02:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Nick Winter
f3adc216ed Protecting our replacement of Math.random via Aether. 2014-05-29 12:26:08 -07:00
Nick Winter
ec0027043b Added experimental Io language from Aether. 2014-05-26 08:59:48 -07:00
Michael Schmatz
585b907f4e More temp fixes for 422s 2014-05-21 10:29:16 -07:00
Michael Schmatz
02f8458dfe Temp fix for occasional 422 2014-05-21 10:16:01 -07:00
Michael Schmatz
b8dc4ed939 Stopgap solution for totalScore being string 2014-05-19 14:58:08 -07:00
Michael Schmatz
2e36a3352e Modified level session schema to log playtime, renormalize score and name in matches 2014-05-16 14:13:59 -07:00
Michael Schmatz
4e268d8dc6 Add codeLanguage to level session 2014-05-14 16:41:02 -07:00
Scott Erickson
cab1adf8fc Merge branch 'master' into feature/thangload 2014-05-14 09:31:59 -07:00
Nick Winter
ab37646cb6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-13 11:04:20 -07:00
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -07:00
Michael Schmatz
961fea7d5c Update level session schema 2014-05-13 10:49:02 -07:00
Nick Winter
1aa72541ff Merged master into feature/thangload. 2014-05-12 09:57:31 -07:00
Nick Winter
0b5854765a Adding Clojure and Lua as choosable languages. 2014-05-11 22:51:44 -07:00
Nick Winter
589410ed8e Merged master into feature/thangload. 2014-05-09 12:56:58 -07:00
Nick Winter
81634190ef Added i18n for translating specific articles now, too. 2014-05-05 19:14:38 -07:00
Scott Erickson
aee90c72bb Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel. 2014-05-02 17:03:30 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
Scott Erickson
cfbd7b9b12 Fixed #911 2014-04-24 11:51:00 -07:00
Nick Winter
ab77176ed0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-22 11:11:10 -07:00
Nick Winter
675db1b76f Don't require CocoModel instantiation before schemas are included. Reload neutral spells on reload. Fix for adding Components to Thangs. Surface background: darkness, no parents. 2014-04-22 11:11:08 -07:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Nick Winter
e49344bd87 A few job profile fixes and cleanup. 2014-04-15 10:45:54 -07:00
Nick Winter
9194f842e6 Added some job description fields. 2014-04-15 09:28:19 -07:00
Scott Erickson
30f785f7cf Moved the model schemas into a models folder. 2014-04-12 10:51:02 -07:00