Nick Winter
98d8a2cfb3
Merge branch 'master' into production
2014-11-25 16:54:36 -08:00
Nick Winter
9fe5e277a3
Forcing a Programmaticon II upgrade when you get it.
2014-11-25 16:54:24 -08:00
Scott Erickson
425da04ab6
Looks like I left a wee bit of debugging code in PlayItemsModal, and it was messing things up.
2014-11-25 16:27:42 -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
Scott Erickson
b018746565
Switched the ThangNamesCollection to use GET instead of POST.
2014-11-25 16:22:05 -08:00
Nick Winter
0b4bc61b01
Exposed home slogan for the smaller screens. Re-hid App Store button for now.
2014-11-25 14:31:24 -08:00
Scott Erickson
464f06c031
Turned off saving automatically when you toggle subscriptions in the AccountSettingsView, as it was triggering the PlayAccountModal to save and close.
2014-11-25 13:32:43 -08:00
Scott Erickson
0f29e098cc
ThangTypes with empty portraits now upload them with blank images, to overwrite extant portraits.
2014-11-25 13:28:28 -08:00
Nick Winter
c2f77470a0
Fixed a couple typos Jade was complaining about.
2014-11-25 13:26:04 -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
ShadowTrainer
28acb28912
Update tr.coffee
2014-11-25 21:23:43 +02:00
Scott Erickson
426202d80a
Added a simple payments page.
2014-11-25 11:09:29 -08:00
Scott Erickson
b27ac94382
Fixed the loading screen in the new site-chrome. As a result, found and removed all the extraneous loading logic from MainAccountView.
2014-11-25 11:06:34 -08:00
Nick Winter
8cd77a084c
Merge branch 'master' into production
2014-11-25 10:58:40 -08:00
Scott Erickson
2a135eeaf1
Reworked the account modal links and a little bit of the styling.
2014-11-25 10:39:53 -08:00
Scott Erickson
bb766e9610
Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit.
2014-11-25 10:39:53 -08:00
Scott Erickson
6b8a9593ef
Set up the new site chrome to compress when the height of the screen is < 800px tall.
2014-11-25 10:39:53 -08:00
Nick Winter
bbc9b615ea
ItemDetailsView showing item descriptions now.
2014-11-25 10:28:31 -08:00
Nick Winter
5c77eea304
You can now buy heroes.
2014-11-25 10:15:10 -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
Matt Lott
3c161268f0
Don't register createjs.FlashPlugin if undefined
...
This was completely breaking IE 11/10/9. Audio still seems to work
fine with this change.
2014-11-25 12:19:16 -05: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
d7f8a212a4
Merge pull request #1796 from Imperadeiro98/master
...
Update pt-PT
2014-11-24 14:09:26 -08:00
Imperadeiro98
77c7381e40
Update pt-PT.coffee
2014-11-24 19:55:12 +00:00
Imperadeiro98
6cd32857ac
Update pt-PT.coffee
2014-11-24 19:35:07 +00:00
Nick Winter
9accd0cb04
You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more.
2014-11-24 10:51:20 -08:00
Aase Mestad
5a10ec8a23
Some norwegian updates
2014-11-24 18:18:40 +01:00
Nick Winter
f9e6c167bc
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-24 09:06:05 -08:00
Nick Winter
a1ebdb7101
Adjusted amount of items you can buy so that you can theoretically spend much more than you earn, while still not unlocking powerful stuff too early.
2014-11-24 09:05:59 -08:00
Matt Lott
48d5dd9dc6
Make sync pvp level sessions publicly readable
2014-11-23 23:49:03 -08:00
Matt Lott
6b7e146084
Reduce problem alert jiggle duration to 1s
2014-11-23 21:58:29 -08:00
ccdarkness
1ce776f9e2
Update zh-HANS.coffee
2014-11-24 12:54:38 +08:00
Nick Winter
38c3ed8856
Merge branch 'master' into production
2014-11-23 20:13:43 -08:00
Nick Winter
b87cf462fc
Shrinking home page height as much as easily possible to be able to fit it on anyone's screen.
2014-11-23 20:13:06 -08:00
Nick Winter
cbf3aab374
Removed hero team color in non-multiplayer levels.
2014-11-23 20:04:07 -08:00
Nick Winter
df162080c3
Totally hid code stepper toolbar for now, since it's proving difficult to make room for it in the new design.
2014-11-23 19:40:50 -08:00
nadian
b429e5f26a
Update id.coffee
2014-11-24 08:45:21 +07:00
Matt Lott
c203ff15a2
Fix sync PVP opponent syncing issue
...
Ripped out backfire from PlayLevelView so we have more control over
data synchronization. These changes should wait properly for the
opponent data to load before blazing ahead, after a PlayLevelView
reload.
Fixes #1767
2014-11-23 17:15:59 -08:00
Nick Winter
0c8b5ec9a8
Turned off dead Thang underlayering when in the air.
2014-11-23 16:06:28 -08:00
Nick Winter
1535b6bdd2
Fixed play footer in new styling regime.
2014-11-23 15:48:08 -08:00
Nick Winter
1cd781233c
Press enter to start level, esc to skip real-time playback. Reduced likelihood of repetetive aural say messages. Updated required code for Bonemender.
2014-11-23 15:25:12 -08:00
George Saines
e7a5cadfb0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-23 13:32:31 -08:00
