Nick Winter
|
000e652f56
|
Merge branch 'master' into production
|
2014-11-14 11:04:40 -08:00 |
|
Scott Erickson
|
36305cde97
|
Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window.
|
2014-11-14 11:04:24 -08:00 |
|
Nick Winter
|
635c4e18df
|
Restricted Roughedge and Sharpened Sword for Kithgard Gates Builder's Hammer swap, too.
|
2014-11-14 11:03:01 -08:00 |
|
Nick Winter
|
99e47064af
|
Merge branch 'master' into production
|
2014-11-14 09:24:57 -08:00 |
|
Nick Winter
|
7e12c10649
|
Temporarily disabled code toolbar for a few more levels. Worked around The First Kithmaze / Haunted Kithmaze switch for preventing level unlock problems.
|
2014-11-14 09:24:42 -08:00 |
|
Nick Winter
|
5fde9e6a64
|
Merge pull request #1740 from ann304/patch-1
Update vi.coffee
|
2014-11-14 06:59:17 -08:00 |
|
sunxb10
|
1c560511c3
|
Simplified Chinese translation (zh-HANS)
|
2014-11-14 18:01:51 +08:00 |
|
Nick Winter
|
2f1ed2f8b9
|
Merge branch 'master' into production
|
2014-11-13 10:55:22 -08:00 |
|
Nick Winter
|
01d6c6d239
|
Stop whole-line selection on gutter clicks.
|
2014-11-13 10:54:50 -08:00 |
|
Nick Winter
|
05a3577de9
|
Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.
|
2014-11-13 10:49:37 -08:00 |
|
Imperadeiro98
|
4c8d959c8a
|
Update achievements.jade
The titles were not being translated.
|
2014-11-13 17:02:32 +00:00 |
|
Nick Winter
|
f522d2fb04
|
Merge branch 'master' into production
|
2014-11-12 20:45:40 -08:00 |
|
Nick Winter
|
29860caeea
|
Implemented new blue background texture for dialogue messages.
|
2014-11-12 20:45:15 -08:00 |
|
Nick Winter
|
a9859d0522
|
Merge branch 'master' into production
|
2014-11-12 20:28:48 -08:00 |
|
Nick Winter
|
51d77e5ae2
|
Switching to live iTunes receipt verification URL.
|
2014-11-12 20:25:22 -08:00 |
|
Nick Winter
|
4fe6fd3020
|
Some fixes for loading iPad gem products.
|
2014-11-12 20:21:14 -08:00 |
|
Nick Winter
|
6b92df2e41
|
Merge branch 'master' into production
|
2014-11-12 18:44:53 -08:00 |
|
Scott Erickson
|
ed8285248f
|
Put in the new InventoryModal background.
|
2014-11-12 18:01:35 -08:00 |
|
Scott Erickson
|
73fee3e801
|
Added a gems icon to the world map.
|
2014-11-12 17:19:56 -08:00 |
|
Scott Erickson
|
5b034194ee
|
Put in the new BuyGemsModal design.
|
2014-11-12 17:17:24 -08:00 |
|
George Saines
|
50b4e79c7b
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-11-12 16:48:10 -08:00 |
|
George Saines
|
8440f38bd4
|
added a buy gems icon to the map icon spritesheet
|
2014-11-12 16:48:05 -08:00 |
|
Scott Erickson
|
07cf741015
|
Changed the campaign switching icons arrows nested in the campaign maps.
|
2014-11-12 16:26:35 -08:00 |
|
Nick Winter
|
ba6565395e
|
Spell palette cool with multiple items offering same skills.
|
2014-11-12 15:28:08 -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
|
6e433e1b77
|
Filtered out achievement popups for level achievements.
|
2014-11-12 14:40:01 -08:00 |
|
Scott Erickson
|
1b73569072
|
Forgot jade != coffeescript.
|
2014-11-12 14:34:23 -08:00 |
|
Scott Erickson
|
a7d48f4b3c
|
Tweaked the gems icon to be visible for ipad and admins.
|
2014-11-12 14:25:34 -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
|
bd969c017e
|
Turned off InventoryView tests for now.
|
2014-11-12 14:04:51 -08:00 |
|
Scott Erickson
|
fc3a5de2f2
|
Tweaked the BuyGemsModal to not need gems from the iPad app.
|
2014-11-12 12:15:03 -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 |
|
George Saines
|
047e0c2f41
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-11-12 11:01:18 -08:00 |
|
George Saines
|
f0a490f21e
|
adding matt's profile pic for reals
|
2014-11-12 11:01:12 -08:00 |
|
Scott Erickson
|
c0a36024c4
|
Merge branch 'master' into production
|
2014-11-12 10:39:58 -08:00 |
|
Scott Erickson
|
9b33ffe5d8
|
Tweaked the BuyGemsModal to not care if iPad event handling is synchronous or not.
|
2014-11-12 10:37:09 -08:00 |
|
Scott Erickson
|
a582717bc3
|
Set up the BuyGemsModal with Backbone events so the iPad can communicate with it.
|
2014-11-12 10:23:43 -08:00 |
|
Scott Erickson
|
c3eecd15be
|
Set up the WorldMapView to update the gem count when a player purchases gems or items.
|
2014-11-12 10:22:56 -08:00 |
|
Anton Alexanin
|
db71f9b528
|
tab
|
2014-11-12 21:15:45 +03:00 |
|
Anton Alexanin
|
4a5a4bc305
|
Some RU translation and fixes.
Added and translated "awaiting_levels_adventurer*".
|
2014-11-12 21:09:38 +03:00 |
|
Scott Erickson
|
ad35109878
|
Built the BuyGemsModal stub.
|
2014-11-12 09:40:55 -08:00 |
|
Anton Alexanin
|
af6d4638d0
|
Uncommented translated lines
|
2014-11-12 19:28:46 +03:00 |
|
Anton Alexanin
|
990fd0d4e7
|
Some translation in ru.coffee
|
2014-11-12 11:55:40 +03:00 |
|
Nick Winter
|
3a8a5354aa
|
Merge branch 'master' into production
|
2014-11-11 18:16:52 -08:00 |
|
Nick Winter
|
f1947d7d9d
|
Fixed a couple bugs.
|
2014-11-11 18:16:45 -08:00 |
|
Scott Erickson
|
7012d5dfbe
|
Built payment endpoint for processing Apple IAPs.
|
2014-11-11 17:40:29 -08:00 |
|
Scott Erickson
|
56e62bb4c8
|
Fixed a couple server tests.
|
2014-11-11 17:40:29 -08:00 |
|
Scott Erickson
|
d1d6a734b4
|
Added handling for bad sprite data.
|
2014-11-11 17:40:29 -08:00 |
|
Nick Winter
|
b50704597a
|
Merge branch 'master' into production
|
2014-11-11 16:37:22 -08:00 |
|