8000 Vertical global map for Catalyst by Bryukh · Pull Request #7950 · codecombat/codecombat · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Vertical global map for Catalyst #7950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 28 commits into from
Mar 31, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
a51ce56
Add Catalyst campaign support in campaign view
Bryukh Mar 14, 2025
7c77d95
Refine Catalyst experiment logic in User model to handle cases where …
Bryukh Mar 26, 2025
0aefd05
Add portal-catalyst support in campaign view and styles
Bryukh Mar 26, 2025
e33bf80
Skip portal scrolling for catalyst view in CampaignView
Bryukh Mar 26, 2025
2cc9167
Update campaign view styles for improved layout and positioning
Bryukh Mar 26, 2025
e57aa8c
Refactor campaign view template for improved structure and maintainab…
Bryukh Mar 26, 2025
d6fe311
Refactor campaign view template to enhance structure and clarity
Bryukh Mar 26, 2025
7199c61
Refactor side campaign styles for improved layout and visibility
Bryukh Mar 26, 2025
8c44a5e
Update campaign view styles for improved layout and hover effects
Bryukh Mar 26, 2025
915a599
Refactor campaign view template and update campaign selection logic
Bryukh Mar 26, 2025
e06d0bc
Update campaign view styles to enhance layout and responsiveness
Bryukh Mar 26, 2025
e42d251
Enhance campaign view styles for improved layout and responsiveness
Bryukh Mar 26, 2025
d1e23be
Refactor campaign view styles and template for clarity and consistency
Bryukh Mar 26, 2025
d071fd9
Enhance campaign view template and styles for silhouette effect
Bryukh Mar 26, 2025
b294cf6
Enhance campaign view styles and template for locked campaigns
Bryukh Mar 26, 2025
9a786df
Update campaign view styles and template for left/right campaign classes
Bryukh Mar 26, 2025
0c8ac3c
Enhance campaign view template for Catalyst users
Bryukh Mar 27, 2025
b388378
Implement game controls for Catalyst users in campaign view
Bryukh Mar 27, 2025
0e1b222
Enhance campaign view styles and template with new animations and but…
Bryukh Mar 27, 2025
0e5c757
Refactor campaign view template and JavaScript for improved user expe…
Bryukh Mar 27, 2025
5eeab8a
Update campaign view styles and assets for HackStack integration
Bryukh Mar 27, 2025
8a41050
Add new assets and styles for AI League and Roblox features in campai…
Bryukh Mar 27, 2025
77446d0
Refactor z-index values in campaign view styles for improved layering
Bryukh Mar 28, 2025
288a86a
Add user status display for Catalyst users in campaign view
Bryukh Mar 28, 2025
ad3feaa
Update user status display and styles in campaign view
Bryukh Mar 28, 2025
0438d19
Refactor utility controls and update styles in campaign view
Bryukh Mar 29, 2025
6ba020f
Update campaign view styles to adjust margins for improved layout
Bryukh Mar 29, 2025
6edb5ad
Enhance portal interaction handling in CampaignView
Bryukh Mar 31, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/locale/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ module.exports = {
subscriber_heroes: 'Subscribe today to immediately unlock Amara, Hushbaum, and Hattori!',
subscriber_gems: 'Subscribe today to purchase this hero with gems!',
practice_license_required: '(license required for practice levels)',
anonymous: 'Anonymous Player',
anonymous: 'Anonymous',
level_difficulty: 'Difficulty: ',
awaiting_levels_adventurer_prefix: 'We release new levels every week.',
awaiting_levels_adventurer: 'Sign up as an Adventurer',
Expand Down
8 changes: 6 additions & 2 deletions app/models/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -1345,8 +1345,12 @@ module.exports = (User = (function () {
if ((!value)) {
let valueProbability
// 0% chance to be in the beta group by default
const probability = window.serverConfig?.experimentProbabilities?.catalyst?.beta != null ? window.serverConfig.experimentProbabilities.catalyst.beta : 0.5
if (Math.random() < probability) {
const probability = window.serverConfig?.experimentProbabilities?.catalyst?.beta
if (probability == null) {
// it means we're not running the experiment
value = 'control'
valueProbability = 1
} else if (Math.random() < probability) {
value = 'beta'
valueProbability = probability
} else {
Expand Down
23 changes: 23 additions & 0 deletions app/styles/common/common.sass
< 770D td class="blob-code blob-code-addition js-file-line"> width: 20px
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,29 @@ kbd
width: 60px
height: 60px

.star
display: inline-block
background: transparent url(/images/achievements/star.png) no-repeat center
background-size: contain
width: 80px
height: 80px
margin: 0px 2px

&.star-20
height: 20px

&.star-30
width: 30px
height: 30px

&.star-40
width: 40px
height: 40px

&.star-50
width: 50px
height: 50px
.popover
@if $is-codecombat
z-index: 1000002
Expand Down
Loading
Loading
0