RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,530 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

19530 Commits

Author SHA1 Message Date
Dan Balasescu 64628e6174
Merge branch 'master' into master 2019-06-24 12:15:06 +09:00
smoogipoo 8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dan Balasescu e89fb409ae
Merge pull request #5131 from peppy/fix-timing-tests 
Fix test timing regressions due to increased step count
 2019-06-24 11:49:16 +09:00
Dean Herbert c988dfbdaa Make things a bit more sensible 2019-06-24 11:43:34 +09:00
Dean Herbert 024157b13f Remove unnecessary type specification 2019-06-24 11:10:29 +09:00
Dean Herbert da2ba5bf09 Allow tests to be run in non-sequential order 2019-06-24 11:09:59 +09:00
Dean Herbert 4ec064e179 Fix test timing regressions due to increased step count 2019-06-24 11:00:00 +09:00
mulraf dfb791ed3e Update PopupDialog.cs 
Changed Spacings
 2019-06-23 22:59:14 +02:00
mulraf 7bbd6b810f Update PopupDialog.cs 
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
 2019-06-23 20:33:43 +02:00
Andrei Zavatski 8430ac6d1c remove unused using 2019-06-23 19:19:36 +03:00
Andrei Zavatski 1c20df780a Adjust triangles colour 2019-06-23 17:08:18 +03:00
Andrei Zavatski f5f041acc8 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-overall-improvements 2019-06-23 16:35:42 +03:00
Lucas A 03829611ae Merge branch 'master' into catch-catcher-skinning 2019-06-23 14:55:24 +02:00
Dean Herbert d595860b14 Remove background from team intro screen 2019-06-23 20:09:42 +09:00
Dean Herbert ba97b887b4 Allow cusotmisation of the colour portion of the tournament logo header 2019-06-23 20:05:55 +09:00
Lucas A 332ac0b82b Fix CI inspections 2019-06-22 18:23:20 +02:00
Lucas A b6cae57694 Add TestSceneCatcherSkinning 2019-06-22 18:14:29 +02:00
Dean Herbert 6449734a97
Format tournament bracket output (#5122) 
Format tournament bracket output
 2019-06-23 00:55:17 +09:00
Dean Herbert 494fa99502
Fix assert descriptions (#5123) 
Fix assert descriptions
 2019-06-23 00:53:04 +09:00
Lucas A e2f82ac29b Move CatcherSprite to its own file + Make CatcherSprite a SkinReloadableDrawable 2019-06-22 17:53:00 +02:00
Unknown cf193cb26f call MoveMouseTo with Drawable 2019-06-22 17:43:24 +02:00
Unknown 35d9f5841c simplify asserts, clarify asserts 2019-06-22 17:34:06 +02:00
Unknown afe9ac1740 fix assert descriptions 2019-06-22 16:11:47 +02:00
Dean Herbert 12740eff72 Format tournament bracket output 2019-06-22 22:42:11 +09:00
Dean Herbert d06fd299cd
Fix bracket editor crash when no round description is present (#5107) 
Fix bracket editor crash when no round description is present
 2019-06-22 22:15:26 +09:00
Andrei Zavatski 4963d4e8df CI fixes 2019-06-22 03:08:18 +03:00
Andrei Zavatski 3723ea05de Adjust Title style 2019-06-22 02:52:07 +03:00
Andrei Zavatski 4cd3b15f6e Add triangles 2019-06-22 02:40:33 +03:00
Andrei Zavatski dbf53e9bda Use correct background colour for sections 2019-06-22 02:06:30 +03:00
Andrei Zavatski 132cb8f473 Add spacing between sections 2019-06-22 01:11:04 +03:00
Dean Herbert c34a7dd255
Fix audio being dimmed on preview tracks (#5113) 
Fix audio being dimmed on preview tracks
 2019-06-22 00:44:23 +09:00
Joehu 36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
Joehu 74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
Joehu 1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
HoLLy fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
Dean Herbert 1204c56d2d
Update framework (#5108) 
Update framework

Co-authored-by: Dean Herbert <pe@ppy.sh>
 2019-06-21 22:42:47 +09:00
Dean Herbert 3ad74e2ff3
Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
Dean Herbert ca2a3937ea
Fix audio not dimming after race condition (#5049) 
Fix audio not dimming after race condition
 2019-06-21 22:24:36 +09:00
Dean Herbert 667125a184
Fix ModSelectOverlay tests failing due to asynchronous loading (#5104) 
Fix ModSelectOverlay tests failing due to asynchronous loading

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
 2019-06-21 22:24:11 +09:00
Dean Herbert 859afefb79
Prevent non-combo affecting judgements from triggering sudden death (#5095) 
Prevent non-combo affecting judgements from triggering sudden death
 2019-06-21 22:24:00 +09:00
Unknown 1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Unknown 16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
KingLuigi4932 13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
Dean Herbert cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert f766068e17
Remove local implementation of bindable in OsuCheckbox (#5046) 
Remove local implementation of bindable in OsuCheckbox
 2019-06-21 21:08:09 +09:00
Dan Balasescu bf52670d39
Merge branch 'master' into fix-modselect-tests 2019-06-21 20:54:48 +09:00
Dean Herbert abd0c2bb1a
Move NotificationSection strings to constructor (#5078) 
Move NotificationSection strings to constructor
 2019-06-21 20:47:31 +09:00
Unknown 2c3504d302 fix bracket editor crash when no round description is present 2019-06-21 13:29:24 +02:00
Andrei Zavatski 29305ca0eb fix broken layout 2019-06-21 13:24:12 +03:00
Andrei Zavatski 7680f6cbf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-21 13:06:44 +03:00