1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 17:27:26 +08:00
Commit Graph

130 Commits

Author SHA1 Message Date
Shivam
ae9e60560b Fixed gameplay flags being bigger and changed values to make more sense 2020-10-23 14:11:29 +02:00
Shivam
1c073a9ea5 Merge branch 'master' into flag-fit 2020-10-19 22:27:48 +02:00
Dean Herbert
3f41003d35 Move video store out of TournamentStorage
There was no reason it should be nested inside.
2020-10-19 15:48:15 +09:00
Dean Herbert
1989141968
Merge branch 'master' into tourney-asset-refactor 2020-10-07 21:34:07 +09:00
Dean Herbert
9d7880afda Make SettingsItem conform to IHasCurrentValue 2020-10-06 17:18:54 +09:00
Dean Herbert
61e62929ee Apply changes in line with framework event logic update 2020-10-01 13:06:01 +09:00
Shivam
7f0eaded26 Merge branch 'master' into flag-fit 2020-09-13 19:55:56 +02:00
smoogipoo
8bf679db8b Fix nullref in date text box 2020-09-02 13:17:17 +09:00
Shivam
d9ba677773 Change TeamFlag from sprite to a container with a sprite 2020-08-24 15:08:50 +02:00
Shivam
c167727ac6 Merge branch 'master' into tourney-asset-refactor
# Conflicts:
#	osu.Game/IO/OsuStorage.cs
2020-08-09 12:38:41 +02:00
Bartłomiej Dach
082c94f98d Temporarily disable masking of tournament song bar 2020-06-28 13:14:46 +02:00
Shivam
af11340849 Fix nullref exceptions and redundant explicit type 2020-06-24 02:13:28 +02:00
Shivam
9d2392b6b1 Cache TournamentStorage as Storage and only cast when necessary 2020-06-24 00:14:44 +02:00
Shivam
0ca8c961c8 Remove string interpolation & unnecessary test setup 2020-06-24 00:05:30 +02:00
Shivam
291dadf0b2 Merge branch 'master' of https://github.com/ppy/osu into tourney-asset-refactor 2020-06-22 12:01:24 +02:00
Dean Herbert
1df89c6a59
Merge branch 'master' into custom-ipc-location 2020-06-22 16:22:04 +09:00
smoogipoo
d57b58a7dd Add temporary fix for tournament song bar disappearance 2020-06-15 18:47:55 +09:00
Shivam
2964b457a0 Rename VideoStorage to VideoStore 2020-06-11 15:05:28 +02:00
Shivam
417919320c change namespace to osu.Game.Tournament.IO 2020-06-09 17:28:42 +02:00
Shivam
9a20ffa8a3 Rename to TournamentStorage 2020-06-08 00:47:47 +02:00
Shivam
17cd9569ed Introduce new storage class and manager 2020-06-08 00:46:40 +02:00
Shivam
7e5db5e933 Apply review suggestions 2020-06-03 23:49:06 +02:00
Shivam
59b006f9ac Make IPC error dialog reusable
and inspectcode fixes
2020-05-17 22:46:43 +02:00
Shivam
3fc888ef95 User interface setup for custom IPC location
Right now makes use of another ActionableInfo field. Probably a better idea to add an extra button to the Current IPC Storage actionable field.
2020-05-16 03:03:10 +02:00
Bartłomiej Dach
3c1730d0ca Expose SongBar's height 2020-04-26 23:59:24 +02:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
Dean Herbert
1b6342438f Hide scrollbars in tournament chat display 2020-03-23 12:05:16 +09:00
Dean Herbert
8895d52d29 Fix header-text scaling on intro/winner screens 2020-03-17 13:16:18 +09:00
Dan Balasescu
70a17ae6cc
Merge branch 'master' into tournament-resolution-selector 2020-03-15 00:15:31 +09:00
Dean Herbert
bee855bd1d Remove using 2020-03-13 15:54:46 +09:00
Dean Herbert
b902e50396 Add resolution selector in tournament setup screen 2020-03-13 15:44:23 +09:00
Dean Herbert
edd444ea73 Fix mod sprite bleeding border colour 2020-03-13 14:36:46 +09:00
Dean Herbert
08dc4a0e8b
Merge pull request #8216 from smoogipoo/video-start-from-zero
Apply osu!-side video sprite changes
2020-03-12 19:46:46 +09:00
Dean Herbert
604ce37064 Merge remote-tracking branch 'upstream/master' into video-start-from-zero 2020-03-12 18:57:53 +09:00
Dan Balasescu
f37444ad18
Merge branch 'master' into tournament-header-logo 2020-03-12 18:12:08 +09:00
Dean Herbert
ec1c6f88ee Adjust metrics to align logo pieces correctly on gameplay / map pool 2020-03-12 14:27:56 +09:00
Dean Herbert
b6b802e821 Add back customisable header logo/text
Also adds test scene for MatchHeader component.
2020-03-12 14:27:56 +09:00
Dean Herbert
190ff97486 Rename classes to better suit purpose 2020-03-12 14:27:56 +09:00
Dean Herbert
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
smoogipoo
8eb8572c73 Apply osu!-side video sprite changes 2020-03-11 18:00:39 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dan Balasescu
f5e134806a
Merge branch 'master' into tournament-design-gameplay 2020-03-09 19:33:53 +09:00
Dan Balasescu
3554cdda36
Merge pull request #8179 from peppy/tournament-design-win
Implement 2020 win screen design
2020-03-09 19:33:42 +09:00
smoogipoo
6421f28ac7 Fix nullref 2020-03-09 19:07:44 +09:00
Dean Herbert
8b16dadfe5 Merge branch 'master' into tournament-design-gameplay 2020-03-09 15:09:02 +09:00
Dean Herbert
33f457d663 Fix layout issues with TournamentBeatmapPanel 2020-03-09 15:08:24 +09:00
Dean Herbert
e4f07e5284 Merge branch 'master' into tournament-design-gameplay 2020-03-09 14:50:36 +09:00
Dan Balasescu
0ecf6a4ecd
Merge branch 'master' into tournament-design-win 2020-03-09 14:16:34 +09:00
Dan Balasescu
fac5530cab
Merge branch 'master' into tournament-design-mappool 2020-03-09 14:16:05 +09:00
Dan Balasescu
ab79f36c41
Merge branch 'master' into tournament-drawable-team-tidy 2020-03-09 13:26:20 +09:00