codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 10:35:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6622 commits 27 branches 0 tags 134 MiB
Commit graph

4957 commits

Author SHA1 Message Date
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
Scott Erickson
a4729d9d6b Finished migrating the guide into game menu. 2014-10-28 16:30:40 -07:00
Scott Erickson
dcb7aaf9a4 Removed a TODO. 2014-10-28 14:23:39 -07:00
Scott Erickson
e6c0d53d50 ThangType editor now deletes properties properly. 2014-10-28 14:22:29 -07:00
Scott Erickson
67684b89d5 Fixed #1687, forcing reloads when populating i18n in documents. 2014-10-28 14:21:22 -07:00
Scott Erickson
895645ef6d Levels and Components with i18nCoverage update that coverage from the level editor now. 2014-10-28 13:48:17 -07:00
Scott Erickson
9e6fd119a0 Achievements populate i18n whenever they're edited now. 2014-10-28 13:09:07 -07:00
Scott Erickson
e5ea4f70e9 Added a progress bar to the i18n home view. Sorting models by completion so documents needing translation go to the top. 2014-10-28 11:28:31 -07:00
Scott Erickson
7477633909 Trying to better get around mongoose stripping out empty i18n objects. 2014-10-28 11:21:26 -07:00
Scott Erickson
346f3b33bf Added context to the i18n editor for components. 2014-10-28 11:21:26 -07:00
enricpc
71a4a883e5 Update ca.coffee 2014-10-28 09:29:46 +01:00
Nick Winter
68ac412f2b I think this return is needed to prevent sending the i18n query results twice and crashing the server. 2014-10-27 22:54:50 -07:00
Scott Erickson
cea04d27ad Built diplomat-specific views for editing levels, components, achievements and thang types. 2014-10-27 17:16:22 -07:00
Nick Winter
2dbdacd958 GoalsView should now roughly scale with the size of the screen. 2014-10-27 16:37:07 -07:00
Matt Lott
8f923f9e1e Replacing http PATCHs with PUTs 
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
 2014-10-27 16:09:52 -07:00
Nick Winter
eeeb7d47c9 Messing with .executing styles to make them outrageously visible. 2014-10-27 15:54:56 -07:00
Volkan Gezer
75211833b6 Update tr.coffee 2014-10-27 23:03:06 +01:00
Nick Winter
f86c726fc8 Made iPad touch events work on inventory equipping and progress slider. 2014-10-27 13:32:32 -07:00
Nick Winter
5d37e4d34e Merge pull request #1706 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-10-27 13:22:34 -07:00
Imperadeiro98
b6ca682bb9 Update pt-PT.coffee 2014-10-27 19:14:37 +00:00
Titounkle
b3b52727be Update es-ES.coffee 
Autorun can be translated, but it would fit far worse than Autorun itself.Thats why i left it unchanged.
Cheers
 2014-10-27 20:12:07 +01:00
Nick Winter
52b7e464a3 Propagated i18n. 2014-10-27 11:18:40 -07:00
Nick Winter
206f7ee5a4 Upgraded ChooseHeroView: drag onto hero, more visible drag states and animations, emphasize double-click over drag, better programming language selector. 2014-10-27 11:17:34 -07:00
Nick Winter
6b423ed13e Added signup to game menu modal. 2014-10-27 09:27:57 -07:00
Nick Winter
4e947b05ad Merged zh-HANS. Propagated i18n. 2014-10-27 08:47:34 -07:00
Nick Winter
7b2964c6ef Formatting docs popovers for iPad. 2014-10-26 20:21:03 -07:00
Nick Winter
4c8e67efce FastClick avoidance on start level button. 2014-10-26 17:49:45 -07:00
Matt Lott
0f721f9f48 Reducing user code problems view to recent 300 
Loading 1000 took too long (~10min) in production.
 2014-10-26 17:11:51 -07:00
Michael Schmatz
cd0bed2df2 Added FastClick 
iOS artificially introduces 300ms of delay on clicks, which FastClick
eliminates.
 2014-10-26 18:34:04 -04:00
Nick Winter
c0f5c357ba Defense, not defence. 2014-10-26 15:31:20 -07:00
Nick Winter
27d1304c6c Turns out checking Errorception is really useful. 2014-10-26 11:02:34 -07:00
Matt Lott
7c21d5921e Update query for user code problems view 
So it doesn’t explode in production.
 2014-10-26 10:50:30 -07:00
Imperadeiro98
647e578b46 Update pt-PT.coffee 2014-10-26 14:25:53 +00:00
Nick Winter
6473fff940 Implemented stat comparison bars on ChooseHeroView. 2014-10-25 21:53:55 -07:00
Nick Winter
3f5f292f0d Updated how we're sending over spell palette items to iPad app. 2014-10-25 16:26:03 -07:00
George Saines
4b62ba95d3 making the arrow bigger/more visible 2014-10-25 15:59:02 -07:00
Michael Schmatz
56da3af83b Publish "tome:spell-loaded" on spell reloading 2014-10-25 17:00:54 -04:00
Nick Winter
e09b867a93 Propagated i18n. 2014-10-25 11:48:16 -07:00
Nick Winter
66dfa301e5 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-25 11:47:39 -07:00
Nick Winter
774ae24b41 Fixed my Camera fix for point/region choosers. Trying to fix #1411 by insisting on monospace fonts in the code editor. 2014-10-25 11:47:04 -07:00
Matt Lott
185c977cdb User code problems admin view 
Shows the most recent 1000 log entries
Url: admin/user-code-problems
 2014-10-24 15:11:55 -07:00
