Dean Herbert
|
3d0ef8b3bd
|
Move property back to local variable
Never used elsewhere
|
2018-02-06 18:14:08 +09:00 |
|
Dean Herbert
|
55e3d096f5
|
Merge remote-tracking branch 'upstream/master' into repeat-points
|
2018-02-06 18:10:25 +09:00 |
|
Dean Herbert
|
27fd42fb17
|
Adjust appear animations of repeats and ticks
|
2018-02-06 18:10:15 +09:00 |
|
Dean Herbert
|
e417aaa23f
|
Adjust scale out effect
|
2018-02-06 17:46:56 +09:00 |
|
Dean Herbert
|
60fb78e49d
|
Simplify iteration code
|
2018-02-06 17:46:45 +09:00 |
|
Dan Balasescu
|
fdcab55c51
|
Merge pull request #2023 from peppy/fix-skip-button
Fix skip button not receiving screen-wide input
|
2018-02-06 15:09:06 +09:00 |
|
Dan Balasescu
|
b46c388b4c
|
Merge branch 'master' into fix-skip-button
|
2018-02-06 14:50:37 +09:00 |
|
Dean Herbert
|
8bbb59831e
|
Merge pull request #2012 from smoogipoo/ismaskedaway-fix
Update in-line with framework changes
|
2018-02-06 14:50:08 +09:00 |
|
smoogipoo
|
48fd0f23f0
|
Update framework
|
2018-02-06 14:30:16 +09:00 |
|
Dean Herbert
|
9bfec9b233
|
Tidy up state change logic
|
2018-02-06 14:30:01 +09:00 |
|
smoogipoo
|
3fe3123cdc
|
Merge branch 'master' into ismaskedaway-fix
|
2018-02-06 14:29:52 +09:00 |
|
Dean Herbert
|
dd8955cd90
|
Fix skip button not receiving screen-wide input
|
2018-02-06 14:29:03 +09:00 |
|
Dean Herbert
|
a0c5336d5c
|
Merge pull request #2021 from smoogipoo/fix-local-nunit
Make NUnit tests run locally again
|
2018-02-05 20:06:06 +09:00 |
|
smoogipoo
|
cf39236fc1
|
Make NUnit tests run locally again
|
2018-02-05 18:29:58 +09:00 |
|
ColdVolcano
|
2e3ee79975
|
Update submodules
|
2018-02-04 00:02:32 -06:00 |
|
ColdVolcano
|
bf26fc94d8
|
Merge branch 'master' into repeat-points
|
2018-02-03 23:56:40 -06:00 |
|
Dean Herbert
|
3db75cd2fc
|
Merge pull request #2017 from ppy/osu/master
Stopping non-url text from being hyperlinks
|
2018-02-04 11:50:25 +09:00 |
|
Imnooby
|
c4f3223e34
|
Stops non-url text from being hyperlinks
Fixed crash when you attempted to click one
|
2018-02-03 18:24:49 -06:00 |
|
Dan Balasescu
|
a9148d81d2
|
Merge pull request #2011 from peppy/new-restore-default-design
Update design of "revert to default" button
|
2018-02-02 16:11:26 +09:00 |
|
smoogipoo
|
75858bd3de
|
Update in-line with framework changes
|
2018-02-02 15:41:54 +09:00 |
|
Dean Herbert
|
39160d895c
|
Update design of "revert to default" button
Also fixes some inconsistencies in padding
|
2018-02-02 15:18:39 +09:00 |
|
Dan Balasescu
|
c25acd831b
|
Merge pull request #2005 from tgi74/PlayerSettigsOverlay_InputHandle
Fix PlayerSettingsOverlay not able to reappear after being hidden
|
2018-02-02 11:21:37 +09:00 |
|
Dan Balasescu
|
2c45fc67a4
|
Merge branch 'master' into PlayerSettigsOverlay_InputHandle
|
2018-02-02 11:12:33 +09:00 |
|
Dean Herbert
|
86eaf9872f
|
Merge pull request #2004 from ppy/osu/SH_SSH_support
Store and show SSPlus and SPlus statistics on user page
|
2018-02-02 10:49:46 +09:00 |
|
tgi74000
|
b0fbae9dfc
|
Fix PlayerSettingsOverlay not reappearing when Hidden
|
2018-02-01 16:07:49 +01:00 |
|
tgi74000
|
e08a9350a0
|
Store and show SSPlus and SPlus statistics
|
2018-02-01 15:19:49 +01:00 |
|
Dean Herbert
|
d9654e4d64
|
Merge pull request #2003 from smoogipoo/catmull-sliders
Implement Catmull-Rom curve approximator
|
2018-02-01 21:41:01 +09:00 |
|
Dean Herbert
|
002fe45741
|
Merge branch 'master' into catmull-sliders
|
2018-02-01 21:21:25 +09:00 |
|
Dean Herbert
|
dea49932a3
|
Merge pull request #2001 from peppy/fix-catch-autoplay-misses
Fix osu!catch autoplay missing bananas when running above 1x playback speed
|
2018-02-01 21:20:52 +09:00 |
|
Dean Herbert
|
5ba84a67f1
|
Merge branch 'master' into catmull-sliders
|
2018-02-01 20:58:33 +09:00 |
|
Dean Herbert
|
4002b3123c
|
Merge branch 'master' into fix-catch-autoplay-misses
|
2018-02-01 20:24:10 +09:00 |
|
Dean Herbert
|
79288bcbe0
|
Merge pull request #2000 from peppy/fix-replay-time-stop
Fix clock not incrementing beyond last frame of replay
|
2018-02-01 20:24:01 +09:00 |
|
Dean Herbert
|
c08fadb191
|
Merge branch 'master' into fix-catch-autoplay-misses
|
2018-02-01 20:10:39 +09:00 |
|
Dan Balasescu
|
c486609174
|
Merge branch 'master' into fix-replay-time-stop
|
2018-02-01 20:08:58 +09:00 |
|
Dean Herbert
|
1cb95e9a78
|
Merge pull request #1998 from smoogipoo/ismaskedaway-input-fix
Fix IsMaskedAway not being up-to-date when fastfowarding replays
|
2018-02-01 20:08:46 +09:00 |
|
Dan Balasescu
|
0863326b4c
|
Merge branch 'master' into fix-replay-time-stop
|
2018-02-01 20:08:07 +09:00 |
|
smoogipoo
|
13f16077d4
|
Implement Catmull-Rom curve approximator
|
2018-02-01 20:04:41 +09:00 |
|
Dean Herbert
|
468205d450
|
Fix osu!catch autoplay missing bananas when running above 1x playback speed
|
2018-02-01 19:52:36 +09:00 |
|
Dean Herbert
|
e5a64df113
|
Merge branch 'master' into ismaskedaway-input-fix
|
2018-02-01 19:47:16 +09:00 |
|
Dean Herbert
|
491ddb8607
|
Merge pull request #1981 from thomastanck/starrating-fix
Fix osu star rating calculation
|
2018-02-01 19:32:36 +09:00 |
|
Dean Herbert
|
71be95f743
|
Bring framework up-to-date
|
2018-02-01 19:29:35 +09:00 |
|
Dean Herbert
|
9d4ec6f8b5
|
Merge branch 'master' into ismaskedaway-input-fix
|
2018-02-01 19:29:10 +09:00 |
|
Dean Herbert
|
1d687c470c
|
Fix clock not incrementing beyond last frame of replay
|
2018-02-01 18:49:14 +09:00 |
|
Dan Balasescu
|
cf665b717f
|
Merge branch 'master' into starrating-fix
|
2018-02-01 18:44:04 +09:00 |
|
Dan Balasescu
|
9cc95e6e14
|
Merge pull request #1977 from Aergwyn/fix-ticks-appearing-late
Fix slider ticks appearing too late
|
2018-02-01 18:37:28 +09:00 |
|
Dan Balasescu
|
39e626f29e
|
Merge branch 'master' into fix-ticks-appearing-late
|
2018-02-01 18:28:42 +09:00 |
|
Dan Balasescu
|
acf92527e3
|
Merge pull request #1999 from peppy/fix-catch-results-screen
Fix osu!catch never reaching the result screen
|
2018-02-01 18:20:48 +09:00 |
|
Dean Herbert
|
3bd42e3c85
|
Fix catch never hitting result screen
|
2018-02-01 18:08:15 +09:00 |
|
Dean Herbert
|
daac7494dd
|
Fix incorrect offset check for DrawableCatchHitObjects
|
2018-02-01 18:08:15 +09:00 |
|
Dean Herbert
|
1cc7c23982
|
Hits -> JudgedHits
|
2018-02-01 18:08:15 +09:00 |
|