Commit graph

5075 commits

Author SHA1 Message Date
Imperadeiro98
abf75281ca Update pt-PT.coffee 2014-11-29 21:25:46 +00:00
Imperadeiro98
8d9c7cf0be Update pt-PT.coffee 2014-11-29 21:22:06 +00:00
Nick Winter
155ead86cf Removed unneede catiline lib. Trying speedups for updating HUD property values and Lank Thang inventory. 2014-11-29 13:09:38 -08:00
Scott Erickson
17f2d76512 Undid some apparent changes from the last commit. 2014-11-29 12:53:57 -08:00
Scott Erickson
9b5228afd9 Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match. 2014-11-29 12:46:04 -08:00
Scott Erickson
1c33842125 Refactored core templates into a core folder. 2014-11-29 11:39:37 -08:00
Nick Winter
912df310a2 Disabled GitHub login for now, since it's too buggy and also makes the server mad slow. 2014-11-29 10:52:53 -08:00
Scott Erickson
1bd70591a0 Added new mongodb versions to be allowed.
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Nick Winter
b8d4f00cd4 Merge pull request #1813 from ebirkenes/tmp
Fix for #1795
2014-11-29 10:40:48 -08:00
Nick Winter
98199ac72e Propagated i18n. 2014-11-29 10:38:55 -08:00
Nick Winter
891b78eb44 Hiding some ThangTypes from view in level editor. 2014-11-29 10:34:04 -08:00
Nick Winter
306f599673 Merge pull request #1815 from ewertonorg/translate-to-pt-br
Update pt-BR.coffee
2014-11-29 10:33:22 -08:00
Scott Erickson
0bbcdd5698 Made all of lib into a wad. Fixed AuthModal. 2014-11-29 08:54:18 -08:00
Nick Winter
d2aabbdacc A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading. 2014-11-29 08:43:40 -08:00
Nick Winter
dbbcfe3789 Fixed a couple requires needed for level editor. 2014-11-29 06:50:50 -08:00
ewertonorg
4b7fc0322c Update pt-BR.coffee 2014-11-29 11:53:27 -02:00
Scott Erickson
82e2344fa5 Fixed new module loading system when optimized. 2014-11-29 00:34:55 -08:00
Nick Winter
89af30f436 Using home play i18n tag instead of common play tag. 2014-11-28 19:49:13 -08:00
Nick Winter
8400eb6016 Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring. 2014-11-28 19:39:51 -08:00
Scott Erickson
31214e854e Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways. 2014-11-28 17:49:41 -08:00
Scott Erickson
b698745e05 Set up the site to load its logic and templates piecemeal rather than in one giant app.js file. 2014-11-28 16:38:56 -08:00
Scott Erickson
12b3428aee Got rid of some styling in the achievement edit view that was messing with the new site chrome. 2014-11-28 16:38:56 -08:00
Nick Winter
32a271d17e Updated to new paper doll positioning. 2014-11-28 14:23:44 -08:00
Nick Winter
4b45385571 Working on paper dolls. 2014-11-28 12:11:59 -08:00
Matt Lott
fc2c68a7af Update Tracker.trackEvent
Mechanics have changed a bit: first param is an action string, second
param has specific properties if Google Analytics.
Updating some of the trackEvent calls to use correct actions and
categories.
2014-11-28 15:06:25 -05:00
Erlend Birkenes
6efb03ec40 Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little. 2014-11-28 19:30:41 +01:00
Erlend Birkenes
744b856092 Fixed padding on language-dropdown 2014-11-28 12:10:57 +01:00
Matt Lott
fead762d04 Stopping tracking analytics for admins 2014-11-27 23:55:28 -05:00
Erlend Birkenes
434b71c887 Added myself as translator on norwegian nb 2014-11-27 20:45:27 +01:00
Erlend Birkenes
5f7f1c2b65 Translated the entire contributing page plus some other stuff to norwegian. 2014-11-27 20:17:33 +01:00
Nick Winter
2d2a9ad681 Updated Hour of Code visitor counting. 2014-11-27 09:44:08 -08:00
Nick Winter
b5c7a4e0f2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-27 07:28:31 -08:00
Erlend Birkenes
37601efa17 More norwegian translations.
Conflicts:
	app/locale/nb.coffee