Matt Lott
f4426f2e43 Save user code errors without 'Line N: ' prefix 2014-10-24 14:05:54 -07:00
Nick Winter
42b81fd55e Fix for point/region choosers destroying AudioPlayer's camera. Fix for DOM highlight arrow covering up level info on iPad. 2014-10-24 13:03:15 -07:00
Nick Winter
8cc5c4d873 Merge pull request #1701 from richhiey1996/patch-1 
Update names.coffee
 2014-10-24 11:52:00 -07:00
richhiey1996
ac6b213fee Update names.coffee 2014-10-25 00:11:28 +05:30
Matt Lott
651ff3c8d0 Update attack snippet if no findNearestEnemy 
This is a one-off fix until we have a more general solution to snippet
updating based on available skills.
 2014-10-24 11:38:48 -07:00
Matt Lott
ff2e8eaa21 Update code snippet schema to code format 2014-10-24 10:18:00 -07:00
richhiey1996
d71ddaf74a Update names.coffee 2014-10-24 13:43:49 +05:30
Nick Winter
79ed8b2470 Hooked up some menu music transitions to play menu music during HeroVictoryModal and GameMenuModal. 2014-10-23 20:03:19 -07:00
Nick Winter
4c33b98e27 Fixed building Thangs with new Components that no other Thang uses. Fixed THangs with id 0 in the level editor. 2014-10-23 18:11:12 -07:00
Nick Winter
13fe1bbece Improved branching choices and set up an A/B/C/D test around branching. 2014-10-23 16:37:09 -07:00
Matt Lott
83516f562b Enable local autocomplete 2014-10-23 16:23:46 -07:00
Matt Lott
a5695e896b Increase size of autocomplete popup 2014-10-23 11:16:58 -07:00
Dmitry
5719586645 Update ru.coffee 2014-10-23 14:56:45 +04:00
Dmitry
17dde2487a translations and improvements 2014-10-23 14:11:57 +04:00
Nick Winter
7f8216f482 Experimental branching support, visible to admins. 2014-10-22 15:42:51 -07:00
Nick Winter
039dd4f264 Fixed issue with HeroVictoryModal assuming achievements all have rewards. 2014-10-22 13:57:57 -07:00
Nick Winter
b85d541304 Merge pull request #1697 from Imperadeiro98/master 
Update pt-PT.coffee
 2014-10-22 13:36:07 -07:00
Christelle
32a230548f Update fr.coffee 2014-10-22 16:17:48 -04:00
Christelle
5d4a6b603b Update fr.coffee 2014-10-22 16:12:41 -04:00
Matt Lott
625a34b2e6 Add autocomplete right-justified help text 2014-10-22 12:24:31 -07:00
Imperadeiro98
918e940edd Update pt-PT.coffee 2014-10-22 19:21:57 +01:00
Nick Winter
f2fdd761df Propagated i18n. 2014-10-22 10:47:03 -07:00
Nick Winter
afc6558edc Spell Saved -> Code Saved. Re-enabled level locking, with a fallback for when victory modals are hanging. 2014-10-22 10:46:34 -07:00
Scott Erickson
9392100d3b Removed some logs. 2014-10-22 08:17:30 -07:00
Scott Erickson
4371873d41 Set up thang types to use their raster property as an icon. 2014-10-22 07:53:50 -07:00
Scott Erickson
49c85bce5f Fixed an issue with thang type marks not handling sprite sheet build completion correctly. 2014-10-22 07:53:50 -07:00
Scott Erickson
e38f26a8d0 Fixed a little bit of spritesheet rebuilding cleanup. 2014-10-22 07:53:50 -07:00
Scott Erickson
1f7d098b2e Added rotation buttons in the context menu and shortcuts to the level editor. 2014-10-22 07:53:49 -07:00
Scott Erickson
20595b50da Fixes 1647. Somehow had been under the impression the segmented sprite containers weren't handling clicks correctly and that segments needed to handle them. 2014-10-22 07:53:49 -07:00
Nick Winter
103418fe2b Removed super-aggressive log which has now served its purpose. 2014-10-21 21:37:49 -07:00
Nick Winter
6539adf53d Sure wish I could test this bug without a full production deploy. 2014-10-21 20:29:45 -07:00
Nick Winter
49f3a0a298 More logging for the merged models problem. 2014-10-21 20:12:20 -07:00
Nick Winter
399cd048fc Logging some stuff to get to the bottom of things. 2014-10-21 19:39:13 -07:00
Matt Lott
bb8d1d8362 Adding more analytics even tracking 
Actions on homepage
Path from homepage to first level
 2014-10-21 16:55:16 -07:00
Nick Winter
09e80120bf Fixed issue with progress scrubber hover not showing the right time when hovering over handle. 2014-10-21 15:59:43 -07:00
Nick Winter
7c2982d3f1 Adding some logging for crazy save validation bugs. Swapping in flag item slot. 2014-10-21 13:57:49 -07:00
Scott Erickson
ba79d59190 Fixed a couple errors in the tests. 2014-10-21 11:54:03 -07:00
Scott Erickson
091910f2ad Fixed debug, and some other mark issues when sprite sheets update, most likely. 2014-10-21 11:36:38 -07:00
Scott Erickson
7f4ac3e5d6 Fixed point and region choosers in the level editor. 2014-10-21 10:59:05 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
yjw9012
ca09381d42 Fixed #1567 
Moved the code diff control to the top of the list, and added a short
instructional message.
 2014-10-20 23:12:00 -07:00
