Nick Winter
3ad67130c7
A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button.
2014-11-18 18:43:53 -08:00
Nick Winter
05b53fa10e
Merge branch 'iAladdin-master'
2014-11-18 18:16:35 -08:00
Nick Winter
b3119e300d
Resolved merge conflicts.
2014-11-18 18:16:17 -08:00
Nick Winter
666334b28c
Made paths more visible, because I couldn't see them.
2014-11-18 18:13:59 -08:00
iAladdin
4bd578c18e
improved Chinese localization
2014-11-19 09:45:15 +08:00
Scott Erickson
e93de815c2
Some tweaks to the TrailMaster, consolidating some changes and altering the dot style.
2014-11-18 16:18:51 -08:00
Scott Erickson
c40a7c1bb8
TrailMaster plays/pauses animations along with the rest of the Surface.
2014-11-18 16:03:47 -08:00
Scott Erickson
c23fb1d2b5
Removed TODO.
2014-11-18 15:57:06 -08:00
Scott Erickson
8ec016e4b2
Re-enabled RAF_SYNCHED, given the fix for https://github.com/CreateJS/EaselJS/issues/516
2014-11-18 15:56:33 -08:00
Scott Erickson
1444d84aea
Upgraded the CreateJS suite, handling its slight changes.
2014-11-18 15:42:11 -08:00
Matt Lott
957ca50c87
Disable spaces through The Raised Sword
2014-11-18 14:11:28 -08:00
Scott Erickson
5ee1289621
Goal states (for the purpose of triggering achievements) are now only saved as having succeeded when the overall level is succeeded.
2014-11-18 14:05:55 -08:00
Scott Erickson
1889c771f2
Added the close button to the GameMenuModal.
2014-11-18 13:57:44 -08:00
Scott Erickson
3008abed19
Made the Equip button in the inventory modal green.
2014-11-18 13:52:39 -08:00
Scott Erickson
6440ce528b
Fixed the CSS of the item details view in the scrunched item store.
2014-11-18 13:48:59 -08:00
Scott Erickson
acd94c4247
Fixed the nanoscroller in the item details view to be off the sheet and always visible.
2014-11-18 13:44:34 -08:00
Scott Erickson
46f9667311
Made the double click hint alert in the inventory modal more visible.
2014-11-18 13:28:04 -08:00
Scott Erickson
a04bc63b87
Equip hint and available header now are visible only when there are items to equip.
2014-11-18 13:20:59 -08:00
George Saines
6310dcbcac
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-18 13:02:36 -08:00
George Saines
c9d7754623
adding a close button to the main menu modal
2014-11-18 13:02:32 -08:00
Scott Erickson
208f05cf67
Added an equip button to every piece of available equipment.
2014-11-18 13:02:06 -08:00
Nick Winter
f5b5ee2206
Fixes for updating paths during world streaming.
2014-11-18 12:40:28 -08:00
Scott Erickson
aab51178e2
Added WebGL paths.
2014-11-18 11:46:47 -08:00
Nick Winter
f1a4249f18
More reductions in memory usage for iPad.
2014-11-18 11:21:29 -08:00
Matt Lott
b000389b3a
Add problem range highlighting back
...
Now full line still pulses, and specific problem range has a darker red
background.
2014-11-18 10:03:02 -08:00
Matt Lott
7b3b904ad1
Hide problem alert on code reload
2014-11-18 09:36:01 -08:00
Matt Lott
05cc9c2f46
Move sync pvp status UI to control bar
...
Replaces level name UI for hero-ladder levels.
2014-11-18 09:01:07 -08:00
Nick Winter
547ba692e1
Turned off DOM highlight noise after A/B test insignificantly showed it hurting.
2014-11-18 08:05:20 -08:00
Nick Winter
d0233fc999
Fixed bug with primary spell being unreadable and thus no spells showing up in old, multi-spell levels.
2014-11-18 07:43:02 -08:00
Dloach
d9b4a63584
Update zh-HANS.coffee
2014-11-18 23:22:55 +08:00
Nick Winter
1a470a5745
Merge pull request #1762 from MountainWang/patch-1
...
Update zh-HANS.coffee
2014-11-18 07:03:12 -08:00
Nick Winter
daa4d63dcf
Merge pull request #1761 from Dloach/patch-1
...
Update zh-HANS.coffee
2014-11-18 07:03:00 -08:00
Nick Winter
6ef9532b1d
Fixed missing colon in bg.coffee.
2014-11-18 06:50:13 -08:00
Nick Winter
96e57a7520
Merge pull request #1759 from igornishka/patch-1
...
A couple of translations added :)
2014-11-18 06:49:26 -08:00
MountainWang
3615bc87e9
Update zh-HANS.coffee
2014-11-18 21:32:42 +08:00
iAladdin
d09c8c155b
improved Chinese localization
2014-11-18 18:43:37 +08:00
Dloach
f659240061
Update zh-HANS.coffee
2014-11-18 18:03:03 +08:00
Ehnydeel
fcb5f4246c
Add some more german translations
...
Add some more german translations
2014-11-18 10:50:41 +01: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
Nick Winter
d3da5e330a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-11-17 15:09:14 -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
igornishka
3abe0db1e5
A couple of translations added :)
2014-11-18 01:00:28 +02:00
Nick Winter
9fabe74da6
Changed the name of incorrectly preloaded old spell palette background texture.
2014-11-17 14:45:09 -08:00
Nick Winter
736fbaa474
Merged de-DE.
2014-11-17 12:43:31 -08:00
Nick Winter
ec77a3b737
Builder's Hammer has been renamed to Crude Builder's Hammer.
2014-11-17 09:20:44 -08:00
Nick Winter
ccc4cf59db
Stop zooming in on hero during real-time playback, because it can mess with ability to place flags.
2014-11-17 09:09:04 -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
0d68ad250d
Fixed awardable items showing up in inventory/store items list when not earnned, and showing up at the end when earned.
2014-11-17 08:25:27 -08:00
Nick Winter
b6570236d8
Fixed flag history not getting cleared on real-time resubmission in single-player.
2014-11-17 08:00:44 -08:00
Nick Winter
e5aada2e5b
Incorporated tweaked victory modal background assets.
2014-11-16 21:26:21 -08:00
Nick Winter
5927b36402
Made a few new levels available for advance early playtesting.
2014-11-16 20:38:27 -08:00
Matteo Canu
b8abeed60c
Added more translations
2014-11-16 18:15:24 +01:00
Nick Winter
4aff5265c3
Fixed being unable to select important spells on a few old, multi-spell levels.
2014-11-16 08:11:39 -08:00
Nick Winter
f9a7aba5d9
Some fixes for programmatically generated flag events not polluting session flag history.
2014-11-15 16:56:35 -08:00
Imperadeiro98
eb23438f6a
Update en.coffee
...
Updated achievements titles. Don't know if lines 750-752 are needed or not, as they do not display in the website.
2014-11-15 22:01:06 +00:00
Nick Winter
0f70b7e552
Admins can play all heroes. Fixed another bug with playback controls being disabled when they shouldn't be.
2014-11-15 12:46:57 -08:00
Imperadeiro98
2da1b7d65e
Update pt-PT.coffee
2014-11-15 19:05:04 +00:00
Imperadeiro98
0a0b3b2041
Update pt-PT.coffee
2014-11-15 19:02:51 +00:00
Nick Winter
74aefa42b9
Merged in sunxb10's translations.
2014-11-15 07:42:57 -08:00
Nick Winter
e28f6bf994
Propagated i18n.
2014-11-15 07:40:58 -08:00
Nick Winter
b7c2a33ddc
Fixed some i18n on the PlayHeroesModal, and started showing special hero skills.
2014-11-15 07:40:10 -08:00
Nick Winter
7bbc270f26
Merge pull request #1748 from Imperadeiro98/master
...
Update achievements.jade
2014-11-15 07:32:28 -08:00
Nick Winter
61308feca7
Merge pull request #1745 from LuSilf/master
...
Some translation in ru.coffee
2014-11-15 07:32:15 -08:00
Nick Winter
55196bc589
Fixed disabling of playback accidentally when disabling anything.
2014-11-14 18:25:07 -08:00
Ehnydeel
d23cf5c725
Added some german translations
...
Added some german translations
2014-11-14 22:27:24 +01:00
Scott Erickson
8c953fffed
Hid the G+ "Welcome back" message, since we are managing logins manually now.
2014-11-14 11:14:08 -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
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
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
29860caeea
Implemented new blue background texture for dialogue messages.
2014-11-12 20:45:15 -08:00
Nick Winter
4fe6fd3020
Some fixes for loading iPad gem products.
2014-11-12 20:21:14 -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
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
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
