Skip to content

Commit

Permalink
May Update
Browse files Browse the repository at this point in the history
  • Loading branch information
AkinariHex committed May 26, 2021
1 parent 766516f commit fd7d95b
Show file tree
Hide file tree
Showing 13 changed files with 1,138 additions and 76 deletions.
48 changes: 25 additions & 23 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
## v1.6.0
## v1.7.0
### Displayer
- New background 👀.
- Changed the default colors to <span style="color: rgb(247, 86, 86)">Red</span>/<span style="color:rgb(95, 95, 255)">Blue</span> according to osu!Lazer. Requested by [@Big Brayn](https://osu.ppy.sh/users/3344333).
- The small displayer will use the tournament acronym if the tournament name is too long.
- New mods icons for qualifiers.
- New animation for scores.
<br><img src="https://akinariosu.s-ul.eu/oKt8BHKY">
- Fixed the transparent background for displayer styles.
- Now Score Reverse changes based on the **Old Colors** setting you have.
+ Old Colors not active = Use Score Reverse if the first team is not red
+ Old Colors active = Use Score Reverse if the first team is not blue
- Team Section added.
- To add a team click on the "Open Teams Folder" button and put here the image of the team. After this you can switch to match section and return to Teams section and you will see your new team.
- Now Teams can be edited with players and team name.
<br><img src="https://akinariosu.s-ul.eu/XqX97WqC">
- After editing the name of the team it will reload the app. (There's a bug that I'll fix, but for now this is a method to prevent the bug. Still WIP)
- The team name should be the same as the team name in the lobby name! (Ex. (Little Pug) vs (Polished) / image name = Little Pug.png / Team name in the team edit should be the same too!)

### App
- New button in **Displayer Settings** to revert the colors to <span style="color:rgb(95, 95, 255)">Blue</span>/<span style="color: rgb(247, 86, 86)">Red</span>.
- New button in **Displayer Settings** to enable the small displayer.
- MatchID will not be saved anymore after closing the app.
- Now you can see the new changes in the Changelog Tab.
- Selecting 1v1 Match Type will disable score reverse.
- Now clicking the "Save" button will automatically copy the URL to paste into OBS/SLOBS.
- New page while opening the app for the first time.
- The settings now will be stored in your appdata folder. (This fixes the settings reset while updating the app). Requested by [@Poke714](https://osu.ppy.sh/users/8084370)
- New bar to see the download progress for the update.
- Everything outside the Match Section will be saved automatically on change.
- Performance improvement, now the app should use less memory!

### Known Issues
- While editing and removing players from the team, sometimes the userid will appear wrong but it'll be saved correctly!

### Tournaments
- Added [3 digit world cup 2021](https://osu.ppy.sh/community/forums/topics/1256770)
- Added [Gary's Spring Hidden Tournament](https://osu.ppy.sh/community/forums/topics/1266715)
- Added [Azu's Tourneys: Summer vs Winter](https://osu.ppy.sh/community/forums/topics/1272759)
- Added [Bamboo Cup](https://osu.ppy.sh/community/forums/topics/1274066)
- Added [5 Digit Draft Cup](https://osu.ppy.sh/community/forums/topics/1279137)
- Added [The Perennial](https://osu.ppy.sh/community/forums/topics/1268244)
- Added [Neko's Club Tournament](https://osu.ppy.sh/community/forums/topics/1250915)
- Added [osu! European Tournament 4](https://osu.ppy.sh/community/forums/topics/1286344)
- Added [Seal Cup](https://osu.ppy.sh/community/forums/topics/1306857)
- Added [Corsace Closed 2021](https://osu.ppy.sh/community/forums/topics/1324620)
- Added [Cursed Tourney #2](https://osu.ppy.sh/community/forums/topics/1306163)
- Added [Finnish Duo Cup](https://osu.ppy.sh/community/forums/topics/1313956)
- Added [Great Singapore Tournament 3](https://osu.ppy.sh/community/forums/topics/1323720)
- Added [Centaurea Open 2021](https://osu.ppy.sh/community/forums/topics/1323736)
- Added [Baku's Summer Trios](https://osu.ppy.sh/community/forums/topics/1331732)
- Added [Endless Mirage Tournament](https://discord.com/invite/RT9MBs6)
133 changes: 89 additions & 44 deletions frontend/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ function matchdata(api, mpid, warmups, interval, reverse, bestof, country, tourn
}
}
// CHECK FOR TEAMS IMAGE
data.forEach(image => {
if(image.includes(team1nospace.toLowerCase())){
data.images.forEach(image => {
if(image.includes(team1nameNoSpan)){
team1imgstring = `<img class="teamimg" src="/teamsimg/${image}"> <br />`;
}
if(image.includes(team2nospace.toLowerCase())){
if(image.includes(team2nameNoSpan)){
team2imgstring = `<img class="teamimg" src="/teamsimg/${image}"> <br />`;
}
});
Expand All @@ -242,49 +242,94 @@ function matchdata(api, mpid, warmups, interval, reverse, bestof, country, tourn
tourneyfootertext.textContent = tournament_info_name;
}



if(reverse == 'true' || reverse == true){
team1Element.textContent = team2;
team2Element.textContent = team1;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
}
} else {
team1Element.textContent = team2;
team2Element.textContent = team1;
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
}


if(oldcolors == true){
if(reverse == 'true' || reverse == true){
team1Element.textContent = team2;
team2Element.textContent = team1;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
}
} else {
team1Element.textContent = team2;
team2Element.textContent = team1;
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
}
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
if(reverse == 'false' || reverse == false){
team1Element.textContent = team2;
team2Element.textContent = team1;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
}
} else {
team1Element.textContent = team2;
team2Element.textContent = team1;
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
if(team1 == (bestof/2)+0.5 || team2 == (bestof/2)+0.5){
clearInterval(interval);
team1img.innerHTML = '';
team2img.innerHTML = '';
tourneyheadertext.textContent = '';
tourneyfootertext.textContent = '';
if(team1 == (bestof/2)+0.5){
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team1imgstring} ${team1name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerRed.png')");
} else {
textzone.innerHTML = `<span style="color: #93ff93; font-size: 16px">${team2imgstring} ${team2name} wins!</span>`;
visualizer.style.setProperty('--visualizer-background', "url('/assets/images/winnerBlue.png')");
}
} else {
team1Element.textContent = team1;
team2Element.textContent = team2;
}
}
}
}



Expand Down
81 changes: 81 additions & 0 deletions frontend/assets/odometer-theme-minimal.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
.odometer.odometer-auto-theme, .odometer.odometer-theme-minimal {
display: inline-block;
vertical-align: middle;
*vertical-align: auto;
*zoom: 1;
*display: inline;
position: relative;
}
.odometer.odometer-auto-theme .odometer-digit, .odometer.odometer-theme-minimal .odometer-digit {
display: inline-block;
vertical-align: middle;
*vertical-align: auto;
*zoom: 1;
*display: inline;
position: relative;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-digit-spacer, .odometer.odometer-theme-minimal .odometer-digit .odometer-digit-spacer {
display: inline-block;
vertical-align: middle;
*vertical-align: auto;
*zoom: 1;
*display: inline;
visibility: hidden;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-digit-inner, .odometer.odometer-theme-minimal .odometer-digit .odometer-digit-inner {
text-align: left;
display: block;
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
overflow: hidden;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-ribbon, .odometer.odometer-theme-minimal .odometer-digit .odometer-ribbon {
display: block;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-ribbon-inner, .odometer.odometer-theme-minimal .odometer-digit .odometer-ribbon-inner {
display: block;
-webkit-backface-visibility: hidden;
}
.odometer.odometer-auto-theme .odometer-digit .odometer-value, .odometer.odometer-theme-minimal .odometer-digit .odometer-value {
display: block;
-webkit-transform: translateZ(0);
}
.odometer.odometer-auto-theme .odometer-digit .odometer-value.odometer-last-value, .odometer.odometer-theme-minimal .odometer-digit .odometer-value.odometer-last-value {
position: absolute;
}
.odometer.odometer-auto-theme.odometer-animating-up .odometer-ribbon-inner, .odometer.odometer-theme-minimal.odometer-animating-up .odometer-ribbon-inner {
-webkit-transition: -webkit-transform 2s;
-moz-transition: -moz-transform 2s;
-ms-transition: -ms-transform 2s;
-o-transition: -o-transform 2s;
transition: transform 2s;
}
.odometer.odometer-auto-theme.odometer-animating-up.odometer-animating .odometer-ribbon-inner, .odometer.odometer-theme-minimal.odometer-animating-up.odometer-animating .odometer-ribbon-inner {
-webkit-transform: translateY(-100%);
-moz-transform: translateY(-100%);
-ms-transform: translateY(-100%);
-o-transform: translateY(-100%);
transform: translateY(-100%);
}
.odometer.odometer-auto-theme.odometer-animating-down .odometer-ribbon-inner, .odometer.odometer-theme-minimal.odometer-animating-down .odometer-ribbon-inner {
-webkit-transform: translateY(-100%);
-moz-transform: translateY(-100%);
-ms-transform: translateY(-100%);
-o-transform: translateY(-100%);
transform: translateY(-100%);
}
.odometer.odometer-auto-theme.odometer-animating-down.odometer-animating .odometer-ribbon-inner, .odometer.odometer-theme-minimal.odometer-animating-down.odometer-animating .odometer-ribbon-inner {
-webkit-transition: -webkit-transform 2s;
-moz-transition: -moz-transform 2s;
-ms-transition: -ms-transform 2s;
-o-transition: -o-transform 2s;
transition: transform 2s;
-webkit-transform: translateY(0);
-moz-transform: translateY(0);
-ms-transform: translateY(0);
-o-transform: translateY(0);
transform: translateY(0);
}
Loading

0 comments on commit fd7d95b

Please sign in to comment.