Commit Graph

2475 Commits

Author SHA1 Message Date
4f53185d43 Invert logic to match existing toggles 2018-04-25 16:18:55 +09:00
c517b73375 Merge branch 'master' into ignore_beatmap_skin 2018-04-25 15:57:39 +09:00
45810e6220 Merge branch 'master' into ignore_beatmap_skin 2018-04-24 17:15:39 +09:00
3886e75959 Fix potentially missing group headers in beatmap carousel 2018-04-24 01:52:25 +09:00
93b77d9cfe Remove annotation 2018-04-23 22:22:31 +09:00
254e9929be Merge branch 'master' into ignore_beatmap_skin 2018-04-23 13:06:24 +03:00
2d1cef79d6 Fix instability in carousel item sorting 2018-04-23 19:01:01 +09:00
ff3d3379f0 Merge remote-tracking branch 'upstream/master' into async-screens 2018-04-23 18:29:37 +09:00
194992936d Use exceptions 2018-04-23 17:57:47 +09:00
0709a0926b Merge branch 'master' into misc-fixes 2018-04-23 17:46:58 +09:00
2d82c0b5cd Fix logical regression 2018-04-23 16:41:15 +09:00
6e16f2a3c3 Add assert to appease rider/r# 2018-04-23 15:03:41 +09:00
36a671e306 Fix new detections in rider 2018.1 2018-04-23 14:56:45 +09:00
2c9b2aa0e7 Fix intro setting beatmap in background thread causing race conditions 2018-04-22 02:46:20 +09:00
1ce38c7fc6 Visual settings: Ignore beatmap hitsounds 2018-04-20 18:30:41 +03:00
606e088713 Visual settings: Ignore beatmap skin 2018-04-20 18:17:57 +03:00
e9e97f31d6 Merge remote-tracking branch 'upstream/master' into peppy-async-screens 2018-04-20 19:06:47 +09:00
a5b0005976 Merge branch 'master' into remove-approachcircle-hax 2018-04-20 18:36:49 +09:00
0dce7a5b61 Update framework + fix CI errors 2018-04-20 18:19:17 +09:00
8bf25542cb Add PlayerLoader TestCase and fix dummy beatmap load procedure 2018-04-20 17:30:27 +09:00
de85436534 Merge remote-tracking branch 'upstream/master' into peppy-async-screens 2018-04-20 16:52:58 +09:00
c77f339444 Merge remote-tracking branch 'upstream/master' into show-beatmap-id 2018-04-20 12:41:38 +09:00
f7ca6267b1 Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability 2018-04-19 20:53:06 +09:00
e395a47112 Changes to naming and text 2018-04-18 19:47:13 +09:00
bd834dd487 Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling 2018-04-18 19:46:59 +09:00
1728dd6502 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:42:09 +09:00
7e5d5a197b Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 16:41:01 +09:00
1be2571d33 Make BeatmapSetOverlay accept nulls everywhere 2018-04-18 16:08:45 +09:00
f62677222c Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id 2018-04-18 13:08:53 +09:00
64f47daff4 Merge branch 'master' into fix-leaderboard-nullref 2018-04-18 12:05:13 +09:00
188c8ce1e7 Remove unnecessary score nulling (already happens in PlaceholderState_Set) 2018-04-18 11:58:55 +09:00
a27f39a555 Add documentation explaining intertwining logic 2018-04-18 11:57:06 +09:00
9af6ef1864 Remove extra unneded safety 2018-04-16 17:48:49 +09:00
b9220a1e29 Fix leaderboard placeholder sometimes disappearing indefinitely 2018-04-16 17:39:55 +09:00
1b9d54a6ad Fix various data races causing crashes or incorrect leaderboard states 2018-04-16 17:39:03 +09:00
3ece54e1c3 make buttons only accept input when expanded
both other states are "inactive"/invisible so should never accept keyboard input
2018-04-14 00:08:54 +02:00
81f0649e44 Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling 2018-04-13 19:50:44 +09:00
1a2b1d4c98 Use the already existent RightMouseScrollbar field 2018-04-13 11:32:33 +02:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
e3cd0ef200 Add right click scrolling in song select (and its option) 2018-04-13 11:09:49 +02:00
d9f587edff Merge remote-tracking branch 'upstream/master' into alt-eagerselect 2018-04-13 11:55:35 +03:00
128446e51d Remove composer from player loader 2018-04-12 16:46:46 -07:00
127f0d7b01 Fix smoogipoo's comments 2018-04-12 21:17:17 +09:00
0ca703beaa Add some missing xmldoc 2018-04-12 21:04:45 +09:00
a2484fbf56 Move back to DI-ing adjustable clock into SummaryTimeline 2018-04-12 13:37:02 +09:00
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
c33cb9c02e Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
cd48cb1887 Add comment 2018-04-06 19:53:23 +09:00
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
c7440201fb Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00