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

10876 Commits

Author SHA1 Message Date
smoogipoo
e87be213d5 Adjust lenience a little bit 2018-03-02 13:13:01 +09:00
smoogipoo
797d03a65f Implement basic structure for beatmap conversion testing 2018-03-02 13:13:00 +09:00
Dean Herbert
99e5eb03f6
Merge pull request #2095 from smoogipoo/editor-hitobject-overlays
Implement hitobject selection overlays in the editor
2018-03-01 22:25:50 +09:00
Dean Herbert
0704d823a9 Fix slider selection point not being set to new origin 2018-03-01 22:03:00 +09:00
Dean Herbert
603a98f6cc
Merge branch 'master' into editor-hitobject-overlays 2018-03-01 21:33:27 +09:00
Dean Herbert
71671833b6
Merge pull request #2144 from smoogipoo/fix-fastrandom-inaccuracy
Fix FastRandom using uint instead of int for NextDouble()
2018-03-01 21:33:08 +09:00
Dean Herbert
479b06b6f2
Merge branch 'master' into fix-fastrandom-inaccuracy 2018-03-01 21:15:34 +09:00
Thomas Müller
2d37970b09
Merge pull request #2143 from peppy/remove-buffered-container-usage
Don't use BufferedContainer for OsuLogo
2018-03-01 10:36:42 +01:00
smoogipoo
8cfb119383 Fix FastRandom using uint instead of int for NextDouble() 2018-03-01 16:17:01 +09:00
Dean Herbert
6dc9411a90 Don't use BufferedContainer for OsuLogo
Minor performance improvement. Not sure why this was done but it's not required any more.
2018-03-01 16:01:42 +09:00
smoogipoo
e62fab6cc2 Fix overlay positions/sizes due to sliders now being fixed 2018-03-01 14:34:31 +09:00
smoogipoo
d5d4bcb558 Merge branch 'master' into editor-hitobject-overlays 2018-03-01 14:04:38 +09:00
Dean Herbert
8f10dc7512
Merge pull request #2136 from peppy/parser-sanity-checks
Fix importing some (broken) beatmaps looping infinitely
2018-03-01 00:51:28 +09:00
Dean Herbert
b8ea4b11ab
Adjust range further
This is not a great idea.
2018-03-01 00:39:59 +09:00
Dean Herbert
e2f57ae346
Merge branch 'master' into parser-sanity-checks 2018-03-01 00:38:44 +09:00
Dan Balasescu
d09437cee2
Merge pull request #2138 from peppy/fix-hidden-slider-heads
Fix slider heads fading out too late
2018-03-01 00:15:42 +09:00
Dean Herbert
36beaffa7a
Merge branch 'master' into editor-hitobject-overlays 2018-02-28 23:48:54 +09:00
Dean Herbert
0ed13c3f9d Update framework with regression fix 2018-02-28 23:31:05 +09:00
Dean Herbert
b4fb1edfe7 Merge remote-tracking branch 'upstream/master' into fix-hidden-slider-heads 2018-02-28 23:30:49 +09:00
Dean Herbert
d97c4c765b
Merge pull request #2134 from peppy/player-reduced-parallax
Reduce parallax effect during gameplay
2018-02-28 23:30:28 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax 2018-02-28 23:15:25 +09:00
Dean Herbert
16518bb478
Merge pull request #2132 from peppy/fix-multiple-tracks-playing
Ensure selection is finalised before exiting song select
2018-02-28 23:15:10 +09:00
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
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
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