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

2157 Commits

Author SHA1 Message Date
Dean Herbert
188b26472c Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision 2018-01-12 18:54:36 +09:00
james58899
f83c84a0a6
keep BlurTo 2018-01-12 14:24:42 +08:00
james58899
61c8fd4ab9
useless using 2018-01-12 12:39:32 +08:00
james58899
1985e5bdb2
fix background dim 2018-01-12 12:21:37 +08:00
smoogipoo
d147683361 Cleanup 2018-01-10 17:39:15 +09:00
smoogipoo
c010b48b29 Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca More osu!-side bindable fixes 2018-01-10 15:41:13 +09:00
Dean Herbert
9ec8f130a6 Ensure changes are only applied when we are the current screen 2018-01-10 13:24:26 +09:00
Dean Herbert
fcb197f7b6 Simplify logic 2018-01-09 22:21:15 +09:00
Dean Herbert
2518d16a77 Denote unused variable 2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur 2018-01-09 21:20:05 +09:00
Dean Herbert
a3f05ca9ec Avoid unnecessary use of linq 2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer 2018-01-09 12:00:21 +09:00
Aergwyn
f6c168be27 add skip cutscene as "in game" keybinding 2018-01-08 18:22:43 +01:00
Dean Herbert
9eb4eb4b36
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-08 22:51:16 +09:00
Aergwyn
140a09ba3d fix requests not cancelling properly + formatting 2018-01-05 19:13:54 +01:00
Dean Herbert
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision 2018-01-05 20:48:30 +09:00
Dean Herbert
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
smoogipoo
1571c10c42 Fix up replay settings sliderbar formatting 2018-01-05 14:37:32 +09:00
smoogipoo
5eb2dc3d64 Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
Dean Herbert
9bce322682
Merge branch 'master' into wedge-unicode 2018-01-04 15:09:31 +09:00
Endrik Tombak
ce156098f6 Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer 2018-01-03 12:33:43 +02:00
Endrik Tombak
969fa65c42 Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer 2018-01-03 12:31:59 +02:00
Endrik
35af5d1ce6
Merge branch 'master' into fix-randomizer 2018-01-03 12:25:07 +02:00
Dan Balasescu
2a6068f8e7
Merge branch 'master' into fix-play-song-select-tests 2018-01-03 14:12:49 +09:00
Dan Balasescu
262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dan Balasescu
d167663340
Merge branch 'master' into large-texture-store 2018-01-03 13:50:49 +09:00
Dean Herbert
2291053205
Merge branch 'master' into wedge-unicode 2018-01-03 13:12:42 +09:00
Dean Herbert
1c3541f18e Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 16:58:28 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dean Herbert
4f8a830fbf Fix potential race condition with score retrieval 2018-01-02 15:30:29 +09:00
Dean Herbert
161e8d44b4
Merge branch 'master' into supporter-leaderboards 2018-01-02 15:09:52 +09:00
Dan Balasescu
91c49913c9
Merge branch 'master' into focused-overlay-improvements 2018-01-02 12:44:09 +09:00
Felix Ang
755befdf84 Check for supporter before displaying loading spinner 2018-01-01 14:30:53 +01:00
Endrik Tombak
5abf93038b Reset only visible sets for more randomized feel 2017-12-31 14:47:27 +02:00
Dean Herbert
2079b7239c
Merge branch 'master' into result-page-date-order 2017-12-31 13:11:55 +09:00
Dean Herbert
77f6f25ad3
Merge branch 'master' into wedge-unicode 2017-12-31 13:09:41 +09:00
Dean Herbert
dfee8e911f Fix dummy beatmap selection not propagating to song select components 2017-12-31 12:55:53 +09:00
Dean Herbert
02514d4228 Update tests to account for correct beatmap displaying on details area 2017-12-31 12:54:27 +09:00
Endrik Tombak
987a6403da Faster count for AppVeyor 2017-12-31 03:25:43 +02:00
Endrik Tombak
d032790e19 Doesn't allow randomizer to select invisible maps 2017-12-31 03:10:54 +02:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Aergwyn
3d66b879a7 use ToShortTimeString to create a time depending on current culture 2017-12-30 22:45:28 +01:00
Aergwyn
2a0699f13c use ToShortDateString to create a date depending on current culture 2017-12-30 22:41:01 +01:00
Aergwyn
0dad9cbe53 change date to be more friendly to read 2017-12-30 21:49:05 +01:00
Aergwyn
d6af8ad748 swap date and time in ResultsPageScore 2017-12-30 21:48:49 +01:00
Aergwyn
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
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
ColdVolcano
13900d6130 Use LocalisationEngine on BeatmapInfoWedge 2017-12-30 14:12:47 -06:00
Dean Herbert
c002d4e1d2
Merge branch 'master' into result-page-sorting 2017-12-31 04:34:48 +09:00