Matt Lott
56c15116a7 Swap problem alert error message and hint lines 
Also fixing problem alert border on Firefox.
 2014-10-20 21:20:33 -07:00
Nick Winter
7a9014f83a Several improvements to the victory modal. 2014-10-20 19:01:00 -07:00
Nick Winter
a33bb215d4 Fixed checking compile-time problems for clean code goals. 2014-10-20 17:49:52 -07:00
Volkan Gezer
0f7fb5d573 fix grouping 2014-10-21 01:51:52 +02:00
Volkan Gezer
e3f894805f some updates to turkish language 2014-10-21 01:44:36 +02:00
Nick Winter
bc15ccd240 Fixed panel vs. total counts on other achievements. 2014-10-20 16:13:56 -07:00
Nick Winter
d0b878db37 Implemented lines-of-code goal type. 2014-10-20 14:43:18 -07:00
Nick Winter
ec3e1d0bce Added optional goals. Working on lines-of-code goal. Fixed bugs with HeroVictoryModal not firing. 2014-10-20 13:57:32 -07:00
Nick Winter
67166f1496 Removed a log. 2014-10-20 09:41:58 -07:00
Nick Winter
1219710cbb Starting to work on codeProblems goal type. Rearranged script import for publishing notes earlier. Fallback for Math.log10. 2014-10-20 09:41:28 -07:00
Nick Winter
08d9e39764 LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests. 2014-10-19 21:56:26 -07:00
Nick Winter
1fb48f2b85 Fixed a few bugs. Removed Olark; disabled LinkedIn. Added ladder submission to HeroVictoryModal. 2014-10-19 17:38:10 -07:00
Nick Winter
440e1700b1 Using aiSource now for enemy AIs in multiplayer, separate from sample code source. 2014-10-19 12:44:58 -07:00
Imperadeiro98
9fc4498ace Update pt-PT.coffee 2014-10-19 19:16:13 +01:00
Nick Winter
0f6bfddd57 Propagated i18n. 2014-10-19 08:34:15 -07:00
Nick Winter
b7143c32f7 A bit of housekeeping for the last few i18n pull requests in perspicacious preparation for proper propagation. 2014-10-19 08:33:30 -07:00
Nick Winter
51be5f354c Merge pull request #1689 from AbnerZheng/patch-3 
Update zh-HANS.coffee
 2014-10-19 08:29:02 -07:00
Li Ma
c0c35cafe5 Update zh-HANS.coffee 
添加一些零散翻译
 2014-10-19 23:00:45 +08:00
AbnerZheng
c722c4cea7 Update zh-HANS.coffee 
由于前面有人把stats翻成"成就"，为保持一致性，也翻译成"成就"
 2014-10-19 22:47:17 +08:00
Imperadeiro98
84c05109ea Update en.coffee 2014-10-19 12:51:50 +01:00
Imperadeiro98
d4f9078980 Update WorldMapView.coffee 2014-10-19 12:50:58 +01:00
Imperadeiro98
d9a32895c7 Update MainPlayView.coffee 2014-10-19 12:49:57 +01:00
Nick Winter
9f216e3361 Preserving opponent flags. 2014-10-18 18:57:33 -07:00
Nick Winter
66c728210b Fixing flag coloring in new WebGL rendering. 2014-10-18 18:18:12 -07:00
Nick Winter
24da2aa80a Preserving flag history and submission count so that things are more stable in between real-time submissions. 2014-10-18 17:32:01 -07:00
Nick Winter
9ce8ebaf25 Merge pull request #1686 from rafajaques/master 
Translation done and spell check
 2014-10-18 15:57:11 -07:00
Rafael Jaques
e32787d25c Translation done and spell check 2014-10-18 19:17:07 -03:00
Nick Winter
9c8a0e83af Fixed an indentation typo in pt-BR.coffee. 2014-10-18 14:54:04 -07:00
Nick Winter
56a80e3615 Started getting hero-ladder level type working. 2014-10-18 14:51:49 -07:00
Dmitry
441b1351aa some translates 2014-10-19 00:45:56 +04:00
Nick Winter
08da130598 Merge pull request #1684 from rafajaques/master 
Almost done
 2014-10-18 08:03:14 -07:00
Rafael Jaques
cf64112d95 Almost done! 2014-10-18 11:29:43 -03:00
Michael Schmatz
4aff89d60a Fixed spell palette changes for iPad 2014-10-18 09:46:08 -04:00
Rafael Jaques
d56b2207da Update pt-BR.coffee 2014-10-18 10:39:44 -03:00
Nick Winter
2e539debbb Added signup poke to HeroVictoryModal. 2014-10-17 20:47:32 -07:00
Nick Winter
de7985fc2e More blingstrositization for the HeroVictoryModal. 2014-10-17 20:15:41 -07:00
Nick Winter
a71c591f54 First set of fixes to HeroVictoryModal. 2014-10-17 18:00:13 -07:00
Matt Lott
f75ff8a236 Don't save duplicate user code problems 2014-10-17 15:53:00 -07:00
Nick Winter
a65dabad04 Removed level-specific achievements from achievements list. Fixed bug with return type documentation not showing up. Reduced initial first-level arrow delay. 2014-10-17 15:25:31 -07:00
Nick Winter
cc1d247014 Merge pull request #1682 from rafajaques/master 
pt-BR translations
 2014-10-17 14:26:52 -07:00
