1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 19:47:24 +08:00
Commit Graph

19436 Commits

Author SHA1 Message Date
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
Dean Herbert
d0d2be0aca
Merge pull request #5059 from iiSaLMaN/update-framework
Update framework
2019-06-19 06:27:13 +09:00
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
Dean Herbert
7b68ac667b
Merge branch 'master' into tournament-tools 2019-06-18 20:20:13 +09:00
Dean Herbert
f15df51514
Remove test which is failing due to magic numbers (#5055)
Remove test which is failing due to magic numbers
2019-06-18 20:19:00 +09:00
Dean Herbert
2d20c088f7 Remove test which is failing due to magic numbers 2019-06-18 18:31:42 +09:00
Dan Balasescu
9776494c63
Merge pull request #5052 from peppy/make-osu-button-instantiable
Make OsuButton non-abstract again
2019-06-18 18:29:35 +09:00
Dean Herbert
1ca0047956 Merge branch 'make-osu-button-instantiable' into tournament-tools 2019-06-18 18:06:09 +09:00
Dean Herbert
fd9a759cba Merge branch 'remote-unused-property' into tournament-tools 2019-06-18 18:06:06 +09:00
Dean Herbert
5c523dbe60 Merge branch 'settings-item-unbind-previous-bindable' into tournament-tools 2019-06-18 18:06:03 +09:00
Dean Herbert
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
Dean Herbert
9a319e3f96 Add missing space 2019-06-18 17:59:47 +09:00
Dean Herbert
ba589b2139 Add more functionality and share more logic between editor screens 2019-06-18 17:59:33 +09:00
Dean Herbert
711214ed09 Use OsuButton everywhere 2019-06-18 17:17:46 +09:00
Dean Herbert
437ad2b0d0 Transfer more pieces of user across 2019-06-18 16:46:33 +09:00
Dean Herbert
4baadf6319 Add map pool editing functionality to round editor 2019-06-18 16:37:13 +09:00
Dean Herbert
412778c71a Rename nested TeamRow class for clarity 2019-06-18 15:54:34 +09:00
Dean Herbert
77f3d4848b Make common base class for editor screens 2019-06-18 15:53:03 +09:00
Dean Herbert
c31713078f Ensure enough room for control panel display in editor tests 2019-06-18 15:44:07 +09:00
Dean Herbert
e4eae3a6d5 Move rider configurations into folders 2019-06-18 15:40:57 +09:00
Dean Herbert
926a11ab8c Group, rename and standardise tests 2019-06-18 15:28:36 +09:00
Dean Herbert
3fcb8081dd Remove unused ruleset bindable 2019-06-18 15:20:36 +09:00
Dean Herbert
fa61b08a05 Mark LadderTestScene abstract 2019-06-18 15:20:28 +09:00
Dean Herbert
1a92263652 Ignore parse errors rather than dying 2019-06-18 15:18:14 +09:00
Dean Herbert
3db6913a9c Rename editor screens removing plurals 2019-06-18 15:15:28 +09:00
Dean Herbert
7c163ad911 Move font-related code out of TournamentGame 2019-06-18 15:09:39 +09:00
Dean Herbert
7652339dc0 Remove test file 2019-06-18 15:07:33 +09:00
Dean Herbert
21138e6e2c Fix mismatching filenames 2019-06-18 15:05:55 +09:00
Dean Herbert
6226889d1c Add xmldoc and serialisable attributes 2019-06-18 15:00:33 +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
4f5abeb79f Grouping -> Round 2019-06-18 14:44:15 +09:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
40eb6f4986 Undo ordering change to OsuFont 2019-06-18 14:15:22 +09:00
Dean Herbert
584113997a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-18 14:15:06 +09:00
Dean Herbert
796afc0bf9 Rename and expand chat tests 2019-06-18 14:03:09 +09:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
Dean Herbert
c32d17d16a Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
Dean Herbert
0d4c6d2cbc
Fade volume when game window becomes inactive (#5047)
Fade volume when game window becomes inactive

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-17 23:58:03 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00