|
|
604ce37064
|
Merge remote-tracking branch 'upstream/master' into video-start-from-zero
|
2020-03-12 18:57:53 +09:00 |
|
|
|
f37444ad18
|
Merge branch 'master' into tournament-header-logo
|
2020-03-12 18:12:08 +09:00 |
|
|
|
4cdb94f3a5
|
Merge pull request #8236 from peppy/tournament-all-video-extensions
Allow videos to be loaded with any extension
|
2020-03-12 18:03:45 +09:00 |
|
|
|
ec1c6f88ee
|
Adjust metrics to align logo pieces correctly on gameplay / map pool
|
2020-03-12 14:27:56 +09:00 |
|
|
|
7b1ac03b18
|
Hide logo on gameplay screen
|
2020-03-12 14:27:56 +09:00 |
|
|
|
b6b802e821
|
Add back customisable header logo/text
Also adds test scene for MatchHeader component.
|
2020-03-12 14:27:56 +09:00 |
|
|
|
190ff97486
|
Rename classes to better suit purpose
|
2020-03-12 14:27:56 +09:00 |
|
|
|
39bb98bfb2
|
Allow videos to be loaded with any extension
Also moves all tournament user resources to a "tournament" subfolder.
|
2020-03-12 13:27:00 +09:00 |
|
|
|
efceeba076
|
Use fixed width for tournament score displays
|
2020-03-12 02:22:02 +09:00 |
|
|
|
2866d62653
|
Use environment variable for initializing osuInstallPath
|
2020-03-11 16:26:53 +01:00 |
|
|
|
f49f9f40ae
|
Merge branch 'master' into tournament-design-seeding
|
2020-03-11 18:03:27 +09:00 |
|
|
|
8eb8572c73
|
Apply osu!-side video sprite changes
|
2020-03-11 18:00:39 +09:00 |
|
|
|
02af3eefbd
|
Merge branch 'master' into tournament-mappool-flow-logic
|
2020-03-11 14:40:18 +09:00 |
|
|
|
ed837d3115
|
Use framework extension method for FromHex
|
2020-03-11 10:18:41 +09:00 |
|
|
|
19ce2d643e
|
Remove unused using
|
2020-03-10 09:51:30 +09:00 |
|
|
|
e158cbfe24
|
Merge branch 'master' into tournament-design-schedule
|
2020-03-10 09:40:08 +09:00 |
|
|
|
f5e134806a
|
Merge branch 'master' into tournament-design-gameplay
|
2020-03-09 19:33:53 +09:00 |
|
|
|
3554cdda36
|
Merge pull request #8179 from peppy/tournament-design-win
Implement 2020 win screen design
|
2020-03-09 19:33:42 +09:00 |
|
|
|
6421f28ac7
|
Fix nullref
|
2020-03-09 19:07:44 +09:00 |
|
|
|
6d23c3b4ab
|
Merge pull request #8180 from peppy/tournament-design-intro
Implement 2020 intro screen design
|
2020-03-09 18:38:07 +09:00 |
|
|
|
1fec5d17a8
|
Merge pull request #8174 from peppy/tournament-design-ladder
Implement 2020 ladder design
|
2020-03-09 18:15:59 +09:00 |
|
|
|
8b16dadfe5
|
Merge branch 'master' into tournament-design-gameplay
|
2020-03-09 15:09:02 +09:00 |
|
|
|
33f457d663
|
Fix layout issues with TournamentBeatmapPanel
|
2020-03-09 15:08:24 +09:00 |
|
|
|
832e64cc95
|
Fix test failures due to null current match
|
2020-03-09 14:57:19 +09:00 |
|
|
|
e4f07e5284
|
Merge branch 'master' into tournament-design-gameplay
|
2020-03-09 14:50:36 +09:00 |
|
|
|
0ecf6a4ecd
|
Merge branch 'master' into tournament-design-win
|
2020-03-09 14:16:34 +09:00 |
|
|
|
1e9adbba4e
|
Merge branch 'master' into tournament-design-intro
|
2020-03-09 14:16:22 +09:00 |
|
|
|
fac5530cab
|
Merge branch 'master' into tournament-design-mappool
|
2020-03-09 14:16:05 +09:00 |
|
|
|
0f44c0739a
|
Merge branch 'master' into tournament-design-ladder
|
2020-03-09 14:16:01 +09:00 |
|
|
|
b61e56cda5
|
Resolve post-merge issue
|
2020-03-09 13:29:17 +09:00 |
|
|
|
ab79f36c41
|
Merge branch 'master' into tournament-drawable-team-tidy
|
2020-03-09 13:26:20 +09:00 |
|
|
|
2eb8f245da
|
Merge branch 'master' into tournament-base-changes
|
2020-03-09 09:24:46 +09:00 |
|
|
|
1c580216af
|
Merge pull request #8175 from peppy/score-counter-flexibility
Increase flexibility of StarCounter component
|
2020-03-09 09:17:55 +09:00 |
|
|
|
61297847a7
|
Fix compilation failure
|
2020-03-09 01:21:37 +09:00 |
|
|
|
414e704d37
|
Use existing local function
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-03-09 00:18:28 +09:00 |
|
|
|
dc201a68dc
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool
|
2020-03-08 20:16:48 +09:00 |
|
|
|
5f6ce7fde5
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-ladder
|
2020-03-08 20:16:35 +09:00 |
|
|
|
7f38ff8046
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-schedule
|
2020-03-08 20:16:12 +09:00 |
|
|
|
ece049e0c9
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-seeding
|
2020-03-08 20:15:48 +09:00 |
|
|
|
71824ce7d6
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-win
|
2020-03-08 20:14:59 +09:00 |
|
|
|
ba865aa195
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-intro
|
2020-03-08 20:14:15 +09:00 |
|
|
|
cc438210a3
|
Merge branch 'tournament-drawable-team-tidy' into tournament-design-gameplay
|
2020-03-08 20:13:29 +09:00 |
|
|
|
2fe32b7d2b
|
Remove LadderInfo requirement in DrawableMatchTeam
|
2020-03-08 19:41:22 +09:00 |
|
|
|
9138bafbeb
|
Fix alignment of flags on team intro screen
|
2020-03-08 18:49:06 +09:00 |
|
|
|
8b0b910196
|
Update song / chat / beatmap info display to reflect new design
|
2020-03-08 18:25:22 +09:00 |
|
|
|
3744aaf55f
|
Update vertical alignment of chroma area
|
2020-03-08 18:16:32 +09:00 |
|
|
|
0019199082
|
Merge branch 'tournament-base-changes' into tournament-design-gameplay
|
2020-03-08 18:12:10 +09:00 |
|
|
|
0102aaf32a
|
Move chat expand/contract logic local to tournament
|
2020-03-08 18:11:57 +09:00 |
|
|
|
5d5910822b
|
Initial pass of intro screen design update
|
2020-03-08 16:06:37 +09:00 |
|
|
|
a85cef2f06
|
Reset win screen video on display; add fade in transition
|
2020-03-08 16:05:37 +09:00 |
|
