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

354 commits

Author SHA1 Message Date
Matt Lott
f0bee3fd98 Normalize clan owner data 2015-04-03 09:52:25 -07:00
Matt Lott
56342ad993 Normalize clan members data 2015-04-02 17:00:28 -07:00
Matt Lott
482b66b8a4 Create and list clans 
Replace mock data with some real functionality.
 2015-04-01 11:56:48 -07:00
Nick Winter
b4ea78e5cb Implementing alternative pricing with Alipay in China to support dedicated China server. 2015-03-23 15:26:44 -07:00
Matt Lott
fec3ac38e9 Prepaid subscriptions 
Admins can generate a prepaid code, which a user can use to subscribe
for free via the account/subscription page.
The subscription will be identical to the normal monthly subscription
(e.g. 3500 gems per month), except they won’t be charged.
Does not require the recipient to enter billing information.
Can be applied to an existing subscription, which will be converted to
free.
Prepaid code can only be used once.
Prepaid subscription cannot be unsubscribed via the UI.
 2015-03-19 15:04:15 -07:00
Nick Winter
585fa40a8c Added first draft of campaign info to campaign selector screen. 2015-03-18 16:20:30 -07:00
Matt Lott
af89452b93 Merge branch 'sponsored-subs' 2015-03-13 15:19:20 -07:00
Nick Winter
54f55b1f9d Adding polls as patchable. 2015-03-09 11:48:13 -07:00
Nick Winter
f5633f05dc Merge pull request #2414 from h3yduck/lock_issue 
Only lock spacebar and default code when the player is lower level (issue 2406)
 2015-03-09 10:37:40 -07:00
Nick Winter
495845a633 Storing certain poll results in User object. Showing a poll once per day. 2015-03-09 09:30:51 -07:00
Nick Winter
e21360127d Polls! 2015-03-08 16:36:17 -07:00
Matt Lott
cd59b90e37 Add custom payments 
Example:
https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip
tions
 2015-03-04 15:40:53 -08:00
Nick Winter
2d18bcf9f0 Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level. 2015-03-03 09:04:53 -08:00
Szabolcs Gelencser
58f2494c83 update campaign.schema.coffee also 2015-02-27 18:16:16 +01:00
Szabolcs Gelencser
dde3e8cf8f Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired 2015-02-27 17:33:38 +01:00
Matt Lott
52bc660391 Add external subs script 2015-02-26 08:44:56 -08:00
laituan245
a588a3b2c8 Some updates to the PR #2359 2015-02-25 02:12:39 +09:00
Nick Winter
1795891933 Added new pow function for simulated ladder games achievement. 2015-02-18 09:06:32 -08:00
Nick Winter
a8dc353f86 Aether now loading all code languages possibly used in a match before the level can begin. Hopefully, this will fix #1943 and fix #1892. 2015-02-12 18:40:38 -08:00
Nick Winter
7000048bee Fixed a few more issues with the headless simulator. 2015-02-12 17:07:29 -08:00
Nick Winter
63fa2f86d4 Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code. 2015-02-11 20:24:12 -08:00
Matt Lott
f6bcc94bf8 Fix oneTimes email schema 
Changing ‘targetEmail’ field to ‘email’.
 2015-02-06 09:47:06 -08:00
Scott Erickson
f9ee100e73 Made Achievements and Campaigns patchable. 2015-02-05 12:01:19 -08:00
Scott Erickson
f7403a6b77 Fixing #1866 2015-02-05 10:56:58 -08:00
Matt Lott
c842f45786 Update subscribe modal with parent help button 2015-02-04 13:54:38 -08:00
Nick Winter
c977ecc16f Adding easy observing of leaderboard matches (except top 5). 2015-01-31 10:04:11 -08:00
Nick Winter
e59f2bcc62 Recording scores even for non-real-time-submit levels. 2015-01-30 22:06:22 -08:00
Nick Winter
022d31c19a Basic leaderboards are working. 2015-01-30 21:36:48 -08:00
Matt Lott
a092444455 Add browser info to level session 2015-01-30 14:45:36 -08:00
Nick Winter
57d12c199e Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet. 2015-01-29 09:07:25 -08:00
Nick Winter
64008276c2 Finally translating level names and descriptions in the campaign view. 2015-01-22 11:22:35 -08:00
Matt Lott
c5977c00fe Add shortened fields to analytics.log.event 
We’ll remove the old long fields after we’ve got enough data to switch
over our analytics queries without complication.
 2015-01-14 17:51:34 -08:00
Matt Lott
e79cadc761 Remove analytics.log.event created field 
_id field already has created data:
http://docs.mongodb.org/manual/reference/object-id/
Also some misc analytics cleanup.
 2015-01-14 13:03:02 -08:00
Matt Lott
3fd5f49220 Analytics data revamp 
Add analytics per-day aggregation collection.
Add analytics strings collection.
Add per-day aggregation mongo insertion script.
Update campaign editor to use aggregation collection.
Update queries to use _id instead of created field.
 2015-01-14 11:09:01 -08:00
