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