1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 23:47:24 +08:00
Commit Graph

25325 Commits

Author SHA1 Message Date
Dean Herbert
ca94850ce4
Merge branch 'master' into view-comments-via-propery 2020-01-23 17:47:40 +09:00
Dean Herbert
a6d97f8ee6
Merge pull request #7577 from ProTheory8/mod-autoopen
Make Difficulty Adjust mod customisation menu open automatically
2020-01-23 17:03:04 +09:00
Dean Herbert
143d47ec93
Merge pull request #7538 from peppy/decouple-blueprint-container
Decouple blueprint container to allow usage in timeline
2020-01-23 16:13:51 +09:00
Dan Balasescu
0df9703c46
Merge branch 'master' into mod-autoopen 2020-01-23 16:04:43 +09:00
Dan Balasescu
a9e4bdff33
Merge pull request #7588 from peppy/i-beat-snapping
Move beat snapping to its own interface
2020-01-23 16:04:34 +09:00
Dean Herbert
02ae92418f Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-23 15:54:46 +09:00
Dean Herbert
d3262a5667 Cache EditorBeatmap in test 2020-01-23 15:51:00 +09:00
Dan Balasescu
e988976012
Merge branch 'master' into mod-autoopen 2020-01-23 15:34:19 +09:00
Dean Herbert
ccf911884b Remove passed in BaetDivisor 2020-01-23 15:31:56 +09:00
Dean Herbert
098d643955 Move beat snapping to its own interface 2020-01-23 14:39:56 +09:00
Dean Herbert
2ef8714d67
Merge pull request #7587 from peppy/update-framework
Update framework
2020-01-23 11:06:37 +09:00
Dean Herbert
c0935b9b86 Update naming in tournament 2020-01-22 23:13:21 +09:00
Dean Herbert
8ea354571c Update naming 2020-01-22 23:04:37 +09:00
Dean Herbert
8c29093d1c Merge remote-tracking branch 'smoogipoo/void-joystick-release-returns' into update-framework 2020-01-22 22:58:00 +09:00
Dean Herbert
8a7f7c5e46 Merge remote-tracking branch 'smoogipoo/void-key-up-returns' into update-framework 2020-01-22 22:57:56 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
Dean Herbert
5f8ffd9346 Merge remote-tracking branch 'smoogipoo/void-release-returns' into update-framework 2020-01-22 22:57:40 +09:00
Dean Herbert
e2c4cffc9a Update framework 2020-01-22 22:57:09 +09:00
Dean Herbert
3164585379
Add mod setting (de)serialization support (#7548)
Add mod setting (de)serialization support
2020-01-22 22:41:39 +09:00
Dean Herbert
cbba708931
Merge branch 'master' into online-mod-settings 2020-01-22 22:15:41 +09:00
smoogipoo
03b61e4a5a Throw exception rather than returning nulls 2020-01-22 20:00:36 +09:00
ProTheory8
df92b0d3dc Merge branch 'master' into mod-autoopen 2020-01-22 15:01:53 +05:00
Dean Herbert
a28934f9f2
Enforce using get-only auto property where possible (#7566)
Enforce using get-only auto property where possible
2020-01-22 16:38:36 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
Dean Herbert
fdd746a522
Merge pull request #7582 from raouls555/hex-alpha
Allow parsing hex colour codes with alpha
2020-01-22 13:01:35 +09:00
raouls555
03b6a3ddc3
Allow parsing hex colour codes with alpha 2020-01-21 23:22:08 +01:00
ProTheory8
9de4424aec Removed TestModCustomisable3 2020-01-21 19:32:53 +05:00
ProTheory8
b8d2012fc3 Added test 2020-01-21 15:26:51 +05:00
Dean Herbert
2aa8e7dbc9
Merge branch 'master' into get-only-auto-property 2020-01-21 18:56:44 +09:00
ProTheory8
61d7b63914
Readability Improvement 2020-01-21 09:30:11 +05:00
ProTheory8
02f26e4a4d
Update comment
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2020-01-21 08:44:22 +05:00
ProTheory8
41295bc27c Difficulty Adjust mod customisation menu opens automatically now 2020-01-20 21:06:36 +05:00
Dean Herbert
740bdee125 Apply remaining uncaught changes 2020-01-20 23:59:21 +09:00
Dean Herbert
1becbb072e Remove broken test 2020-01-20 23:26:21 +09:00
smoogipoo
b62e3addf3 Apply input method signature refactorings 2020-01-20 20:30:25 +09:00
smoogipoo
40f502c6d1 Apply input method signature refactorings 2020-01-20 19:35:37 +09:00
smoogipoo
1b1003bd73 Refactor 2020-01-20 18:31:25 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Dean Herbert
fc331e7752
Merge pull request #7567 from peppy/update-fastlane
Update fastlane and plugins
2020-01-20 17:57:45 +09:00
Dean Herbert
25aff5d96e Merge remote-tracking branch 'upstream/master' into decouple-blueprint-container 2020-01-20 17:08:59 +09:00
Dean Herbert
fab8f4661a
Merge pull request #7541 from EVAST9919/overlay-header-web-colours
Implement colour schemes for OverlayHeader
2020-01-20 14:13:09 +09:00
Dean Herbert
a27e2c574d Update fastlane and plugins 2020-01-20 13:53:46 +09:00
Dean Herbert
cd5290b030 Enforce using get-only auto property where possible 2020-01-20 13:50:27 +09:00
Andrei Zavatski
6875b41f74 Remove unnecessary setter 2020-01-20 07:47:49 +03:00
Andrei Zavatski
3b3d24bf25 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-20 07:46:20 +03:00
Dean Herbert
fa1b1479ed
Merge pull request #7561 from peppy/fix-tournament-null-handling
Fix hard crashes on tournament client if a round contains an empty beatmap
2020-01-20 12:20:50 +09:00
Dan Balasescu
840677bb05
Merge branch 'master' into fix-tournament-null-handling 2020-01-20 11:50:20 +09:00
smoogipoo
43f144cd6a Invert condition 2020-01-20 11:48:56 +09:00
Dan Balasescu
17e13dd718
Merge pull request #7564 from iiSaLMaN/update-license-year
Update license year
2020-01-20 11:13:09 +09:00
Salman Ahmed
5a2ed5391d Update license year 2020-01-19 23:51:10 +03:00