codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-01 03:16:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
5721 commits 27 branches 0 tags 134 MiB
Commit graph

4475 commits

Author SHA1 Message Date
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