Rafael Jaques
7ec54720ca Update pt-BR.coffee 2014-10-17 17:01:51 -03:00
Rafael Jaques
b8d59ed78a Update pt-BR.coffee 2014-10-17 16:59:33 -03:00
Rafael Jaques
a3c8621584 Update pt-BR.coffee 2014-10-17 16:13:20 -03:00
Nick Winter
c4207873d7 Merge pull request #1681 from Imperadeiro98/patch-1 
Update cast_button.jade
 2014-10-17 10:11:40 -07:00
Rafael Jaques
34dd1dadca Update pt-BR.coffee 2014-10-17 13:56:44 -03:00
Scott Erickson
0dc050abca Added i18nCoverage backend support. 2014-10-17 12:12:06 -04:00
Imperadeiro98
3b9feebee8 Update cast_button.jade 
Internationalized "Submit".
 2014-10-17 17:06:25 +01:00
Nick Winter
7f60701daa Merge pull request #1678 from yjw9012/master 
#1668: moved the question above the dropdown
 2014-10-17 08:50:42 -07:00
Nick Winter
005b4991cd Merge pull request #1680 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-17 08:48:47 -07:00
Nick Winter
7bc50ade30 Fixes for spectate layout in new WebGL dual-stage mode. 2014-10-17 08:47:53 -07:00
Imperadeiro98
f496823bb5 Update level_loading.jade 
Removed an unused tip.
 2014-10-17 16:38:21 +01:00
Scott Erickson
36ea415dbf Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-17 10:11:33 -04:00
Scott Erickson
092997bffe Added i18n coverage logic to the CocoModel. 2014-10-17 10:11:26 -04:00
yjw9012
30b261e40a Merge remote-tracking branch 'upstream/master' 2014-10-16 23:27:50 -07:00
yjw9012
fe66b6e960 #1668: moved the question above the dropdown 
moved the question ‘which programming do you want to use?’ above the
programming language dropdown.
 2014-10-16 21:39:59 -07:00
Nick Winter
a922c9c6ef First draft of new hero spell palette that groups abilities by item. 2014-10-16 21:38:11 -07:00
Nick Winter
07b988c405 Fixed gear requirements for Closing the Distance. 2014-10-16 12:14:04 -07:00
Nick Winter
54de8482f1 Spell palette now hugs the spell editor, which itself shrinks as needed. 2014-10-16 12:08:21 -07:00
Scott Erickson
fbaced90c3 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 16:43:37 -04:00
Scott Erickson
9455199b39 Limited social media library loading to only those views that need it. 2014-10-15 16:43:26 -04:00
Nick Winter
d3f35f024a Fixed #1665. Fixed #1667. 2014-10-15 10:33:33 -07:00
Nick Winter
92ec44ffce Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-15 10:28:39 -07:00
Nick Winter
9826311656 Started playing menu music on WorldMapView. Only go full-screen on squat windows where we really need it (see #1669). 2014-10-15 10:28:29 -07:00
Nick Winter
fbdb666e01 Merge pull request #1664 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-15 08:39:40 -07:00
Nick Winter
5c40f99d99 Hide guide and select-a-thang message when not needed. Updated commonThisMethods. Restricted script IDs a bit. 2014-10-14 22:38:22 -07:00
Matt Lott
7cbb5ac45d Pass common 'this' methods to Aether 2014-10-14 17:53:17 -07:00
Matt Lott
ce14f92979 Pass problem context to Aether 
So Aether can craft better error messages.
Bumping Aether to v0.2.39
 2014-10-14 14:02:34 -07:00
Nick Winter
04ec8c5222 Sped up maze levels. Fixed an unhinged world deserialization listener. 2014-10-14 11:53:32 -07:00
Nick Winter
ee9e32af51 Hid play/pause button for first few levels. Hid submit button until run once or won for a few more levels. 2014-10-14 11:11:56 -07:00
Nick Winter
b7fe9398d5 Don't preload when player hasn't finished typing this or self. 2014-10-14 10:39:13 -07:00
Nick Winter
d79d40b98c Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin. 2014-10-14 09:54:36 -07:00
Gabriel Cesar
1493110043 pt-BR.coffee updated. 2014-10-14 12:43:44 -03:00
Nick Winter
69a3f78594 Merge pull request #1662 from gabrielcesar/master 
pt-BR.coffee updated.
 2014-10-14 08:30:36 -07:00
Nick Winter
136168f928 Merge pull request #1661 from ikks/patch-1 
Update es-419.coffee
 2014-10-14 08:29:47 -07:00
Nick Winter
80537dfac7 Experimented with triggering full-screen on first level start. 2014-10-13 21:45:14 -07:00
George Saines
ee88c0870e pushing my fix 2014-10-13 16:24:54 -07:00
George Saines
6350debf26 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-13 15:51:48 -07:00
Scott Erickson
99e5941126 Set up the HeroVictoryModal to block until achievements data has loaded. Enabled the HeroVictoryModal for hero levels. 2014-10-13 17:18:33 -04:00
Scott Erickson
6ff7cd12cc Mostly done with the victory modal. 2014-10-13 11:53:08 -04:00
Imperadeiro98
c3a35d5de7 Update pt-PT.coffee 2014-10-12 18:38:16 +01:00
Gabriel Cesar
d75a0653c3 added some pt-br translations 2014-10-12 02:31:36 -03:00
Igor Támara
5016529f6b Update es-419.coffee 2014-10-11 14:09:18 -05:00
Michael Schmatz
dee5d82d61 Added gutter problem support for iPad 2014-10-11 12:57:45 -04:00
Michael Schmatz
e7269a62dd Added line highlighting event for iPad 2014-10-11 11:34:31 -04:00
Nick Winter
281d0ef96e Fixed zh-HANT.coffee merge conflicts. 2014-10-11 08:24:42 -07:00
Nick Winter
af36b3e4ef Merge pull request #1658 from Imperadeiro98/patch-1 
Update level_loading.jade
 2014-10-11 08:20:43 -07:00
Nick Winter
1203efaad0 Fixing el.coffee merge conflicts. 2014-10-11 08:19:37 -07:00
Imperadeiro98
e574843599 Update pt-PT.coffee 2014-10-11 10:49:22 +01:00
Imperadeiro98
3dc9a5dfdc Update pt-PT.coffee 2014-10-11 10:47:39 +01:00
Imperadeiro98
8130c1b3fa Update pt-PT.coffee 2014-10-11 10:46:31 +01:00
Imperadeiro98
3c5adb7bad Update level_loading.jade 
This tip was removed some time ago from the locale files.
 2014-10-11 10:19:30 +01:00
Nick Winter
f80380784a Levels save right away on victory. 2014-10-10 19:20:00 -07:00
Nick Winter
2db637866c Fix for non-Boolean includeFlow. 2014-10-10 18:23:51 -07:00
George Saines
3927371427 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-10 16:55:12 -07:00
George Saines
95afb6c4d3 playing with FPS 2014-10-10 16:55:09 -07:00
Nick Winter
629827f133 Fixed onAnnotationClick handler message. 2014-10-10 13:36:13 -07:00
Nick Winter
7f9fdc7253 Fixed temporarily locking of items. 2014-10-09 19:59:57 -07:00
Nick Winter
a0ad5efba2 Some improvements for exhortation of tunic donning in The Raised Sword. 2014-10-09 19:54:39 -07:00
Matt Lott
37ac9f1a69 Fix highlight error when opening browser tools 2014-10-09 17:55:38 -07:00
Nick Winter
7487df5af8 Point out (and require) equipping of necessary items for first set of levels. Can now drag items to unequip. 2014-10-09 15:54:18 -07:00
Gkntos
e9f0b9f67a Update es-ES.coffee 
Some changes tu un-transaleted phrases.
:)
 2014-10-09 14:01:01 -05:00
