Commit Graph

14711 Commits

Author SHA1 Message Date
0c154e07ed Merge branch 'master' into nullable-legacy-id 2018-03-07 16:12:08 +09:00
d486a55487 Merge pull request #2174 from peppy/fix-textbox-arrows
Fix left and right arrows keys in chat overlay not working
2018-03-07 16:12:02 +09:00
5fda7881c3 Merge branch 'master' into fix-textbox-arrows 2018-03-07 16:01:44 +09:00
43f7139dc7 Merge pull request #2165 from jorolf/volume-control
Implement updated volume control overlay design
2018-03-07 15:03:04 +09:00
a71e5ce19c Tidy up 2018-03-07 14:54:54 +09:00
4094ffbddd Remove unnecessary comment 2018-03-07 14:54:15 +09:00
96ea42d3ba Ensure initial value is set even if that value is zero 2018-03-07 14:51:34 +09:00
05a13d4d39 Improve the way bindings are done 2018-03-07 14:50:50 +09:00
51a9dd038e Add default bindable values 2018-03-07 14:38:41 +09:00
fac4cd6a32 Move to overlayContent 2018-03-07 14:20:47 +09:00
e2f9e237e8 Use GradientHorizontal helper function 2018-03-07 14:07:04 +09:00
c176e309e1 Merge branch 'master' into volume-control 2018-03-07 14:03:09 +09:00
b84367c52a Merge pull request #2175 from smoogipoo/flowcontainer-changes
Update framework with FlowContainer changes
2018-03-07 14:01:14 +09:00
08c469a8b3 Update framework 2018-03-07 13:22:08 +09:00
4dfd3a61cc Remove alpha setting 2018-03-06 18:40:39 +09:00
7cf1d4450a SliderTick transform improvements 2018-03-06 18:28:36 +09:00
e82cadc811 Make LegacyID nullable
The -1 default was getting stored to the database.
2018-03-06 17:40:14 +09:00
07bf8549eb Fix arbitrary API request errors getting identified as timeouts 2018-03-06 17:39:34 +09:00
78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
27e0ed4ea8 Update framework 2018-03-06 14:16:17 +09:00
148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
9669c5aee3 Make locally used things local and rename method. 2018-03-06 09:33:15 +05:30
e187c6453d Added mania-difficulty mod support 2018-03-05 18:19:06 -08:00
90828cca8f Fix left and right arrows keys in chat overlay not working
Misplaced override. Resolves ppy/osu-framework#1444
2018-03-06 08:59:40 +09:00
697ad63d72 Resolve merge conflicts 2018-03-05 22:24:25 +03:00
a6460832f4 Merge pull request #2167 from smoogipoo/fix-taiko-conversion
Fix incorrect slider-to-drumroll conversions in taiko
2018-03-06 01:52:22 +09:00
c4c1b0b6ff Fix merge regression 2018-03-06 01:39:01 +09:00
7b18e8a5ca Merge branch 'master' into fix-taiko-conversion 2018-03-06 01:16:47 +09:00
4aafc2228e Improve skip button behaviour when mouse buttons are down 2018-03-06 00:53:40 +09:00
d115c56742 Avoid using input blocking 2018-03-06 00:27:55 +09:00
792a3ac469 SkipButton -> SkipOverlay 2018-03-06 00:10:53 +09:00
d1a115f4ec Merge remote-tracking branch 'upstream/master' into cursor-trail 2018-03-05 23:34:04 +09:00
e1eb18702b Merge pull request #2171 from smoogipoo/fix-drumroll-nullref
Fix taiko drumrolls potentially getting incorrect judgements
2018-03-05 23:07:48 +09:00
41727509d7 Merge branch 'master' into fix-drumroll-nullref 2018-03-05 22:46:33 +09:00
efcf2ae311 Merge pull request #2164 from peppy/fix-skin-performance
Fix skin file path lookup performance
2018-03-05 21:43:43 +09:00
2a9fb2c2c6 Make NestedHitObjects lazily-constructed 2018-03-05 21:40:26 +09:00
02690e5f25 Move to private implementation 2018-03-05 21:27:37 +09:00
0d817e8e98 Merge remote-tracking branch 'ppy/master' into fix-skin-performance 2018-03-05 21:23:18 +09:00
2519b8edfd Merge pull request #2162 from peppy/storyboard-rewind-support
Add rewind support for storyboards
2018-03-05 21:21:07 +09:00
df84b23847 Fix possible nullref when there are 0 drumroll ticks 2018-03-05 21:19:40 +09:00
7ce3e60722 Fix drumrolls giving GOOD judgements too one tick too late 2018-03-05 21:19:36 +09:00
25e2844e49 Merge branch 'master' into storyboard-rewind-support 2018-03-05 21:11:00 +09:00
30ea3299a9 Merge pull request #2163 from peppy/fix-spinner-crash
Fix hard crash due to spinner spin requirement being zero
2018-03-05 21:10:45 +09:00
59c887cd8e Merge branch 'master' into fix-spinner-crash 2018-03-05 20:51:19 +09:00
d7c6998409 Merge pull request #2161 from peppy/fix-parallax-during-rewind
Fix parallax container during rewinds
2018-03-05 20:47:21 +09:00
56550e4dd8 Merge branch 'master' into fix-parallax-during-rewind 2018-03-05 20:39:16 +09:00
34a8fbe77c Merge pull request #2166 from peppy/add-internal-legacy-offsets
Add legacy timing offsets
2018-03-05 20:39:06 +09:00
65d510baf2 Merge branch 'master' into add-internal-legacy-offsets 2018-03-05 20:27:27 +09:00
02265ad686 Enable mania's basic conversion testcase 2018-03-05 20:20:46 +09:00
27a510aad8 The endtime-object pattern is never checked against 2018-03-05 20:20:42 +09:00