1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 16:22:56 +08:00
Commit Graph

10894 Commits

Author SHA1 Message Date
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
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
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
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
Dean Herbert
0f32d2ed77
Merge pull request #2123 from smoogipoo/sliderbody-rework
Improve vector conditional
2018-02-26 16:22:53 +09:00
Dean Herbert
1218a75b7f Improve vector conditional 2018-02-26 16:11:26 +09:00
Dean Herbert
b9b5d00096
Merge pull request #2107 from smoogipoo/sliderbody-rework
Give DrawableSlider an accurate position and size
2018-02-26 16:03:47 +09:00
Dean Herbert
9cbed461c4
Merge branch 'master' into sliderbody-rework 2018-02-26 15:00:18 +09:00
Dean Herbert
035157c730
Merge pull request #2098 from tgi74/taiko_legacy_rep
Fix legacy Taiko replays having reversed inputs
2018-02-26 14:28:48 +09:00
Dean Herbert
b9f8ed3123
Merge branch 'master' into taiko_legacy_rep 2018-02-26 13:27:37 +09:00
Dean Herbert
e7bd4ea0c7
Merge pull request #2116 from peppy/fix-slider-expiry
Fix sliders never getting a correct lifetime set
2018-02-26 13:27:03 +09:00
Dan Balasescu
edcef4e7ca
Merge branch 'master' into fix-slider-expiry 2018-02-26 12:45:56 +09:00
Dan Balasescu
dbb1d2b4aa
Merge pull request #2118 from peppy/fix-null-channels
Remove null channels from SkinnableSound playable channels
2018-02-26 12:45:35 +09:00
Dean Herbert
ab9aed351f Remove null channels from SkinnableSound playable channels 2018-02-25 17:14:35 +09:00
Dean Herbert
f1ddfa0581 Fix sliders never getting a correct lifetime set 2018-02-25 16:25:56 +09:00
Dan Balasescu
c701b8eae5
Merge pull request #2105 from peppy/skinning-basics
Implement skin support for (most) hitsounds and (osu!) hitcircles
2018-02-24 23:18:12 +09:00
Dean Herbert
4a52df2dd4 Apply review 2018-02-24 23:07:02 +09:00
Dean Herbert
768e0a4e2a Add SkinnableSound class
Tidy things up, move logic out of SampleInfo.
2018-02-24 22:47:14 +09:00
Dean Herbert
a312fb365a Merge remote-tracking branch 'ppy/master' into skinning-basics 2018-02-24 22:41:17 +09:00
Dean Herbert
6d4016e18b Update framework 2018-02-24 22:41:04 +09:00
Dean Herbert
a70fc7c703
Merge pull request #2112 from VPeruS/fix-case
Fix migration file case
2018-02-24 21:37:22 +09:00
V.Kalyuzhny
ef6b207c7e Fix file case 2018-02-24 14:18:53 +02:00
smoogipoo
f5fc9cdfba Fix catch now having incorrect offsets 2018-02-24 02:59:55 +09:00
smoogipoo
50d1183ec2 Division-by-zero safety + reference our own size 2018-02-24 02:53:02 +09:00
smoogipoo
066abfbdbc Rename PositionAt -> CurvePositionAt to represent its new meaning 2018-02-24 02:43:36 +09:00
smoogipoo
996e605e61 Remove temporary testcase 2018-02-24 02:39:44 +09:00
smoogipoo
1e1df2aaff Fix up testcases 2018-02-23 21:04:19 +09:00