1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 09:22:54 +08:00
Commit Graph

192 Commits

Author SHA1 Message Date
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
Dan Balasescu
2eb8f245da
Merge branch 'master' into tournament-base-changes 2020-03-09 09:24:46 +09:00
Dean Herbert
414e704d37
Use existing local function
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-09 00:18:28 +09:00
Dean Herbert
dc201a68dc Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool 2020-03-08 20:16:48 +09:00
Dean Herbert
8b0b910196 Update song / chat / beatmap info display to reflect new design 2020-03-08 18:25:22 +09:00
Dean Herbert
0019199082 Merge branch 'tournament-base-changes' into tournament-design-gameplay 2020-03-08 18:12:10 +09:00
Dean Herbert
0102aaf32a Move chat expand/contract logic local to tournament 2020-03-08 18:11:57 +09:00
Dean Herbert
a85cef2f06 Reset win screen video on display; add fade in transition 2020-03-08 16:05:37 +09:00
Dean Herbert
3a3a2ad2a7 Fix video looping not propagating when set too early in initialisation 2020-03-08 16:04:51 +09:00
Dean Herbert
3807c449bd Update chat position 2020-03-08 15:55:54 +09:00
Dean Herbert
2981730442 Initial pass of map pool screen design update 2020-03-08 15:49:37 +09:00
Dean Herbert
1c5d6e0cf4 Split out nested classes to higher level for better code sharing 2020-03-08 15:34:45 +09:00
Dean Herbert
0a72fa69ab Simplify video creation (and handle fallback better) 2020-03-06 18:39:12 +09:00
Dean Herbert
e678a068b6 Bring design up-to-date with 2019 standards 2020-03-03 19:20:42 +09:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Dean Herbert
244177880e Only show star on HR 2019-11-24 01:45:21 +09:00
Dean Herbert
326a8f62eb Calculate more correct AR locally for now 2019-11-24 00:22:01 +09:00
Dean Herbert
e3f3b1ab1a Display useful statistics on song bar depending on current ruleset 2019-11-23 20:52:41 +09:00
Dean Herbert
c2e85a2057 Apply CornerExponent fixes 2019-11-22 19:49:20 +09:00
Huo Yaoyuan
144812669d Use static local functions. 2019-11-12 19:56:54 +08:00
Huo Yaoyuan
0d81b96c5f Use deconstruction declaration. 2019-11-12 19:55:22 +08:00
Huo Yaoyuan
ccc8aa6fa4 Apply brace style. 2019-11-11 20:13:13 +08:00
Dean Herbert
380859e06e Set clock on video directly; ignore long frames 2019-11-08 17:13:45 +09:00
Dean Herbert
5fe764b2db Fix tournament videos stuttering when changing scenes 2019-11-08 16:19:34 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
iiSaLMaN
e73f22eff8 Convert length retrieved from online to milliseconds 2019-07-09 17:53:34 +03:00
iiSaLMaN
129899f419 Add a BPM property in BeatmapInfo 2019-07-08 10:43:35 +03:00
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
Dean Herbert
4baadf6319 Add map pool editing functionality to round editor 2019-06-18 16:37:13 +09:00
Dean Herbert
da20904a57 MatchPairing -> TournamentMatch 2019-06-18 14:57:05 +09:00
Dean Herbert
96e24ebd20 General namespace tidy-up 2019-06-18 14:51:48 +09:00
Dean Herbert
796afc0bf9 Rename and expand chat tests 2019-06-18 14:03:09 +09:00
Dean Herbert
1e2f9d1ba1 Fix start failure if videos are missing 2019-06-17 21:07:30 +09:00
Dean Herbert
58136360e0 Bindable handling in DrawableTournamentTeam 2019-06-17 19:11:57 +09:00
Dean Herbert
93fc14426b Convert TournamentTeam props to use binadbles 2019-06-17 19:11:57 +09:00
Dean Herbert
4cd6955a96 Fix GameplayScreen test not working 2019-06-14 20:32:23 +09:00
Dean Herbert
eb0f0aefba Apply review changes 2019-06-13 17:12:06 +09:00
Dean Herbert
d8ed402779 Make use of ValueChanged.OldValue 2019-05-20 14:47:46 +09:00
Dean Herbert
530032cafe Update obsoleted font usages 2019-05-15 13:10:58 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
cf63ee4948 Update licence headers 2019-03-04 13:24:19 +09:00
Dean Herbert
5b81de7663 Apply codefactor fixes 2019-03-04 13:04:07 +09:00
Dean Herbert
132ce541f3 Fix obsolete font usages 2019-03-04 12:06:41 +09:00
Dean Herbert
4c66ebb501 Fix formatting issues 2019-03-02 13:52:56 +09:00
Dean Herbert
389632d932 Fix bindable changes 2019-03-02 13:40:43 +09:00
Dean Herbert
6ea1ed8d04 Fix unnecessary texture atlas generation 2019-02-17 19:48:54 +09:00
Dean Herbert
cb23918512 Changes for mania world cup 2019-02-03 11:24:43 +09:00
Dean Herbert
482a01e7ba Merge branch 'master' into tournament-tools
# Conflicts:
#	osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
#	osu.Game/OsuGameBase.cs
#	osu.Game/Overlays/ChatOverlay.cs
#	osu.Game/Screens/Menu/MainMenu.cs
#	osu.Game/Screens/Tournament/Drawings.cs
#	osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
a7c82c9741 Split out chat component into reusable piece 2018-12-20 16:50:38 +09:00
Dean Herbert
056025c5c2 Fix handling of API responses 2018-12-01 09:50:11 +09:00
Dean Herbert
17a81259d4 Fix spacing and colouring of song bar eleemnts
Also uses MM:ss instead of ssss.
2018-11-22 17:26:19 +09:00
Dean Herbert
cbf82f892d Add OD display and fix "*" difficuty modifier display 2018-11-22 14:10:33 +09:00
Dean Herbert
7d3bcdfc17 Fix stats not displaying on showcase screen 2018-11-22 13:17:51 +09:00
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
925532508c Change precedence of chat colouring 2018-11-18 12:39:17 +09:00
Dean Herbert
256d11620f Add missing space after "CS" 2018-11-18 12:38:48 +09:00
Dean Herbert
4b047ad9cc Centralise chat display 2018-11-17 21:27:02 +09:00
Dean Herbert
4ae9413ee6 Add mod icons 2018-11-17 16:00:12 +09:00
Dean Herbert
26286177d3 Colour chat names 2018-11-17 15:35:14 +09:00
Dean Herbert
bed967b456 Add better date string formatting 2018-11-17 14:05:42 +09:00
Dean Herbert
c1e3c4d435 Make chat tests work again, clear old messages 2018-11-17 10:40:44 +09:00
Dean Herbert
e3e92f4302 Add chat IPC and gameplay screen integration 2018-11-16 19:43:54 +09:00
Dean Herbert
c9e2ee8f56 Fix masking of song bar 2018-11-16 18:14:42 +09:00
Dean Herbert
1ab4713ef6 Add tournament chat display 2018-11-16 15:30:19 +09:00
Dean Herbert
01f814aace Fix song length not being rounded correctly when DT is applied 2018-11-15 14:11:58 +09:00
Dean Herbert
d7a086be83 Fix regression in song bar display logic 2018-11-12 01:25:31 +09:00
Dean Herbert
00731560cb Add CS display 2018-11-12 01:25:22 +09:00
Dean Herbert
123629ba9e Flash panels on select 2018-11-11 10:48:57 +09:00
Dean Herbert
86423dce5f Animate song bar based on game mode 2018-11-11 01:30:21 +09:00
Dean Herbert
bd6d3f1473 Improve appearance 2018-11-08 06:47:42 +09:00
Dean Herbert
5c84c3c0a8 Add support for picks and bans 2018-11-08 06:29:04 +09:00
Dean Herbert
e4a767d656 Move control panel logic to its own class 2018-11-08 03:51:39 +09:00
Dean Herbert
878b16c596 Add automatic country/user information lookups 2018-11-07 17:20:50 +09:00
Dean Herbert
ca9df94ea2 Add skeleton for gameplay screen 2018-11-06 19:27:10 +09:00
Dean Herbert
54a02ee2d7 Add showcase screen 2018-11-04 07:12:07 +09:00
Dean Herbert
830eda2a9f Fix unused properties 2018-10-16 16:07:59 +09:00
Dean Herbert
522f106f74 Add initial version of beatmap card 2018-10-14 00:41:10 +09:00
Dean Herbert
2f2dcec8c7 Complete editing support 2018-09-22 06:32:30 +09:00
Dean Herbert
234b04dfc5 Add basic ladder manager and state retention 2018-09-21 18:18:28 +09:00
Dean Herbert
3d3a7f714d Move and use shared components 2018-09-21 18:18:28 +09:00