Commit Graph

6309 Commits

Author SHA1 Message Date
5f3dbfef47 Merge branch 'master' into hide-unavailable-functions 2018-01-02 12:59:12 +09:00
91c49913c9 Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
2079b7239c Merge branch 'master' into result-page-date-order 2017-12-31 13:11:55 +09:00
3d66b879a7 use ToShortTimeString to create a time depending on current culture 2017-12-30 22:45:28 +01:00
2a0699f13c use ToShortDateString to create a date depending on current culture 2017-12-30 22:41:01 +01:00
0dad9cbe53 change date to be more friendly to read 2017-12-30 21:49:05 +01:00
d6af8ad748 swap date and time in ResultsPageScore 2017-12-30 21:48:49 +01:00
61bbb66996 sort resultpage hitresults descending
HitCount was good to bad but HitResult is the opposite. To account for this just descending order on the result page.
2017-12-30 21:27:15 +01:00
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
c002d4e1d2 Merge branch 'master' into result-page-sorting 2017-12-31 04:34:48 +09:00
33dbd1b1a7 Remove search button on toolbar 2017-12-31 03:47:50 +09:00
1ef4ff6776 order statistics before adding to resultpage 2017-12-30 18:07:53 +01:00
138d78309f add HitCount enum and replace string usage with enum 2017-12-30 18:07:30 +01:00
c8bab7d983 Merge branch 'master' into fix-push-disabled-crash 2017-12-31 01:27:41 +09:00
f7fe083018 add tooltip to country flags 2017-12-30 14:59:35 +01:00
f56e8121da Fix settings overlay pass-through logic 2017-12-30 22:13:05 +09:00
8733f809a5 Remove chat overlay local override 2017-12-30 21:10:57 +09:00
e332683d18 Fix music controller draggability 2017-12-30 21:10:40 +09:00
58b0c9d56c Dim screen when overlay has focus 2017-12-30 20:45:45 +09:00
442a649c63 Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
2017-12-30 20:45:41 +09:00
ef683a60f5 Merge branch 'master' into fix-push-disabled-crash 2017-12-30 18:59:59 +09:00
616ad5b723 Cleanups 2017-12-30 16:55:01 +09:00
714d93dd92 Merge remote-tracking branch 'origin/master' 2017-12-30 16:17:14 +09:00
f73f43fdad Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-30 14:48:19 +09:00
a0966305d4 Remove unnecessary new event 2017-12-30 14:46:44 +09:00
2c4b4d19e0 Merge branch 'master' into supporter-tooltip 2017-12-30 13:44:59 +09:00
a7135e2688 Merge branch 'master' into fix-import-dialog-icon 2017-12-30 13:15:33 +09:00
9660e0885b correctly name tooltip interface 2017-12-29 19:20:37 +00:00
6de41ba172 Trim whitespace 2017-12-29 19:16:43 +00:00
b1dd64983d Add tooltip text to supporter icon 2017-12-29 19:05:50 +00:00
f547c7986d created option to override values before UpdateState is called 2017-12-29 17:50:55 +01:00
27cb445c24 Always recrusively apply custom sequence to nested hitobjects 2017-12-29 17:48:05 +09:00
3f8f778004 Merge branch 'master' into standard-hd-support 2017-12-29 15:56:38 +09:00
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
0cea018576 Use a more suiting (?) icon for import dialog
Closes #1763.
2017-12-28 21:24:40 +09:00
e0f23a056a Fix crash from being able to perform selection after entering play mode
Closes #1757
2017-12-28 21:07:19 +09:00
021717dfb4 Merge remote-tracking branch 'upstream/master' into standard-hd-support 2017-12-28 14:24:10 +09:00
e77dc368ba Merge branch 'master' into fix-pause-overlay-selection 2017-12-28 14:01:36 +09:00
e4a8402d3c Use better logic
We need to still perform selection if selectedBeatmap itself is null
2017-12-28 12:38:40 +09:00
33480b85c8 fix for Drawables being empty crashing 2017-12-28 03:35:53 +01:00
998f9c090d select pause buttons after mouse move only 2017-12-28 01:56:10 +01:00
dbcf87267d Merge branch 'master' into standard-hd-support 2017-12-27 21:26:39 +01:00
4e6988d21b As it turns out, native directory separators are not supported 2017-12-28 01:05:50 +09:00
7a0662da4b Fix regression during merges 2017-12-28 00:38:50 +09:00
18eb74d38c Merge branch 'master' into sliderbouncers-fix 2017-12-28 00:13:04 +09:00
dcd994e65b Merge branch 'master' into better-notification-delays 2017-12-27 23:58:04 +09:00
e6876c95ac Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:47:04 +09:00
996e156fd0 Merge branch 'master' into fix-notification-scheduled-events 2017-12-27 23:27:23 +09:00
3bfa6bd9fd Merge branch 'master' into better-notification-delays 2017-12-27 23:26:57 +09:00
259e32f485 Merge branch 'master' into fix-beatmap-wedge-appear 2017-12-27 23:22:06 +09:00