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
|
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
|
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 |
|
Scott Erickson
|
ad35109878
|
Built the BuyGemsModal stub.
|
2014-11-12 09:40:55 -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
|
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
|
f345d68be9
|
Merge pull request #1744 from Soraph/patch-1
Translated more strings
|
2014-11-11 11:32:52 -08:00 |
|
Matteo Canu
|
ebc35ae0cb
|
Translated more strings
Also modified Wizard translation from "stregone" to "mago"
|
2014-11-11 20:23:52 +01:00 |
|
Nick Winter
|
9a54cb20f3
|
Merge pull request #1743 from gorechi/patch-1
Some russian translations.
|
2014-11-11 10:40:48 -08:00 |
|
Nick Winter
|
bc4c4353b2
|
Added a signup button to the level when not logged in.
|
2014-11-11 08:49:16 -08:00 |
|
Nick Winter
|
c06f226e72
|
Renaming A Fiery Trap to Back to Back.
|
2014-11-11 07:57:29 -08:00 |
|
Nick Winter
|
6dcaf05673
|
Fix for Simulator level loading.
|
2014-11-11 07:38:39 -08:00 |
|
gorechi
|
f776295944
|
Update ru.coffee
|
2014-11-11 17:57:53 +03: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
|
bc8a51e023
|
Added a missing file from last commit.
|
2014-11-10 18:13:36 -08:00 |
|
Nick Winter
|
eab293cb66
|
Refactored item-details-view styling and shared styles between InventoryModal and PlayItemsView, fixing scrollbars and text overflow issues in the process. Dragging to unequip now updates restrictions again. Worked on pointer cursors for equippable ittems. Hid items not usable by your hero's class. Stopped silhouetted items from being clickable.
|
2014-11-10 18:13:04 -08:00 |
|
Nick Winter
|
fbbcf2a925
|
Replayed useful changes from last few InventoryModal commits after big merge.
|
2014-11-10 16:09:41 -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
|
ffea887330
|
Revamped real-time playback behavior to kick in on Thornbush Farm. Added a Done button until then.
|
2014-11-10 15:16:28 -08:00 |
|
Nick Winter
|
3d8f16cd7f
|
Fixed #1717 with a brilliant LevelLoader refactoring.
|
2014-11-10 14:48:39 -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
|
25f157f201
|
Merge pull request #1738 from Imperadeiro98/patch-1
Update pt-PT.coffee
|
2014-11-10 12:53:09 -08:00 |
|
Nick Winter
|
52ac9446c8
|
Added a new file.
|
2014-11-10 12:52:17 -08:00 |
|
Nick Winter
|
d8dfc0a2b3
|
Fixed some bugs with LevelSetupManager and inventory. Moved hard-coding of level-specific options to a new LevelOptions config file. Fixed a couple minor bugs.
|
2014-11-10 12:47:24 -08:00 |
|
Imperadeiro98
|
ae61a9d78e
|
Update pt-PT.coffee
|
2014-11-10 19:49:53 +00:00 |
|
Matt Lott
|
e253795665
|
Removing stray test console.log
|
2014-11-10 11:09:07 -08:00 |
|
Matt Lott
|
c5b26a4376
|
A/B test experimental languages hero select
Test group not shown experimental languages on first hero select.
|
2014-11-10 11:08:21 -08:00 |
|
Nick Winter
|
97c4ff2e7e
|
Made flag detection more dynamic.
|
2014-11-10 10:51:46 -08:00 |
|
Nick Winter
|
956186b538
|
Fixed #1604: changing languages and reloading work better now.
|
2014-11-10 09:36:40 -08:00 |
|
Nick Winter
|
ab448532f5
|
Fixed bug in achievement popup listing wrong xp left values.
|
2014-11-10 08:31:26 -08:00 |
|
Nick Winter
|
f78ff257ab
|
Several improvements to behavior of pointing out next levels.
|
2014-11-10 08:21:28 -08:00 |
|