Nick Winter
891b78eb44
Hiding some ThangTypes from view in level editor.
2014-11-29 10:34:04 -08:00
Nick Winter
d2aabbdacc
A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.
2014-11-29 08:43:40 -08:00
Nick Winter
383f215b36
Merge branch 'master' into production
2014-11-28 19:40:00 -08:00
Scott Erickson
31214e854e
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
2014-11-28 17:49:41 -08:00
Nick Winter
4b45385571
Working on paper dolls.
2014-11-28 12:11:59 -08:00
Michael Schmatz
980b5f7580
Merge branch 'master' into production
...
Conflicts:
server_setup.coffee
2014-11-28 14:40:07 -05:00
Michael Schmatz
6cb46aafa8
Link to Papertrail logs in error messages
2014-11-28 14:37:55 -05:00
Michael Schmatz
897fe6c63e
Improved error handling
2014-11-28 11:44:03 -05:00
Michael Schmatz
2574549a78
Improved error handling
2014-11-28 11:37:31 -05:00
Michael Schmatz
3475770f13
Merge branch 'master' into production
2014-11-28 11:09:07 -05:00
Michael Schmatz
0ac0065753
Fixed payments
2014-11-28 11:07:37 -05: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
318b499e3e
Merge branch 'master' into production
2014-11-26 12:57:10 -08:00
Scott Erickson
c4fdcab6fe
The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.
2014-11-26 12:02:42 -08:00
Nick Winter
98d8a2cfb3
Merge branch 'master' into production
2014-11-25 16:54:36 -08:00
Scott Erickson
790217f227
Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.
2014-11-25 16:22:06 -08:00
Nick Winter
ab6251281e
Added a payment-received HipChat notification.
2014-11-25 13:20:09 -08:00
Scott Erickson
8f55b9bc1b
Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.
2014-11-25 12:43:17 -08:00
Nick Winter
621764aa0c
Merge branch 'master' into production
2014-11-25 09:28:54 -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
Michael Schmatz
a3a3aea6aa
Merge branch 'master' into production
2014-11-25 11:21:30 -05:00
Michael Schmatz
2b8006ff83
Fixing more crashing bugs
2014-11-25 11:20:39 -05:00
Michael Schmatz
3ab8620745
Merge pull request #1798 from codecombat/master
...
Fixed a few crashing bugs
2014-11-25 10:57:31 -05:00
Michael Schmatz
30e08e2c99
Fixed a few crashing bugs
2014-11-25 10:52:20 -05:00
Michael Schmatz
2300cab908
Merge pull request #1797 from codecombat/master
...
Merge master into production
2014-11-25 10:02:51 -05:00
Michael Schmatz
d56f594d58
Better error handling
2014-11-24 20:07:29 -05:00
Nick Winter
16e264788a
Trying to workaround a crash I saw in the logs for GitHub auth.
2014-11-24 14:38:54 -08:00
Nick Winter
38c3ed8856
Merge branch 'master' into production
2014-11-23 20:13:43 -08:00
Matt Lott
c16b0f97bf
Update sync PVP to use transpiledCode
2014-11-22 20:48:07 -08:00
Scott Erickson
03705825d9
Made the GET /db/* endpoints generally accessible without needing to have a user object associated with the request.
2014-11-22 18:41:06 -08:00
Nick Winter
472b05a5e0
Merge branch 'master' into production
2014-11-21 13:09:02 -08:00
Scott Erickson
e5b87e5158
Tweaked, re-enabled achievement specs.
2014-11-21 10:59:48 -08:00
Scott Erickson
c77d38d59f
Made sure Apple receipts can't be re-used with different accounts.
2014-11-21 10:34:37 -08:00
Nick Winter
527d9355e7
Merge branch 'master' into production
2014-11-21 10:05:01 -08:00
Nick Winter
4de71507a8
Fixed winston require in EarnedAchievement handler.
2014-11-21 10:04:50 -08:00
Nick Winter
66f946a881
Merge branch 'master' into production
2014-11-20 22:17:41 -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
Nick Winter
a15f25e155
Merge branch 'master' into production
2014-11-20 22:02:18 -08:00
Nick Winter
2393165d9a
Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found.
2014-11-20 21:57:47 -08:00
Nick Winter
29cbf16dd7
Merge branch 'master' into production
2014-11-20 19:32:37 -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
fae09aad00
Turned on double optin for MailChimp.
2014-11-20 14:31:50 -08:00
Nick Winter
df51e28a1d
Fixed camera zoom killing coordinate hover unnecessarily.
2014-11-20 11:37:10 -08:00
Nick Winter
bfeb1457a1
Merge branch 'master' into production
2014-11-19 18:36:40 -08:00
Scott Erickson
13de055c0b
Set up a basic achievements list modal for the world map.
2014-11-19 14:56:40 -08:00
Nick Winter
2574f85f3e
Merge branch 'master' into production
2014-11-17 21:30:57 -08:00
Nick Winter
bf71893ddf
Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.
2014-11-17 21:30:44 -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
Matt Lott
f56d01419f
Update sync pvp teams and real-time playback
...
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
Nick Winter
d9fb5e9f6c
Merge branch 'master' into production
2014-11-17 09:29:13 -08:00
Nick Winter
a7069e19bd
Ignore (and warn about) achievements with empty queries. Fixed embarrassing bug with more-practice / skip-ahead branching not doing anything for non-admins.
2014-11-17 08:44:53 -08:00
Nick Winter
6b92df2e41
Merge branch 'master' into production
2014-11-12 18:44:53 -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
Nick Winter
0f4290078c
Merge branch 'master' into production
2014-11-12 11:02:10 -08:00
Nick Winter
26beb8a034
A few improvements to ItemDetailsView formatting to deal with spells granted.
2014-11-12 11:02:05 -08:00
Nick Winter
3a8a5354aa
Merge branch 'master' into production
2014-11-11 18:16:52 -08:00
Scott Erickson
7012d5dfbe
Built payment endpoint for processing Apple IAPs.
2014-11-11 17:40:29 -08:00
Nick Winter
b50704597a
Merge branch 'master' into production
2014-11-11 16:37:22 -08:00
Nick Winter
0af7b4d5b7
Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories.
2014-11-11 16:37:00 -08:00
Scott Erickson
12e860a985
Fixed #1739 . Darnit mongoose.
2014-11-11 14:52:43 -08:00
Nick Winter
40081fc853
Merge branch 'master' into production
2014-11-10 22:08:12 -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
ce4567c868
Merge branch 'master' into production
2014-11-10 18:19:02 -08:00
Scott Erickson
f21f54cd19
Refactored, mostly redesigned inventory view, modeled after the Heald item store design.
2014-11-10 15:31:32 -08:00
Nick Winter
c9a7a2ea0a
Merge branch 'master' into production
2014-11-10 15:18:06 -08:00
Nick Winter
b33fee406b
Server now logs the messages of its bad responses instead of just sending them to the client. Added a script that migrated bad ObjectIds in purchased items.
2014-11-10 13:27:40 -08:00
Nick Winter
9c009a626f
Merge branch 'master' into production
2014-11-06 07:26:22 -08:00
Nick Winter
851bf39c5c
Using extendedName.
2014-11-05 20:22:15 -08:00
Scott Erickson
8edde2f470
Fixed purchased items and such in the user so that they're strings instead of ObjectIds.
2014-11-05 16:41:03 -08:00
Nick Winter
cfd3e23c14
Merge branch 'master' into production
2014-11-04 08:44:25 -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
a4c12a32a4
Merge branch 'master' into production
2014-10-30 20:05:42 -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
47c090f7c7
Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of.
2014-10-30 13:07:04 -07:00
Nick Winter
7e389d4084
Merge branch 'master' into production
2014-10-29 22:29:57 -07:00
Nick Winter
ea349cfa29
Intermediate query state for heroes while still transitioning from Unit to Hero.
2014-10-29 15:54:51 -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
Nick Winter
60bf580c5b
Bumped Handler fetch limit from 300 to 500 to deal with 300+ ThangTypes. It's great.
2014-10-29 12:18:00 -07:00
Nick Winter
ee07d53671
Merge branch 'master' into production
2014-10-28 22:18:35 -07:00
Nick Winter
c7713b4105
Showing i18n in property docs.
2014-10-28 21:15:47 -07:00
Scott Erickson
ee95e4e450
Got rid of a race condition.
2014-10-28 11:21:26 -07:00
Nick Winter
68ac412f2b
I think this return is needed to prevent sending the i18n query results twice and crashing the server.
2014-10-27 22:54:50 -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
Nick Winter
ab46a47a78
Merge branch 'master' into production
2014-10-27 16:37:28 -07:00
Matt Lott
8f923f9e1e
Replacing http PATCHs with PUTs
...
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
2014-10-27 16:09:52 -07:00
Nick Winter
f426ec270f
Merge branch 'master' into production
2014-10-25 11:51:54 -07:00
Matt Lott
f4426f2e43
Save user code errors without 'Line N: ' prefix
2014-10-24 14:05:54 -07:00
Nick Winter
0a615fc24e
Merge branch 'master' into production
2014-10-21 13:58:18 -07:00
Scott Erickson
cd8f5800a6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-21 10:21:46 -07:00
Nick Winter
fcb8a08d13
Merge branch 'master' into production
2014-10-20 17:04:05 -07:00
Nick Winter
700b460f91
Fixed bug in fetching submitted ladder sessions that hadn't been scored yet.
2014-10-20 17:00:46 -07:00
Nick Winter
5f78f57c85
Merge branch 'master' into production
2014-10-20 08:31:50 -07:00
Nick Winter
08d9e39764
LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests.
2014-10-19 21:56:26 -07:00
Nick Winter
4278863c34
Merge branch 'master' into production
2014-10-18 14:56:27 -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
33dda4cdf9
Merge branch 'master' into production
2014-10-14 22:38:32 -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
Scott Erickson
6ff7cd12cc
Mostly done with the victory modal.
2014-10-13 11:53:08 -04:00
Nick Winter
b2e6bcf872
Merge branch 'master' into production
2014-10-02 17:04:47 -07:00
Nick Winter
16ff8c6601
Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.
2014-10-02 12:10:24 -07:00
Nick Winter
a1cd43681f
Merge branch 'master' into production
2014-10-01 17:02:22 -07:00
Nick Winter
3871b60ea7
Actually committing last of earned_achievement_handler fixes.
2014-10-01 08:50:07 -07:00
Nick Winter
06ceb9b589
Merge branch 'master' into production
2014-09-30 19:32:40 -07:00
Nick Winter
8d37309de1
Several fixes for achievement recalculation.
2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3
Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle.
2014-09-30 16:18:32 -07:00
Scott Erickson
8adbd87401
Merge branch 'master' into feature/webgl
2014-09-28 10:38:19 -07:00
Michael Schmatz
858b24a73d
Removed superfluous comment
2014-09-27 09:06:53 -04: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
Nick Winter
1a46d4345d
Merge pull request #1584 from ThatOtherPerson/log-user-ips
...
Log last-used IP in User object
2014-09-23 17:10:00 -07:00
Nick Winter
1b4e75e7e8
Fix for earned achievement default null worths. Misc other fixes.
2014-09-22 20:15:51 -07:00
Nick Winter
c54bf3553f
Added basic JSONP support for /auth/whoami public properties.
2014-09-22 14:56:02 -07:00
David Beckley
2acebb54c6
Fix #1005
2014-09-21 23:02:06 -07:00
Nick Winter
42b52f5593
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
2014-09-21 22:10:52 -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
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93
Fixed a few misc bugs I noticed with the job profiles.
2014-09-19 22:16:05 -07:00
Nick Winter
bbb6300f1f
Merge pull request #1576 from ThatOtherPerson/fix-misnaming
...
Renamed sendUnauthorizedUser to sendForbiddenError
2014-09-19 08:19:42 -07:00
Nick Winter
d610b1633f
A bit more CoffeeScripty on the style. Fixes #1558 .
2014-09-19 08:17:30 -07:00
David Beckley
527c1ed79d
Fix issue #8
2014-09-19 03:52:34 -07:00
David Beckley
b9a511155e
Remove sendUnauthorizedError, as it merely returned the same value (HTTP 403) as sendForbiddenError
2014-09-19 02:26:18 -07:00
Nick Winter
851ad43b45
Made some more User properties private.
2014-09-10 21:56:21 -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
Scott Erickson
5fc7caec64
Disabling an error that occurs on the dev server with the partial db.
2014-09-03 17:26:43 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -07:00
Nick Winter
040ac4ff4e
Fixed bug with black flashes during script playback.
2014-08-31 16:05:21 -07:00
Nick Winter
5f132e55ba
Fixed #1414 . Also started lazily loading certain level editor tabs.
2014-08-30 23:04:45 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
4d24233b0d
Fixed #1356 .
2014-08-30 15:19:42 -07:00
Nick Winter
e5cf6c340b
Fixed #1140 . I just put it on the home page for now, but later we can put it somewhere where it makes sense.
2014-08-29 23:09:38 -07:00
Scott Erickson
0ba9db6c14
Fixed some server tests.
2014-08-29 12:58:23 -07:00
Scott Erickson
f54c3236ab
Refactored Achievement's getExpFunction to use the new defaults system, now on the server side.
2014-08-29 12:41:25 -07:00
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Nick Winter
124f999bc8
Fixed #1105 . Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
2014-08-28 19:39:46 -07:00
Nick Winter
f74a152942
Fixed #1104 .
2014-08-28 18:55:33 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
28431703f5
Fixed #953 .
2014-08-27 22:23:24 -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
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
Nick Winter
28176c7f72
Misc workarounds.
2014-08-20 13:26:48 -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