2014-11-27 16:11:13 +01:00
Nick Winter
81495fd722 Added suspect code fragment to Known Enemy. 2014-11-26 19:30:23 -08:00
Nick Winter
0499702e10 Translated IFC Videira description to English, and added an image. 2014-11-26 19:22:39 -08:00
Nick Winter
bef466304d Merge pull request #1805 from leocadiotk/patch-1
Update MainPlayView.coffee
2014-11-26 19:20:45 -08:00
Nick Winter
4e51289de8 Merge pull request #1800 from ShadowTrainer/patch-2
Update tr.coffee
2014-11-26 19:20:10 -08:00
Nick Winter
12253fc472 Resolved nb.coffee merge conflicts. 2014-11-26 19:19:30 -08:00
Nick Winter
167595789d Merged tr.coffee. 2014-11-26 19:09:39 -08:00
Nick Winter
4c900b8870 Working on paper doll equipping. 2014-11-26 19:06:57 -08:00
leocadiotk
d2b394aaf2 Update MainPlayView.coffee 2014-11-26 23:16:07 -02:00
Nick Winter
7a7d82e8e4 Merge pull request #1792 from ccdarkness/patch-1
Update zh-HANS.coffee
2014-11-26 16:51:07 -08:00
Nick Winter
6e7e11a884 Merge pull request #1791 from nadian/patch-1
Update id.coffee
2014-11-26 16:50:50 -08:00
Nick Winter
16e0c2b4fb Merge pull request #1804 from ebirkenes/translation
Lots of translations to norwegian bokmål
2014-11-26 16:49:58 -08:00
Nick Winter
ab1e256b98 Merge pull request #1803 from ebirkenes/master
Fixed wrong I18n suffix in Thang Editor section on Community page.
2014-11-26 16:48:31 -08:00
Nick Winter
915a3243f5 Added feature image hair and thumb slots to the ThangType. 2014-11-26 16:29:48 -08:00
Erlend Birkenes
c8a34e78e8 Lots of translations to norwegian bokmål 2014-11-27 01:00:02 +01:00
Erlend Birkenes
83e41bb38e Fixed wrong I18n suffix in Thang Editor section on Community page. 2014-11-27 00:41:29 +01:00
Nick Winter
53c6da5ef8 Allowing upload of paper doll images for items. 2014-11-26 14:18:17 -08:00
Nick Winter
fc18ed0153 Undisabled the new Adventurer levels we just emailed about. 2014-11-26 12:56:58 -08:00
Matt Lott
cf6450201f Fix IE9 simulation problems
World.deserialize call had mixed up parameters.
flagHistory wasn’t being initialized.
Error logging using unsupported CoffeeScript splats invocation.
2014-11-26 15:40:18 -05:00
Nick Winter
e538808c76 Merge branch 'master' of git://github.com/notno/codecombat into notno-master 2014-11-26 12:34:35 -08:00
Nick Winter
12394b6bba Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-26 12:33:36 -08:00
Nick Winter
9feb4e6add Using ACE to add syntax highlighting to code documentation. 2014-11-26 12:33:29 -08:00
Nathan Rosquist
da4116ee2e Add tree_stand thangs to Generate Terrain modal in level editor. Use as border for grassy terrain. 2014-11-26 12:18:57 -08:00
Scott Erickson
c4fdcab6fe The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned. 2014-11-26 12:02:42 -08:00
Nick Winter
e8ed205038 Added original data to all WorldMapView levels. 2014-11-26 11:03:24 -08:00
Nick Winter
55eaed0cd2 Updated AI/Vision pathfinding/line-of-sight default terrain updates. 2014-11-26 10:51:30 -08:00
Nick Winter
c701ca9eb0 Sorting items by tier instead of gems so that the unlock order will be consistent, and so that we can show the Ring of Speed early despite its high price. 2014-11-26 09:22:30 -08:00
Nick Winter
2c0bf2fef1 Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed. 2014-11-26 08:53:06 -08:00
Nick Winter
3f9aa1ba79 Changed 'Your Skills' to 'Help' for hero level spell palette. 2014-11-26 07:39:13 -08:00
Nick Winter
18238a1781 Silhouetted items show what level they'd need to unlock after a while on hover from inventory modal. 2014-11-26 07:33:07 -08:00
Nick Winter
48e78aa0d0 Messed around with equip button and active item css. 2014-11-26 07:11:55 -08:00
Nick Winter
24ac3050bd Added a bunch of button click sound triggers. 2014-11-26 06:58:23 -08:00
Nick Winter
09d67a8189 Gradually reducing the initial size of the highlight arrow as the player levels up. 2014-11-25 17:55:10 -08:00
Nick Winter
6f2ac13c5a Not duplicating spell docs if they're explicitly granted. 2014-11-25 17:49:31 -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
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
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
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
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
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
George Saines
294a8497ed making the editor error more visually distinctive 2014-11-23 13:32:26 -08:00
Nick Winter
0b97ef5f0b Properly using the skill docs i18n. Fixed issue with markdown getting to #{spriteName} before our replacer did. 2014-11-23 13:26:19 -08:00
Nick Winter
294a37e2a2 Propagated i18n. 2014-11-23 12:54:42 -08:00
Nick Winter
f248de0dc5 Adding i18n to skill docs. 2014-11-23 12:52:34 -08:00
Nick Winter
ffaa42cb9b Added detection of suspect code fragment deletion. Implemented Chloe's styling advice on restricted items. Fixed purchasing items clobbering inventory changes. 2014-11-23 12:18:42 -08:00
Nick Winter
c7f8565ae7 Getting a few more placeholder stats filled in automatically in ItemDetailsView. Showing buildTypes for Builder's Hammer docs. Fixed font casing / humanizing for skills granted. 2014-11-23 11:08:20 -08:00
Nick Winter
b359c25c97 Fixed multiplexed-by-code-and-spoken-language component documentation i18n. 2014-11-23 10:22:06 -08:00
Scott Erickson
994584f13a Shapes now handle radial gradient fills. Handled one sprite (new Anya attack) export including initializing a container with movie clip arguments for no apparent reason, so loosened SpriteParser a bit to handle this. 2014-11-23 09:39:02 -08:00
Scott Erickson
1f3b02440a Fixed a harmless bug where the Lank would try to add new sprites to old containers. 2014-11-23 08:51:45 -08:00
Matt Lott
692569f655 Update problem alert width to be more dynamic 2014-11-22 22:48:03 -08:00
Nick Winter
b7949424e6 Re-enabled branchingGroup A/B test. Restricted Builder's Hammer in The Gauntlet. 2014-11-22 21:36:14 -08:00
Nick Winter
5d54332ed7 Round inferred cooldown docs. Show grabber/grabbing cursor when Surface is enabled, playing, and zoomed in. 2014-11-22 21:22:46 -08:00
Nick Winter
f16c1b5030 Fixed a few UX issues Chloe found. 2014-11-22 20:56:46 -08:00
Matt Lott
c16b0f97bf Update sync PVP to use transpiledCode 2014-11-22 20:48:07 -08:00
Scott Erickson
1a85fea33b Fixed the editor views, get that site chrome outta there. 2014-11-22 18:51:21 -08:00
Nick Winter
6851c309fb Moved older campaigns from world map view to site footer. 2014-11-22 18:45:22 -08:00
Nick Winter
6fd0d024eb Moved overlapping level dot. 2014-11-22 18:45:22 -08:00
Scott Erickson
96f9b60780 Set George's new hero stat colors. 2014-11-22 18:43:02 -08:00
George Saines
1bdc331f40 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-22 18:00:28 -08:00
George Saines
c98e875c68 making the error message more blood red 2014-11-22 18:00:23 -08:00
Scott Erickson
0e6965d097 Hiding the iPad link for now. 2014-11-22 17:44:26 -08:00
Scott Erickson
cfcd09c112 Set up the new Heald-designed site chrome. 2014-11-22 17:41:13 -08:00
Matt Lott
fbed0dd13d Jiggle spell palette popover onclick in hero level 2014-11-22 17:35:05 -08:00
Matt Lott
fcb098b3aa Remove cast button text A/B test 2014-11-22 16:50:49 -08:00
George Saines
2151cd6799 added the additional default inventory icons, added the dungeon map path 2014-11-22 16:14:43 -08:00
ShadowTrainer
48a0be91d8 Update tr.coffee 2014-11-23 01:32:59 +02:00
George Saines
2875cb09a5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-22 15:18:23 -08:00
George Saines
9a2c52545f adding carpeting to the dungeon floor 2014-11-22 15:18:19 -08:00
Matt Lott
496d52b2aa Add moveRight to loop snippet for first 2 mazes 2014-11-22 12:29:37 -08:00
Dmitry
41b3d066d6 update RU translation 2014-11-22 19:58:05 +03:00
Nick Winter
2fc6f7a8a2 New required inventory items for ranger/wizard levels. 2014-11-21 22:35:03 -08:00
Matt Lott
c012cd4e30 Prevent continuous deletion of a single line 2014-11-21 21:02:39 -08:00
Nick Winter
904d605e42 Getting ready to add new levels. 2014-11-21 20:36:56 -08:00
Nick Winter
549fb8aa37 Attempting to require purchase of tarnished bronze breastplate in The Raised Sword. 2014-11-21 16:23:26 -08:00
Nick Winter
dae3c9cef6 Always show Buy Gems menu on iPad. 2014-11-21 14:55:04 -08:00
Nick Winter
d00c7d6a3a Allow buying gems when not logged in on iPad. 2014-11-21 14:41:04 -08:00
Nick Winter
ca73a049dd Paths for non-admins. Making sure paths are showing when level first loads and playback ends (not sure why they are not showing up at first otherwise). 2014-11-21 14:22:02 -08:00
Michael Schmatz
1d52562070 Publish signed up message 2014-11-21 17:18:02 -05:00
Nick Winter
074d9f33c2 Fixed bugs with unequipping restricted items not then requiring the proper item afterward. 2014-11-21 12:20:24 -08:00
Nick Winter
cee017c7ec Moved spell palette popovers to top placement if dialogue view is active. 2014-11-21 12:14:37 -08:00
Nick Winter
c5ae253a45 Fixed next-level popovers appearing in wrong place on world map. 2014-11-21 11:56:31 -08:00
Nick Winter
cfe1b020c3 Fixed esc shortcut when editor is disabled. 2014-11-21 11:07:57 -08:00
Nick Winter
16a717aec1 Disallow finding enemy names by selecting them before the HUD is fully enabled. 2014-11-21 10:14:02 -08:00
Nick Winter
c3398ed8ed Required topEnemy in Thornbush Farm. 2014-11-21 09:53:46 -08:00
Nick Winter
5550c695e2 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-21 08:19:37 -08:00
Nick Winter
6f3485f089 Fully removed A/B test that was causing hero victory modals to not fully work. 2014-11-21 08:16:03 -08:00
Thomas Abend
145535f465 Update names.coffee 2014-11-21 09:49:01 -05:00
Scott Erickson
624f164b54 Set up the WorldMap to load earned achievements and modify the User object to include absolutely everything. 2014-11-20 23:03:16 -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
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
e97ba54c94 Reduced how much we're sending to Mixpanel. Turned off experimental languages A/B test. 2014-11-20 20:31:17 -08:00
Nick Winter
33ef8f9760 Added Programmaticon II dependency. 2014-11-20 20:06:59 -08:00
Nick Winter
f5f2d57db6 Paused branchingGroup A/B test and set everyone to no-practice. Realized that no-practice wasn't working at all, so fixed that. 2014-11-20 19:56:44 -08:00
Nick Winter
fcfe81c63e Added endangered-burl and village-guard. 2014-11-20 19:32:09 -08:00
Nick Winter
6d7bc9ce11 Fixed #1729. 2014-11-20 17:09:29 -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
Matt Lott
ef8e7563b4 Increase autocomplete font size in dungeon levels
Also moving getCampaignForSlug to new CampaignOptions file.
2014-11-20 12:41:56 -08:00
Nick Winter
79ac94d84a Fixed busted item crash. 2014-11-20 11:59:49 -08:00
Nick Winter
df51e28a1d Fixed camera zoom killing coordinate hover unnecessarily. 2014-11-20 11:37:10 -08:00
Nick Winter
46c4601ac6 Levels (back) link now embiggened. 2014-11-20 11:11:38 -08:00
Matt Lott
f80baf3eb2 Update autocomplete instruction to 'press tab'
Enter no longer autocompletes, instead dismisses popup and executes a
Return
2014-11-20 10:56:38 -08:00
Nick Winter
83bbb6bef2 Merge pull request #1766 from iAladdin/master
improved Chinese localization zh-HANS.coffee
2014-11-20 09:02:32 -08:00
Nick Winter
7b7ceeba53 Right, it's long-sword, not longsword. 2014-11-20 08:49:18 -08:00
iAladdin
0fcffc9736 improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-21 00:16:45 +08:00
iAladdin
84c6ed0193 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 11:14:05 +08:00
iAladdin
55f725de93 fixed error
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 11:13:47 +08:00
Nick Winter
b0f65a4da8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-19 18:36:30 -08:00
Nick Winter
8280347752 Fixes to spell palette doc hovering and ensuring at least two column layout. 2014-11-19 18:36:09 -08:00
Matt Lott
81d6c186dc Add time to missing null check error messages 2014-11-19 17:13:00 -08:00
Nick Winter
afff1056cb Don't be draggin' all these images around yo. 2014-11-19 16:36:06 -08:00
iAladdin
dff443bc07 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 08:22:23 +08:00
iAladdin
883a58ed2d improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 08:22:10 +08:00
Scott Erickson
09087428b9 Got lanks to update healthbars when the floating layer spritesheet is recreated. 2014-11-19 16:09:48 -08:00
Nick Winter
716f8864f1 Increased dialogue strong tag color contrast. 2014-11-19 16:09:25 -08:00
Nick Winter
5c0f007c4f Toning down executing highlights when errored out as well as when ended. 2014-11-19 16:05:00 -08:00
Nick Winter
89f0f52714 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-19 16:04:29 -08:00
Scott Erickson
e10af778ca Added some logs to figure out why that one time the GPlus logging in process just left things hanging. 2014-11-19 15:55:44 -08:00
Nick Winter
a1038af32b Make it much less likely to get to frame 0, since that frame is often pretty weird. 2014-11-19 15:46:50 -08:00
iAladdin
038e8cf776 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-20 07:43:04 +08:00
iAladdin
42997c4bb2 improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-20 07:42:35 +08:00
Matt Lott
41db27c709 Apply markdown to error messages and hints 2014-11-19 15:27:06 -08:00
Nick Winter
f310719cee Restarting level now doesn't clear anything except code unless you hold down shift. 2014-11-19 15:24:50 -08:00
Nick Winter
6755c90f02 Properly continue to Haunted Kithmaze from The Raised Sword if that's the A/B test group. 2014-11-19 15:18:59 -08:00
Nick Winter
c82d1d0f36 Additional scriptable property on thang-died events. 2014-11-19 15:13:45 -08:00
Nick Winter
07a09e34d8 Fixed small-caps font-variant on docs popover titles. 2014-11-19 15:01:30 -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
fe018309d0 Don't show blurbs for aggro messages. Big announces action blurbs for heroes. 2014-11-19 14:29:11 -08:00
Nick Winter
5a71d93d8a Hid play button for a couple more levels. 2014-11-19 14:29:11 -08:00
Nick Winter
0640f382ba Fixed coordinate hover cursors fighting flag cursors. Added suspect code check functionality for scripts to slap hands. 2014-11-19 14:29:11 -08:00
Scott Erickson
63c516c5f5 Quick fix to get people to the forest levels even if, for some reason, the first forest level isn't in the User list of earned levels. 2014-11-19 10:05:13 -08:00
Nick Winter
2af8271829 Some size/styling tweaks for goals and gold. 2014-11-19 09:01:01 -08:00
iAladdin
0b9d6ea5c3 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-19 12:51:59 +08:00
iAladdin
d24db06e0e improved Chinese Localization
Signed-off-by: iAladdin <ialaddin@me.com>
2014-11-19 12:51:39 +08:00
Nick Winter
96ff44017e A few fixes for unequippable cross-class item state. 2014-11-18 19:37:08 -08:00
iAladdin
43f56c7ff7 Merge branch 'master' of github.com:codecombat/codecombat 2014-11-19 11:19:41 +08:00
iAladdin
5f1f02f8e8 improved Chinese localization 2014-11-19 11:19:31 +08:00
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
Anton Alexanin
990fd0d4e7 Some translation in ru.coffee 2014-11-12 11:55:40 +03: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
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
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
An Nguyen
86f0910258 Update vi.coffee 2014-11-11 10:37:36 +01: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
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
Nick Winter
563c886bdd Hide the play button on the inventory screen until the items have fully loaded. 2014-11-10 07:49:30 -08:00
Matt Lott
a3d88eb975 Update a/b test tracking data
cast button text was missing group
auto first level and cast button text didn’t need action property
2014-11-09 21:47:51 -08:00
Matt Lott
9c6485b142 A/B test automatically starting first level
When loading the world map, if user hasn’t already started it.
2014-11-09 21:33:50 -08:00
Nick Winter
85471badaa Added callout to become an Adventurer on disabled levels. 2014-11-09 21:27:03 -08:00
Nick Winter
111b9febac Updated main.html. Removed LinkedIn. 2014-11-09 20:35:46 -08:00
Nick Winter
9b68f03f75 Propagated i18n. 2014-11-09 20:20:01 -08:00
Nick Winter
44d4d13c93 A few tweaks to the GameMenuModal. 2014-11-09 20:19:12 -08:00
Nick Winter
982e85da52 Linked to new i18n page from Diplomat page. 2014-11-09 20:06:55 -08:00
Nick Winter
9104d202c0 Silenced annoying Simlish for announced actions until we can get shorter, more legit audio in there. 2014-11-09 19:45:38 -08:00
Nick Winter
9b074841d6 Messed around with some of the new modals' scroll bars. 2014-11-09 19:39:09 -08:00
Nick Winter
2e413700dd Don't uncomplete levels by resetting them. 2014-11-09 18:59:40 -08:00
Nick Winter
00b8a62bfb Don't need this big ol' worker-xquery.js. 2014-11-09 18:48:56 -08:00
Nick Winter
51d8564aac Lazily loading FilePicker. Reducing number of web workers used on iPad to try to reduce memory pressure. 2014-11-09 17:35:50 -08:00
Nick Winter
2bafad2932 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-09 16:19:28 -08:00
Nick Winter
ad06000ceb Fixed three big memory leaks: LevelSetupManagers never being destroyed, wall grid closures retaining Lanks, and real-time-multiplayer:new-opponent-code retaining Spells. 2014-11-09 16:19:18 -08:00
Nick Winter
65017a8d58 Merge pull request #1736 from mcaeiror/master
Galician translation complete!
2014-11-09 15:19:13 -08:00
Manuel Caeiro Rodríguez
e3df3f50bb Update gl.coffee
Galician translation complete!
2014-11-10 00:11:47 +01:00
Manuel Caeiro Rodríguez
602b0e4ce9 Update gl.coffee 2014-11-09 23:54:16 +01:00
Manuel Caeiro Rodríguez
9eef4e8951 Update gl.coffee 2014-11-09 22:05:54 +01:00
Manuel Caeiro Rodríguez
9702466f1f Update gl.coffee 2014-11-09 20:45:43 +01:00
Matt Lott
377138f35f Hide problem alert on code change 2014-11-09 11:36:17 -08:00
Matt Lott
5741968210 Skip delimiters on Enter 2014-11-09 11:28:03 -08:00
Manuel Caeiro Rodríguez
fcf4aa8ac0 Update gl.coffee 2014-11-09 20:18:03 +01:00
Nick Winter
fb040fd882 Fixed some play subview positioning on iPad. 2014-11-09 08:48:11 -08:00
Manuel Caeiro Rodríguez
bf872f2a96 Update gl.coffee 2014-11-09 15:40:58 +01:00
Manuel Caeiro Rodríguez
012c5d72c3 Update gl.coffee
Some more translations
2014-11-09 09:50:20 +01:00
Matt Lott
1f11ad66ed Play problem alert sound on jiggle 2014-11-08 22:17:14 -08:00
Nick Winter
ab9d5b2171 Merge pull request #1735 from thepulkitagarwal/patch-2
Updated names.coffee
2014-11-08 22:04:56 -08:00
Matt Lott
cb49a0395a Update red pulse background css order 2014-11-08 22:04:10 -08:00
Matt Lott
0d2fe9b6e2 Update error code line background
Add title to problem alert dialog
2014-11-08 21:51:58 -08:00
Nick Winter
a628372b1b Enabled some levels for testing. 2014-11-08 21:50:25 -08:00
thepulkitagarwal
68cf9ec05a Update names.coffee 2014-11-09 10:24:35 +05:30
Nick Winter
14e8f6a653 Preparing for some of these new levels. 2014-11-08 19:33:00 -08:00
thepulkitagarwal
e24ec1d2ae Update names.coffee
Added a few names
2014-11-09 08:23:04 +05:30
Manuel Caeiro Rodríguez
7f2680de78 Update gl.coffee
Some more translations
2014-11-08 21:50:20 +01:00
Nick Winter
b74ad24aa8 A few sass tweaks to problem alerts and level loading. 2014-11-08 11:59:39 -08:00
Nick Winter
f9370532af Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-08 11:51:38 -08:00
Nick Winter
8d81445b84 More improvements to level loading view sizing and unveiling. 2014-11-08 11:51:31 -08:00
Nick Winter
1b94868197 Added new LevelDialogueView. Messed around with dimming a bit more. 2014-11-08 11:39:04 -08:00
Nick Winter
4cb641689c Increased dimming behavior when parts of the DOM are locked. 2014-11-08 08:58:36 -08:00
Nick Winter
a8700f5113 Reload now shows confirmation modal again. Added some stuff missing from the last commit. 2014-11-08 08:38:25 -08:00
Manuel Caeiro Rodríguez
506109864b Update gl.coffee 2014-11-08 16:51:53 +01:00
Matt Lott
588fa0620e Jiggle user code problem alert 2014-11-07 22:46:12 -08:00
Matt Lott
d43fd49d12 Use testGroupNumber in cast button text A/B test 2014-11-07 21:56:49 -08:00
Nick Winter
f3dfcdc81d Implemented new HUD design. Removed more unneeded stuff. Changed reload button to restart level. Still need restart confirmation and to redo the sprite dialogue area. 2014-11-07 19:15:55 -08:00
Nick Winter
cfff09b01e Merged big .executing arrow. 2014-11-07 16:06:14 -08:00
Nick Winter
5090a47afc Implementing more of new code editor design. Removed ThangList, EditorConfigModal, and a few other obsolete things. 2014-11-07 16:04:35 -08:00
George Saines
b0533850db adding matt's avatar 2014-11-07 15:29:18 -08:00
Scott Erickson
75226be778 Experimenting with a larger currently-executing-line pointer. 2014-11-07 13:58:02 -08:00
Scott Erickson
636a46ff00 Removed my testing code for the GameMenuModal. 2014-11-07 13:05:31 -08:00
Scott Erickson
eecdbdbe17 Minor fix for when changing hero from the world map. 2014-11-07 13:02:48 -08:00
Scott Erickson
a087663458 Implemented Heald's design of the GameMenuModal. 2014-11-07 13:02:28 -08:00
Nick Winter
fbc2799211 Startd to implement new code editor design. Fixed #1732. 2014-11-07 09:09:13 -08:00
Scott Erickson
e23e6f4ad2 Refactored the names of the play modal files. 2014-11-07 07:04:10 -08:00
Matt Lott
b4dde5705b Place error message over Surface next to line 2014-11-06 21:43:43 -08:00
Nick Winter
f3e4906810 Merge pull request #1731 from kerradus/master
Update RU translation
2014-11-06 19:13:47 -08:00
Nick Winter
03852fb44f Plannable pickUpFlags support and fixes for playing Coinucopia. 2014-11-06 18:21:54 -08:00
Scott Erickson
424c3a6d3e Integrated the new PlayHeroesModal into the game, refactoring PlayLevelModal into LevelSetupManager. 2014-11-06 16:23:23 -08:00
Scott Erickson
790dd8e7e0 Enabled the heroes button on the world map. 2014-11-06 16:01:40 -08:00
Matt Lott
1630f7e033 Remove time from problem alert message 2014-11-06 15:03:39 -08:00
Matt Lott
453960b3fb A/B Run and Submit button text 2014-11-06 14:44:56 -08:00
Dmitry
98a0173bad Update ru.coffee 2014-11-06 21:40:44 +03:00
Dmitry
546b74ae67 update RU translation 2014-11-06 21:36:54 +03:00
Nick Winter
ce6526863d Support for hiding optional bonus goals until they are achieved instead of until they are failed. 2014-11-06 08:57:13 -08:00
Nick Winter
26f065370c Finished adding Galician. 2014-11-06 07:26:00 -08:00
Nick Winter
f48fce2fdf Merge pull request #1726 from mcaeiror/master
To be checked
2014-11-06 07:22:22 -08:00
Imperadeiro98
eb96cc8d86 Update pt-PT.coffee 2014-11-06 15:13:40 +00:00
Nick Winter
fe7e96ab4e Started restricting common items with APIs that will make it impossible to win certain dungeon campaign levels. 2014-11-05 20:56:17 -08:00
Nick Winter
851bf39c5c Using extendedName. 2014-11-05 20:22:15 -08:00
Nick Winter
ce8b3bc83c Added hero components projection for good hero stat comparison bars. Fixed overflow/scrolling on code language selector for play-heroes-modal. 2014-11-05 19:37:13 -08:00
Nick Winter
35f5fd1c84 Hid some buttons that take us to old account/settings/achievements pages for now. Made property documentation popovers chill over to the left. 2014-11-05 19:23:55 -08:00
Scott Erickson
c660053dea Set up the PlayHeroesModal, and hooked it into the world map. 2014-11-05 19:04:14 -08:00
Nick Winter
c48b155413 Allow rerun of level without a code change. 2014-11-05 18:06:21 -08:00
Nick Winter
36c753a828 Returning executed statement highlighting to deemphasized state when playback has ended. 2014-11-05 17:47:23 -08:00
Nick Winter
aa9c3b5eaa Fixed iPad scrubber positioning. Reworked spell debug progress stepper to use drags instead of hover. Hiding spell debug progress stepper based on level, not statements executed. 2014-11-05 17:34:56 -08:00
George Saines
b751f5ab22 making the selection in the item store lighter 2014-11-05 16:35:59 -08:00
Nick Winter
f8679dfeca Hide say() until later levels. Fix bug with identifying correct equipped item ThangTypes in the spell palette. 2014-11-05 15:43:08 -08:00
Nick Winter
46409ef10d Made goals styling more robust to different sizing scenarios. 2014-11-05 15:06:26 -08:00
Nick Winter
189c3d202c Goals now show status: 'Running...' while the world is simulating. 2014-11-05 14:42:55 -08:00
Nick Winter
fd36dc9d79 Propagated i18n. 2014-11-05 14:35:02 -08:00
Nick Winter
a73b7df179 Added i18n for some more inventory screen strings. 2014-11-05 14:33:56 -08:00
Nick Winter
184e4c124a Impossible to select another slot and hide the available item the arrow is requiring you to equip. 2014-11-05 14:17:11 -08:00
Nick Winter
2e3755d2b9 Disabled gem/xp pulse animation on iPad, since it's too slow to do it justice. 2014-11-05 14:07:04 -08:00
Nick Winter
081e1ced20 Killed scroll bars on programming language selection fancy select. 2014-11-05 14:02:49 -08:00
Nick Winter
0e1afff318 No fold widgets in ACE. 2014-11-05 13:53:23 -08:00
Nick Winter
6c15833b70 Removed confusing ThangAvatarView title so as not to disturb beginner players in hero levels. 2014-11-05 13:49:49 -08:00
Nick Winter
478cad02d6 Ability to pass hints to argument errors. 2014-11-05 13:44:28 -08:00
Nick Winter
2afc7c830a Implemented getHeroStats. 2014-11-05 13:28:54 -08:00
Scott Erickson
0d578c84dc Merge remote-tracking branch 'origin/master' 2014-11-05 12:23:47 -08:00
Scott Erickson
dc48cab6d1 Added a getHeroStats function stub. 2014-11-05 12:23:34 -08:00
Imperadeiro98
8121ce9704 Update pt-PT.coffee 2014-11-05 19:12:04 +00:00
Nick Winter
6efcbc5ead Hid Crawlways of Kithgard. A/B testing Haunted Kithmaze vs. The First Kithmaze. Renamed New Sight to Dread Door and awarded its glasses later. 2014-11-05 10:40:37 -08:00
Nick Winter
a2554570b0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-05 07:50:13 -08:00
mcaeiror
c2f2bbcd41 gl.coffee
Minor edition
2014-11-05 16:22:25 +01:00
mcaeiror
e9b966de83 Update gl.coffee
Some more translations into Galician language
2014-11-05 09:17:58 +01:00
Matt Lott
40506d23a6 Admin growth view 2014-11-04 22:17:49 -08:00
Nick Winter
f461aeca95 Implemented new playback scrubber textures. 2014-11-04 19:03:35 -08:00
Nick Winter
49b8c745a0 New GoalsView background. Be my guest with any text color improvements. 2014-11-04 17:20:58 -08:00
Nick Winter
3a811a05fd Paying attention to level-specific Allied significantProperty overrides in Hero Placeholder replacement. 2014-11-04 16:09:29 -08:00
Nick Winter
b776350e6a Made item shop fit on iPad and small screens. 2014-11-04 08:39:36 -08:00
mcaeiror
0937dbe75c Update gl.coffee
First edition of the galician translation. To be checked!
2014-11-04 17:31:24 +01:00
mcaeiror
bb7e516521 Create gl.coffee
Translation into Galician
2014-11-04 17:28:47 +01:00
Nick Winter
ff1f9d488c Hiding items with no stats or properties in the item shop for non-admins. Simple Boots show as owned. Enabled item shop for non-admins. 2014-11-04 07:52:23 -08:00
Nick Winter
e7e2acf4db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-04 07:19:40 -08:00
Nick Winter
9dba7ee187 Temporarily making Wizard/Ranger gear unpurchasable while we have no Wizards or Rangers. 2014-11-04 07:19:30 -08:00
Igzok
98cf74e375 Update fr.coffee
Corrections & translations
2014-11-04 12:32:18 +01:00
Nick Winter
bfdc671b1d Made Open Sans Condensed use small-caps in a bunch of the places it's used as a header font to slightly better match the old font weights of Bangers. 2014-11-03 22:19:43 -08:00
Scott Erickson
2dee00883c Removed the testing code for the PlayItemsModal. 2014-11-03 20:53:49 -08:00
Scott Erickson
33d14918b0 Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed. 2014-11-03 20:48:59 -08:00
Nick Winter
6db298f03c Merge pull request #1719 from newick/patch-1
corrected incomplete translation
2014-11-03 10:03:04 -08:00
Nick Winter
9ac06fc781 Merge pull request #1718 from Imperadeiro98/patch-1
Update pt-PT.coffee
2014-11-03 10:02:33 -08:00
Nick Winter
dd8654f325 Fixed fr merge. 2014-11-03 10:02:01 -08:00
Nick Winter
aa0dda7886 Fixed nb merge. 2014-11-03 09:59:55 -08:00
Nick Winter
447432301d Turning some links into buttons for iPad. 2014-11-03 09:58:57 -08:00
newick
6ac4edcb12 corrected incomplet translation 2014-11-03 13:39:55 +01:00
Nick Winter
441cf8c339 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-11-02 18:37:36 -08:00
Nick Winter
75f624c10b More iPad tweaks. Can now switch back to logging in from signing up. Default to signing up instead of logging in. 2014-11-02 18:36:43 -08:00
Michael Schmatz
60d60f8b49 Add logging out event 2014-11-02 19:02:49 -05:00
Nick Winter
6184171f2d Pushing playback menu down in accordance with control bar. 2014-11-02 15:22:22 -08:00
Nick Winter
ad2fdb9dde Working on new Fully Illustrated designs for level play view and iPad interface. 2014-11-02 14:51:01 -08:00
Igzok
499851f878 Update fr.coffee 2014-11-02 17:17:17 +01:00
Igzok
8c7d20efc7 Update fr.coffee 2014-11-02 17:16:56 +01:00
Imperadeiro98
14d488c031 Update pt-PT.coffee 2014-11-02 10:16:08 +00:00
Nick Winter
9ebd09ec40 Analytics tracking individual note group starts/ends. Showing next level arrow faster. Added a couple munchkin names from one of yesterday's playtesters. 2014-11-01 16:59:12 -07:00
Nick Winter
af686f562d Propagated i18n. 2014-11-01 15:58:14 -07:00
Nick Winter
e2680a3382 Tweaking my tweaks. 2014-11-01 15:57:42 -07:00
Nick Winter
a061ab5148 Some styling and animation tweaks to the level loading screen. 2014-11-01 11:10:26 -07:00
Nick Winter
57544c72a8 Moved Tactical Strike in from the edge of the map so it's a little more clickable on iPad. 2014-11-01 10:22:38 -07:00
Nick Winter
e129faf384 A few tweaks here and there. 2014-11-01 09:35:19 -07:00
Nick Winter
19c7d7b3b8 Schema is more lenient for problem we occasionally see with opponent level sessions not having a submittedCodeLanguage. Play dungeon menu music on levels of undefined terrain type. 2014-10-31 18:05:29 -07:00
Matt Lott
35cba4a90d Sync PVP status view and bug fixes
Pvp status view (temp location and UI)
Remove pvp status from control bar
Add game menu param for jumping into a specific tab
Lots of bug fixing and session state cleanup
Does not address problems with executing real-time multiplayer cast
2014-10-31 16:33:43 -07:00
mcclane653
4edc839657 Update nb.coffee
added lots of words ;)
2014-10-31 18:41:20 +01:00
Igzok
ef60f5ab51 Update fr.coffee
Severals translations & corrections
2014-10-31 16:13:11 +01:00
Nick Winter
4bc5e5d3ad Gigantic DOM highlight arrow when animating in. A few more tiny tweaks and bugfixes. 2014-10-30 22:31:40 -07:00
Nick Winter
5bbfb70b49 Made name label font size twice as big. 2014-10-30 22:19:32 -07:00
Nick Winter
cd89198f70 Finished rearranging levels on the dungeon map. 2014-10-30 21:34:49 -07:00
Nick Winter
da3872b0a8 Hooked up new inventory recommendations for new levels. 2014-10-30 20:17:57 -07:00
George Saines
a0775e1bf2 moved the practice levels into position 2014-10-30 19:58:11 -07:00
George Saines
c8e5cdefec Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-30 19:47:29 -07:00
George Saines
bab73531f2 modified the map? 2014-10-30 19:47:24 -07:00
Nick Winter
a69e12fbc2 Updated WorldMapView to new levels. 2014-10-30 19:18:03 -07:00
Nick Winter
01fccf5ab7 Started highlight arrow sound A/B test. Hid more of the HUD when hiding. Support for knowing whether your killer was hurt when firing world:thang-died notes. 2014-10-30 19:18:03 -07:00
George Saines
a1695993db Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-30 19:11:16 -07:00
George Saines
40a2c6bbe8 slightly improving forest map icon 2014-10-30 19:11:12 -07:00
Nick Winter
57680f4a83 Hide HUD until Kithgard Gates. 2014-10-30 16:59:32 -07:00
Nick Winter
fa25cd9c32 Hide real-time playback countdown outside of flag levels. Later we can figure this out dynamically. 2014-10-30 16:21:08 -07:00
Nick Winter
cec8350232 Added Missile ThangType kind and a couple misc hero data tweaks. 2014-10-30 15:56:49 -07:00
Nick Winter
47c090f7c7 Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of. 2014-10-30 13:07:04 -07:00
Igzok
4dd3f1724b BIG Update fr.coffee
BIG Translation ! The most is translated !
2014-10-30 20:24:25 +01:00
Christelle
b971a590cb Update fr.coffee 2014-10-30 13:19:00 -05:00
Michael Schmatz
da2ca3ec63 Temporarily increased serialization limit for iOS 2014-10-30 14:12:58 -04:00
Imperadeiro98
3c71d9901f Updated obsolete tip 2014-10-30 17:01:31 +00:00
Imperadeiro98
f0c1730a76 Updated obsolete tip 2014-10-30 17:01:27 +00:00
Nick Winter
7da65dec5b Including leather boots as required gear better. Labeling 'Your Skills'. Not showing a minus for incomplete goals. Adding script triggers for deleting required sample code. 2014-10-29 22:29:36 -07:00
Nick Winter
9b29e9512f Fixed GameMenuModal sometimes defaulting a Python player back to JavaScript. 2014-10-29 16:49:37 -07:00
Nick Winter
ea349cfa29 Intermediate query state for heroes while still transitioning from Unit to Hero. 2014-10-29 15:54:51 -07:00
Nick Winter
98fe639010 Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor. 2014-10-29 15:34:04 -07:00
Scott Erickson
a123fb4b08 Changed how goal states are stored in the level session. Once a goal is succeeded, it can't be undone. 2014-10-29 14:04:27 -07:00
Nick Winter
4e931ea031 iPad script debugging help. Not sending speech update events if not needed when clearing speech. 2014-10-29 13:45:04 -07:00
Nick Winter
2e3afa989b Handling some missing comment template errors better. Fixed equipping builder's hammer before Kithgard Gates. Fixed next level branch button linking. 2014-10-29 12:08:03 -07:00
Nick Winter
83bd8d3834 Enabled Forgetful Gemsmith in the world map. 2014-10-29 11:09:54 -07:00
Nick Winter
696b0ba336 Working around DCM's latest (very old) sploit. 2014-10-29 10:51:34 -07:00
Nick Winter
066fab03a3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-29 10:47:31 -07:00
Nick Winter
efa28b1064 Added some levels to the forest map. Beating levels and returning home now takes you to the proper map. 2014-10-29 10:47:17 -07:00
Scott Erickson
d3192dd373 Fixed a bug where the game menu being auto opened was crashing. 2014-10-29 10:43:05 -07:00
Scott Erickson
6b0a196076 Added support for internationalizing audio scripts in levels. 2014-10-29 10:38:01 -07:00
Scott Erickson
642fda9520 Forgot to add world map campaign icons. 2014-10-29 10:07:51 -07:00
Scott Erickson
02eacbbc8f Added a button to switch between world maps. 2014-10-29 09:48:37 -07:00
enricpc
c6490d7c03 Update ca.coffee 2014-10-29 12:58:02 +01:00
Nick Winter
5ba1f61abe Added i18n support for level code comments. 2014-10-28 21:15:47 -07:00
Nick Winter
c7713b4105 Showing i18n in property docs. 2014-10-28 21:15:47 -07:00