Nick Winter
5c352699b0 buildTime stuff. 2015-01-10 09:33:41 -08:00
Scott Erickson
c8298679a4 Tweaked achievement notification handling, also disabling an endless loop of achievement fetching. 2015-01-09 12:38:00 -08:00
Scott Erickson
d8e89f31b1 Fixed #1967. 2015-01-08 11:29:10 -08:00
Nick Winter
1455dc0550 Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet. 2015-01-07 12:25:43 -08:00
Nick Winter
947811c01b Replayable once-per-day increasing-difficulty level basics. 2015-01-05 10:44:24 -08:00
Nick Winter
dbc42fb7e1 Added task system to Thang Editor. 2015-01-01 14:07:11 -08:00
Nick Winter
1440584633 Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting. 2014-12-29 12:47:53 -08:00
Nick Winter
744d30737e Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents. 2014-12-28 13:25:20 -08:00
Scott Erickson
0bdec68cfc Set up a save button. 2014-12-22 16:21:57 -05:00
Scott Erickson
0dd2d9efbd Handled merge conflict. 2014-12-22 12:33:52 -05:00
Scott Erickson
efc83b88d0 Hooked up the CampaignView to show adjacent campaigns based on the data. 2014-12-22 10:29:29 -05:00
Nick Winter
e8d185a860 Embedding level completion checklist inside the level editor. 2014-12-20 20:01:07 -08:00
Scott Erickson
0cd85d7aba Got the CampaignView mostly off the hardcoded data. 2014-12-19 16:46:01 -05:00
Scott Erickson
59318b2f78 Merge branch 'master' into feature/campaign-editor 2014-12-19 12:54:11 -05:00
Scott Erickson
b63b4d64da More work on the CampaignEditorView. Data gets saved to models now. 2014-12-17 22:53:04 -08:00
Scott Erickson
1cc6a97e43 Added basic campaign view, working on campaign handlers. 2014-12-16 17:46:24 -08:00
Matt Lott
c76662c967 Log analytics events internally 2014-12-15 11:45:12 -08:00
Scott Erickson
0b81796333 Created the Campaign foundation: schema, model, handler. 2014-12-11 11:26:28 -08:00
Nick Winter
708f0e543c Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes. 2014-12-06 11:33:57 -08:00
Scott Erickson
d0ee8cb7c7 Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided. 2014-12-04 17:41:27 -08:00
Nick Winter
8318606457 Added a slot for the wizard hand hero doll images. 2014-12-04 14:35:25 -08:00
Nick Winter
a7eaac773d Fixed some ranger paper doll stylings and a typo in the femaleRangeThumbr item doll image schema. 2014-12-04 13:30:20 -08:00
Matt Lott
e3abb9ceb3 Capture active user metrics 
Watching for these events:
Level completed
User registered
Playtime of 30s in a level
Purchase
Payment
Subscribe
Earned an achievement
 2014-12-04 12:57:57 -08:00
Scott Erickson
7025f0a488 Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up. 2014-12-04 11:56:14 -08:00
Nick Winter
1f2408a99f Can actually edit requiresSubscription on levels. 2014-12-03 15:50:34 -08:00
Nick Winter
50ec896fd8 Added a requiresSubscription property to the levels. 2014-12-03 11:46:03 -08:00
Scott Erickson
cd3bb690f4 Created stripe subscription logic. 2014-12-02 20:02:35 -08:00
Scott Erickson
5dcdabfd62 Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there. 2014-12-02 11:47:15 -08:00
Nick Winter
8c7e62b9bd Added back doll image buckets. 2014-12-01 18:19:20 -08:00
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Nick Winter
915a3243f5 Added feature image hair and thumb slots to the ThangType. 2014-11-26 16:29:48 -08:00
Nick Winter
53c6da5ef8 Allowing upload of paper doll images for items. 2014-11-26 14:18:17 -08:00
Nick Winter
98f1eec10c Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs. 2014-11-25 09:28:50 -08:00
Scott Erickson
994584f13a Shapes now handle radial gradient fills. Handled one sprite (new Anya attack) export including initializing a container with movie clip arguments for no apparent reason, so loosened SpriteParser a bit to handle this. 2014-11-23 09:39:02 -08:00
Scott Erickson
b86e3c30dc Set up level achievements to be created manually by the client, hopefully making them a bit more stable. 2014-11-20 22:09:54 -08:00
Michael Schmatz
f84e92595b Changed UDID to identifierForVendor 2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065 Added the ability to assign a user an iOS UDID, and login with it. 2014-11-20 15:54:15 -08:00
Scott Erickson
95dca575d1 Set up stripe on the server and site to allow purchases through the website. 2014-11-17 15:15:08 -08:00
Nick Winter
f9a7aba5d9 Some fixes for programmatically generated flag events not polluting session flag history. 2014-11-15 16:56:35 -08:00
Scott Erickson
025780a575 Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing. 2014-11-12 15:00:24 -08:00
Scott Erickson
913dda65aa Created the VectorIconSetupModal, a quick way to get portraits aligned to a container. 2014-11-12 14:14:07 -08:00
Scott Erickson
7012d5dfbe Built payment endpoint for processing Apple IAPs. 2014-11-11 17:40:29 -08:00
Nick Winter
ce04541d3a Working on tying item purchasability to player level, plus other small tweaks to the item store. 2014-11-10 22:07:55 -08:00
Nick Winter
851bf39c5c Using extendedName. 2014-11-05 20:22:15 -08:00
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