Nick Winter
413e99b6ae Merge pull request #1654 from Imperadeiro98/patch-1 
Update victory.jade
 2014-10-09 10:14:34 -07:00
Nick Winter
45471b8030 Fix for streaming new serialized Aethers into worlds where their Thangs hadn't existed before. 2014-10-09 09:53:57 -07:00
Imperadeiro98
cc5a2508d9 Update victory.jade 
Corrected some i18n errors.
 2014-10-09 14:29:48 +01:00
George Litos
f88c889e8f Greek translation update 2014-10-09 12:59:31 +03:00
Matt Lott
b6f37694e1 Autocomplete line endings for javascript 
Fixes #1651
 2014-10-08 14:23:13 -07:00
Nick Winter
f9409488ff Fixed a bug with jerky camera udpates due to dropped frames and camera updating before positions update. Fleshed out default level scripts. Tweaked style on Dropper code. 2014-10-08 12:38:23 -07:00
Nick Winter
589c3b090c Moved DOM highlight arrows from PlayLevelView to CocoView so that everywhere can use them. Added highlight for next level on world map. 2014-10-08 10:46:10 -07:00
Nick Winter
c6b398aae2 Increased prominence of GoalsView when at level playback end. Increased legibility of Surface text when PlaybackOverScreen is in effect, and changed colors of PlaybackOverScreen to be less intense and to indicate goal failure / non-failure. 2014-10-08 09:46:56 -07:00
Nick Winter
fcd174ed22 Re-enabled line-by-line highlighting through brute force for hero levels. 2014-10-07 22:28:53 -07:00
Matt Lott
1108159603 Enable updated autocomplete 
Bug fixes for incorrect autocompletes such as “this.this.moveRight()();”
Reducing suggestions to just level snippets to make it more beginner
friendly.
 2014-10-07 15:13:43 -07:00
Nick Winter
ff467d1f31 Don't play a selection sound when adding a Thang. 2014-10-07 12:04:55 -07:00
Nick Winter
5261a7d4d9 Snap to integer meters in the level editor when holding shift. 2014-10-07 10:41:16 -07:00
Nick Winter
ef3edfcc08 Optimization for not rebuilding LevelSession defaults once a second to set playtime. 2014-10-07 10:06:41 -07:00
Nick Winter
67ed73a01f Probably don't need this; it doesn't appear to be storing the NaNs. 2014-10-06 22:29:54 -07:00
Nick Winter
e04a0f33a1 Fixed bug recording level playtime. 2014-10-06 18:55:10 -07:00
Nick Winter
8fdd2c0688 Redid my bobbing fix b286b24 in a way that doesn't break the LankBoss position test. 2014-10-06 18:18:39 -07:00
Nick Winter
ea25224c1e Moved popover navigation fix of #1603 from initialize's link handler to Router's closeCurrentView method. 2014-10-06 18:09:27 -07:00
Nick Winter
c9b01af21c Merge pull request #1603 from ThatOtherPerson/dismiss-popovers 
Fix #1602
 2014-10-06 18:06:32 -07:00
Nick Winter
f9b510aac1 Merge pull request #1645 from kaktycc/patch-2 
Update ru.coffee
 2014-10-06 17:58:37 -07:00
Nick Winter
e6339d68a1 Fixed merge conflicts. 2014-10-06 17:57:47 -07:00
Nick Winter
04939ea690 Merge pull request #1643 from AbnerZheng/patch-2 
Update zh-HANS.coffee
 2014-10-06 17:52:11 -07:00
