1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 21:43:01 +08:00
Commit Graph

11635 Commits

Author SHA1 Message Date
Dean Herbert
572d3b1316 Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm
In line with stable editor restrictions
2018-02-28 22:53:28 +09:00
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 22:53:02 +09:00
Dean Herbert
83a876b651 Merge remote-tracking branch 'upstream/master' into fix-hidden-slider-heads 2018-02-28 22:49:47 +09:00
Dean Herbert
650a881d89
Merge pull request #2131 from peppy/fix-player-exit
Fix incorrect exit block conditional
2018-02-28 22:49:33 +09:00
Dean Herbert
6ac71abd0e Update framework 2018-02-28 22:48:30 +09:00
Dean Herbert
f213f38997 Merge branch 'master' into fix-hidden-slider-heads 2018-02-28 22:48:11 +09:00
Dan Balasescu
25c748ed45
Merge branch 'master' into fix-player-exit 2018-02-28 22:05:44 +09:00
Dan Balasescu
43ecda2889
Merge pull request #2129 from peppy/fix-mod-select
Fix bindings not being unbound on ModSelect
2018-02-28 22:05:36 +09:00
Dean Herbert
f9faf8e3d8 Localise offset clock usage out of Player as much as possible 2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813 Update in line with framework changes 2018-02-28 22:01:48 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select 2018-02-28 21:52:07 +09:00
Dan Balasescu
1936498392
Merge pull request #2127 from peppy/fix-song-select-iteration
Fix song select iteration when all panels are filtered
2018-02-28 21:52:00 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration 2018-02-28 21:40:25 +09:00
Dean Herbert
3609c685d1 Fix approach circle fading 2018-02-28 20:35:15 +09:00
Dean Herbert
065630487a Fix slider heads fading out too late 2018-02-28 20:12:16 +09:00
naoey
2e535afb84
Remove redundant subsection title.
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
5b4fef0180 Add bare minimum sanity checking of beatmap input values to make broken maps load
Resolves ppy/osu#1988.
2018-02-28 18:12:24 +09:00
Dean Herbert
968291c61e Sort hitobjects imported from legacy beatmps
Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.
2018-02-28 18:11:28 +09:00
Dean Herbert
6f44db6de0 Clamp at DifficultyControlPoint
This is what stable did.
2018-02-28 18:10:38 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 15:32:16 +09:00
Dan Balasescu
59538cd664
Merge pull request #2117 from peppy/reduce-transforms
Rely less on every-frame transform helpers
2018-02-28 15:31:48 +09:00
Dean Herbert
bc0bbd2e3b
Merge branch 'master' into reduce-transforms 2018-02-28 14:39:31 +09:00
Dean Herbert
04d0e21ade
Merge pull request #2135 from peppy/fix-song-select-sort
Fix depth of already-visible panels not being updated after a sorting change
2018-02-28 14:34:14 +09:00
Dean Herbert
a0a215bc42 Update framework 2018-02-28 14:22:16 +09:00
Dean Herbert
4a52db14d1 Fix depth of already-visible panels not being updates after a sorting change 2018-02-28 14:18:25 +09:00
Dean Herbert
dd6cf1379e Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0 Rely less on zero-duration transform helpers
They have huge overheads.

See ppy/osu-framework#1411.
2018-02-28 11:00:54 +09:00
naoey
62913163e0
Fix long recent activity text overlapping timestamp.
- Also remove unnecessary fallback from absolute URL helper
2018-02-27 21:21:53 +05:30
Dean Herbert
510ecd7c87 Ensure selection is finalised before exiting song select
Resolves #2080.
2018-02-28 00:07:28 +09:00
Dean Herbert
f64afc738d Fix incorrect exit block conditional
Resolves #2130.
2018-02-27 23:59:34 +09:00
Dean Herbert
1a85186b6f
Merge pull request #1966 from UselessToucan/MulticoreJit
Use Multicore JIT
2018-02-27 22:40:19 +09:00
Dean Herbert
db9b5ebaca Reduce complexity of code 2018-02-27 22:26:54 +09:00
TocoToucan
89bac13bf2 Fix profiles folder path 2018-02-27 22:06:32 +09:00
TocoToucan
714d7b4477 Do not use Multicore JIT on Mono 2018-02-27 22:06:32 +09:00
TocoToucan
ed99f26699 Use Multicore JIT 2018-02-27 22:06:32 +09:00
Dean Herbert
84a8fbe0b3 Fix null ref 2018-02-27 21:26:06 +09:00
Dean Herbert
034875be47 Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
2018-02-27 20:45:32 +09:00
Dean Herbert
9b44f447ca Fix song select iteration when all panels are filtered
Resolves #2069.
2018-02-27 17:52:12 +09:00
Dean Herbert
cff17f1864 Update in line with inverse ShoudProcessClock default 2018-02-27 17:23:38 +09:00
Dean Herbert
8e78a7b114 Fix HUD using incorrect clock for time display 2018-02-27 17:23:38 +09:00
Dean Herbert
37d2a2c3cc Rename clock types to match across classes 2018-02-27 17:23:38 +09:00
Dean Herbert
3d52ead213 Rename sourceClock 2018-02-27 17:23:38 +09:00
Dean Herbert
fee258f2f2 Rework PauseContainer to better pause 2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6 Remove unnecessary secondary argument from HUDOverlay 2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293 Include missing offset 2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c Avoid creating an extra framed clock in SkipButton 2018-02-27 17:23:38 +09:00
Dean Herbert
73fb185132 Change the way ShouldProcessClock is specified in line with framework changes 2018-02-27 17:23:38 +09:00
Dan Balasescu
f76c6a47d2
Merge pull request #2099 from peppy/confine-mode-reset
Reset mouse confine mode on input setting reset hotkey
2018-02-26 21:25:06 +09:00
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset 2018-02-26 20:59:53 +09:00
Dean Herbert
bdd88303b3
Merge branch 'master' into editor-hitobject-overlays 2018-02-26 17:53:50 +09:00