1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 14:33:01 +08:00
Commit Graph

10834 Commits

Author SHA1 Message Date
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent 2018-02-28 23:49:33 +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
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing 2018-02-28 22:53:02 +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
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
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
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
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
naoey
a77d1eedae
Fix achievements parsing and add badges to recent activity. 2018-02-26 13:08:12 +05:30
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
naoey
a20e4bc2c3
Fix typos and missing fields in JSON mappings. 2018-02-26 11:46:16 +05:30
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
naoey
5724618b2a
Add license headers and sanitise open profile argument. 2018-02-26 09:58:11 +05:30
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
naoey
1ad45b0941
R# fixes. 2018-02-26 01:21:31 +05:30
naoey
75fdca928e
Handle links correctly and don't re-open profile if the user is same. 2018-02-26 01:21:29 +05:30
naoey
bb40919f9c
Add link handling to recent activities.
- Add a show user action to link handling
2018-02-26 01:21:27 +05:30
naoey
7e4bd36391
Create drawable and add response to profile.
- Add missing JSON fields to response model
- Add missing enum value
2018-02-26 01:21:24 +05:30
naoey
e3a1b07172
Create API request and reponse model. 2018-02-26 01:21:16 +05:30