Nick Winter
dfdcf66f4b A couple tweaks to the ordering of events when starting to play a level. Renaming A Bolt in the Dark to Crossing the Distance. 2014-10-06 17:46:22 -07:00
Scott Erickson
f00fd66bed Fixed displaying raster image thangs in the thang editor. 2014-10-06 16:22:21 -07:00
Nick Winter
b286b24f27 Fixed bobbing. Increased LayerAdapter cleanup vengeancy. Allow dragging without snapping when playback is at the end. 2014-10-06 15:04:42 -07:00
Nick Winter
0fefd627fa Fixed COPPA toggle. 2014-10-06 15:04:42 -07:00
Nick Winter
d6b7616f15 Updated keyboard shortcut symbols. 2014-10-06 15:04:42 -07:00
Matt Lott
efa1f7c4a3 Disable Google+ on login modal for IE 
This is causing script errors in IE10.
 2014-10-06 13:38:08 -07:00
Nick Winter
31056933e9 Added volume control to world map. 2014-10-06 10:17:55 -07:00
Nick Winter
63f518e7c6 Fixed LevelHUDView incorrectly showing empty action timeline due to switching from dialogue elements. 2014-10-06 10:17:55 -07:00
Evgenii
77f66d1e1b Update ru.coffee 2014-10-04 14:06:59 +04:00
Matt Lott
530da639d8 Removing css background-position-x usage 
Not supported in Firefox or Opera.
 2014-10-03 16:02:50 -07:00
Matt Lott
33055ca0b5 Fix IE9 world map game control button images 
Fixes #1625
 2014-10-03 15:39:33 -07:00
Matt Lott
49cf206be7 Border-image fallback for world map level buttons 2014-10-03 15:24:43 -07:00
Scott Erickson
b78c91997c Tweaked associating lanks with layers. 2014-10-03 12:06:04 -07:00
Scott Erickson
3da0ea9d72 Fixed labels and marks not properly updating in the level editor. 2014-10-03 12:00:08 -07:00
Scott Erickson
e504932e5e Added yet another fine tuning of camera movement in the level editor. 2014-10-03 11:54:06 -07:00
Scott Erickson
cc04626a5a Fixed walls not updating when you edit them in the ThangsTabView. 2014-10-03 11:21:05 -07:00
Scott Erickson
3305a3d7db Added a way to set titles for RootViews. In development, titles show what RootView class you're looking at. 2014-10-03 10:45:01 -07:00
Scott Erickson
d65ade7a97 Couple teardown fixes. 2014-10-03 10:44:02 -07:00
Scott Erickson
df1c72d132 Fixed normalCanvas styling in the level editor. 2014-10-03 09:59:54 -07:00
Scott Erickson
ca9c387964 Fixed singular sprite animations frame ordering. 2014-10-03 09:51:07 -07:00
Scott Erickson
67bd01b397 Fixed a bug where SegmentedSprite would sometimes error out (particularly the door on death). 2014-10-03 09:36:47 -07:00
Scott Erickson
64acbe4580 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-03 09:11:12 -07:00
AbnerZheng
6f0d3fa6e3 Update zh-HANS.coffee 
method是不是要统一成法术？  暂时翻译成了方法，如有出入，请告知。
 2014-10-04 00:03:57 +08:00
Nick Winter
0c09a468c7 Fixed skipping through real-time playback to fire when the final goals are actually ready. 2014-10-02 17:49:14 -07:00
Scott Erickson
d02d58ed4e Improved the LayerAdapter to more accurately adjust its size downward if it renders a spritesheet, handle when a single thang is too large, and cancels in-progress async builds if a new one starts. 2014-10-02 17:38:50 -07:00
Nick Winter
3cdb8ff416 Fixed music defaulting to off while appearing on. Reordered The Second Kithmaze and New Sight on the dungeon map. 2014-10-02 17:21:06 -07:00
Scott Erickson
5bb1275cea Tweaked how movie clips are animated and copied from, sidestepping how adding children from movie clips removes them from the movie clips, and making inheritence fully recursive. 2014-10-02 16:55:03 -07:00
Scott Erickson
ca84721921 Added a play button to the thang type edit view, made the canvas taller, and now have selected nodes show bounds for the display object being displayed. 2014-10-02 16:54:58 -07:00
Scott Erickson
6bd6b2eea2 Tweaked when and how we shift the bounds of imported sprites. For things like Anya, especially Anya's attack, it wasn't working correctly. 2014-10-02 16:54:58 -07:00
Nick Winter
abf28c2c19 Fixed bug with world deserialization missing state batches. 2014-10-02 15:33:23 -07:00
Scott Erickson
987061cec6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 14:43:08 -07:00
George Saines
90be8a4ad3 moving the level dots to fit the dungeon world map 2014-10-02 14:36:26 -07:00
Nick Winter
3636f3d259 Messing with the scaling on the dungeon map. 2014-10-02 14:05:18 -07:00
Nick Winter
5c2b03d245 Propagated i18n. 2014-10-02 12:12:51 -07:00
Nick Winter
16ff8c6601 Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails. 2014-10-02 12:10:24 -07:00
Imperadeiro98
9c97abe6d0 Update pt-PT.coffee 2014-10-02 19:39:23 +01:00
Nick Winter
62fa133075 Merge pull request #1612 from kaktycc/patch-1 
Update ru.coffee
 2014-10-02 11:25:50 -07:00
Nick Winter
47c4ab700a Propagated i18n. 2014-10-02 11:24:16 -07:00
Nick Winter
285264ceb4 Skip past hero selection if hero has already been selected. 2014-10-02 11:18:43 -07:00
Scott Erickson
e1e8945f9e Made sure all dots are invisible by default. 2014-10-02 10:50:05 -07:00
Scott Erickson
b1f4dc996d Fixed a handful of bugs with the thang editor and sprite animation. 2014-10-02 10:42:21 -07:00
Scott Erickson
e044a660eb Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-02 09:28:31 -07:00
Nick Winter
40b61c32f2 Linked iPad preview video from teacher's page. 2014-10-02 01:20:45 -07:00
Nick Winter
2491861d76 A few tweaks for the iPad app. 2014-10-01 22:02:52 -07:00
Nick Winter
d50a90171a Added new slot icons and dungeon map. 2014-10-01 18:17:21 -07:00
Nick Winter
36615ae39f Unlocked all levels again until we can figure out the achievement timing problems. 2014-10-01 17:02:04 -07:00
Scott Erickson
1b1bc4e95a Fixed adding thangs in the level editor, and moving them around. 2014-10-01 15:02:14 -07:00
Scott Erickson
e9222f34bd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-01 13:26:45 -07:00
Scott Erickson
3205821ee9 Got the level editor mostly working again. 2014-10-01 13:26:38 -07:00
Nick Winter
0290db9cd4 Starting to try to get iPad to work during real-time playback. 2014-10-01 12:08:14 -07:00
Nick Winter
5dd7c3ffa1 Adding some iPad event publishing optimizations. Fixed #1623. 2014-10-01 10:58:19 -07:00
Nick Winter
dce47f6570 Merge pull request #1611 from ClashTheBunny/patch-1 
Rough translations of more phrases to Bulgarian
 2014-10-01 09:11:59 -07:00
Nick Winter
4c1448e818 Merge pull request #1610 from enricpc/patch-2 
Update ca.coffee
 2014-09-30 22:10:07 -07:00
Nick Winter
cbad8d30da Merge pull request #1608 from Imperadeiro98/patch-1 
Update pt-PT.coffee
 2014-09-30 22:09:35 -07:00
AbnerZheng
74398c43f9 Update zh-HANS.coffee 2014-10-01 11:51:24 +08:00
Nick Winter
8d37309de1 Several fixes for achievement recalculation. 2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3 Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle. 2014-09-30 16:18:32 -07:00
Nick Winter
2611e441d7 Trying to standardize sass imports in an effort to test #1615, to no avail. 2014-09-30 16:17:54 -07:00
Scott Erickson
1dda6bfcfc Layed the view framework for a new hero victory modal. 2014-09-30 16:14:47 -07:00
Scott Erickson
19e6b9d095 Fixed real-time placement of normal canvas, and brought the stop-real-time-playback-button on top of it. 2014-09-30 14:25:44 -07:00
Scott Erickson
bab7598ce0 Fixed an error wizard sprites were having. 2014-09-30 14:01:29 -07:00
Scott Erickson
ffdb2ef6b4 Fixed position updating for indie sprites. 2014-09-30 14:01:20 -07:00
Scott Erickson
c05cc1c0ad Fixed text box pointers being cut off from caching. 2014-09-30 14:00:47 -07:00
Scott Erickson
528383c0dc Undid the attempted optimization of having the normal stage update half as often. 2014-09-30 13:45:15 -07:00
Scott Erickson
90e21c6085 Did some more missed refactorings from sprite -> lank. 2014-09-30 13:44:03 -07:00
Scott Erickson
34cf6240c1 Refactored heroSprite -> heroLank, replaced a call to LankBoss.spriteFor with LankBoss.lankFor. 2014-09-30 13:41:42 -07:00
Scott Erickson
4a6e8018e4 Fixed choosing the first frame for segmented sprites. 2014-09-30 13:34:55 -07:00
Scott Erickson
b3ae258bed Fixed some issues with the thang editor. 2014-09-30 13:34:44 -07:00
Scott Erickson
8f29d0ee7f Did some tweaking of UserView to handle slugs for ids. 2014-09-30 10:53:01 -07:00
Scott Erickson
adbfa42f25 Merge branch 'master' into feature/webgl 2014-09-30 10:27:26 -07:00
Matt Lott
169e5614d6 Merge pull request #1613 from codecombat/feature/browser-support 
Browse support updates
 2014-09-30 10:23:28 -07:00
Scott Erickson
6b03de0235 Merge branch 'master' into feature/webgl 2014-09-30 10:21:51 -07:00
Matt Lott
405c21cba4 Clean up sync world running GoalManager creation 2014-09-30 10:15:33 -07:00
enricpc
eebbe8a130 Update ca.coffee 2014-09-30 15:41:44 +02:00
kaktycc
3b4ceeca3d Update ru.coffee 2014-09-30 14:54:17 +04:00
Matt Lott
8f85e37713 Fix for main thread GoalManager creation 
Using @shared.goalManager.constructor was yielding an incomplete
GoalManager in IE9.

Also fixing up console.debug in CocoModel for IE10 and earlier.
 2014-09-29 17:31:58 -07:00
Matt Lott
1e864d49e2 Box2D in own script, rename Vector 
Renaming Vector to Box2DVector to avoid naming collisions when
including Box2D on the main thread.  There may be a way to change how
scripts are built and included to avoid this rename, but it wasn’t
obvious.

Box2D declares a Vector in the global namespace, which conflicts with
the CodeCombat Vector.
 2014-09-29 12:48:58 -07:00
George Saines
fcd943aa46 adding the teacher's page first draft for HoC 2014-09-29 11:47:40 -07:00
Scott Erickson
b06cd12c5c Some more optimizations, this time in LankBoss update operations. 2014-09-29 11:47:12 -07:00
Scott Erickson
ce9a7e2ed4 Improved performance of the non-webgl stage. 2014-09-29 10:18:27 -07:00
Randall Mason
45daffc2f3 Rough translations of more phrases to Bulgarian 
They should be looked over for grammar and spelling mistakes.
 2014-09-29 16:52:45 +03:00
enricpc
26c4271736 Update ca.coffee 2014-09-29 12:34:47 +02:00
Matt Lott
136af8a0b4 Fixes for world simulation without Web Workers 
Primarily for IE9, which is still blocked by box2d issues with these
changes.

Forcing vendor.js instead of vendor_with_box2d.js in main.html allows
you to load a level in IE9, but without Collision-based movement.

Work in progress.
 2014-09-28 23:24:18 -07:00
Scott Erickson
326057a816 Fixed another bug from the refactoring. 2014-09-28 14:16:56 -07:00
Scott Erickson
b65b553f2d Fixed some tests broken from the refactoring. 2014-09-28 14:04:01 -07:00
Scott Erickson
f081d9ed4b Refactored CocoSprite -> Lank, lank.imageObject -> lank.sprite, SpriteBoss -> LankBoss, spriteLayers -> layerAdapters, sprite -> lank in general. Also got the ThangTypeEditView working again. 2014-09-28 14:00:48 -07:00
Scott Erickson
8adbd87401 Merge branch 'master' into feature/webgl 2014-09-28 10:38:19 -07:00
Scott Erickson
024cd9c955 Fixed a bunch of tests, and a child animations bug from the MovieClip pooling optimization. 2014-09-28 10:33:24 -07:00
Scott Erickson
6d595705f2 Made the placeholder color and shape different for each layer. 2014-09-26 16:15:44 -07:00
Scott Erickson
8234db333e Reenabled text events. 2014-09-26 15:57:24 -07:00
Scott Erickson
b89a6c41a7 Fixed the surface to not restore state until it's done dropping frames. 2014-09-26 15:23:27 -07:00
Scott Erickson
332f4700f6 Fixed the mark toggle equivalency check. This bug was causing the target mark to be turned on repeatedly. 2014-09-26 15:22:46 -07:00
Scott Erickson
f0e879295c Set back up debug marks. 2014-09-26 14:09:44 -07:00
Scott Erickson
f21083acf5 Set back up highlight mark. 2014-09-26 13:58:35 -07:00
Scott Erickson
2505f50eec Set back up selection and target marks. 2014-09-26 13:45:11 -07:00
Scott Erickson
5b9c7dc8a7 Removed layer's cache function (wasn't used before webgl factoring anyway?). Removed TRANSFORM_CHILD layer transform setting. 2014-09-26 13:02:01 -07:00
Scott Erickson
37e9d7bb2d Enabled the Surface's normalStage and all its layers. 2014-09-26 12:45:27 -07:00
Scott Erickson
c1e7423a64 Fixed sprite coloring and the thangtype-not-yet-loaded placeholder. 2014-09-26 12:17:46 -07:00
Imperadeiro98
b0ae4f1ddb Update pt-PT.coffee 2014-09-26 20:11:14 +01:00
Scott Erickson
6f45eee81d Fixed registration points for scaled raster image thang types. 2014-09-26 11:33:07 -07:00
Scott Erickson
be805ff3c1 Update scale and rotation after playing a new action, since with segmented sprites that often means a new image object. 2014-09-26 11:25:36 -07:00
Scott Erickson
627c56dbb5 Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema. 2014-09-26 11:07:01 -07:00
enricpc
e3e84bef73 Update ca.coffee 2014-09-26 15:53:51 +02:00
Nick Winter
cf9cf6f98b Stopped locking levels for now, since the achievements aren't quite unlocking them correctly. 2014-09-26 03:52:57 -07:00
Nick Winter
f0408a85d3 Recommented a couple ca.coffee section headers that aren't started yet. 2014-09-26 03:43:35 -07:00
Nick Winter
dc18438356 Merge pull request #1605 from enricpc/patch-1 
Update ca.coffee
 2014-09-26 03:42:22 -07:00
George Litos
a1cf7823de Merge remote-tracking branch 'upstream/master' 2014-09-26 12:31:23 +03:00
George Litos
4fbacda295 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	app/locale/el.coffee
 2014-09-26 12:30:55 +03:00
Nick Winter
98fed4a277 Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs. 2014-09-26 02:29:04 -07:00
enricpc
37b04c10cb Update ca.coffee 2014-09-26 09:44:10 +02:00
Matt Lott
c50b443eca IE9 compat: css fixes 
Linking to bless-brunch git for fixes that blocked bless from splitting
app.css into multiple files to address IE9 limits.

sass-brunch version update fixes problems during the css file-splitting
that were messing up nested @media queries.
 2014-09-25 16:17:35 -07:00
Nick Winter
9656fd4f49 Propagated i18n. 2014-09-25 15:58:49 -07:00
Nick Winter
4ca7df0b32 A few fixes to WorldMapView to handle authentication and hiding the parts that aren't done yet. 2014-09-25 15:58:25 -07:00
Nick Winter
0928bb7a81 Completed transition to new hero levels. 2014-09-25 15:32:33 -07:00
George Litos
384bd4291e Merge remote-tracking branch 'upstream/master' 2014-09-26 01:05:42 +03:00