Dean Herbert
|
d637b184e4
|
Merge pull request #4247 from peppy/remove-pr-template
Remove github pull request template
|
2019-02-21 14:42:15 +09:00 |
|
Dean Herbert
|
bbeecd6c26
|
Merge pull request #4299 from nekodex/fix-flying-logo
Fix osu! logo traveling in a weird direction on entering gameplay
|
2019-02-21 14:39:35 +09:00 |
|
Dean Herbert
|
79753919db
|
Merge pull request #4302 from smoogipoo/remove-legacy-diffcalc
Remove LegacyDifficultyCalculator
|
2019-02-21 13:19:22 +09:00 |
|
smoogipoo
|
7e41fbc29b
|
Remove LegacyDifficultyCalculator
|
2019-02-21 13:12:37 +09:00 |
|
Dean Herbert
|
264fa34c13
|
Merge pull request #4301 from peppy/fix-filename
Fix non-conforming filename
|
2019-02-21 11:41:36 +09:00 |
|
Dean Herbert
|
c96a2ac853
|
Fix non-conforming filename
|
2019-02-20 21:08:52 +09:00 |
|
smoogipoo
|
be9be5dee2
|
Add some xmldocs
|
2019-02-20 21:04:18 +09:00 |
|
smoogipoo
|
062196c7da
|
Cleanup
|
2019-02-20 20:52:56 +09:00 |
|
smoogipoo
|
cc33f230b4
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
|
2019-02-20 20:37:48 +09:00 |
|
Jamie Taylor
|
9b3f2fdd24
|
Change RelativePositionAxes default on osu! logo to be both
|
2019-02-20 19:34:55 +09:00 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|
Dean Herbert
|
42039a0ce9
|
Merge pull request #4296 from smoogipoo/isactive-changes
Update in-line with framework IsActive changes
|
2019-02-20 16:55:06 +09:00 |
|
smoogipoo
|
dbfa95b9e7
|
Made medium the default font weight
|
2019-02-20 16:52:36 +09:00 |
|
Dean Herbert
|
b1337ed07f
|
Update framework
|
2019-02-20 16:09:29 +09:00 |
|
Dean Herbert
|
a4768a75e2
|
Merge remote-tracking branch 'upstream/master' into isactive-changes
|
2019-02-20 16:09:24 +09:00 |
|
Dean Herbert
|
a394e887df
|
Merge pull request #4290 from peppy/test-working-beatmap-clock
Give TestWorkingBeatmap a reference clock
|
2019-02-20 16:04:46 +09:00 |
|
Dan Balasescu
|
0850cb503d
|
Merge branch 'master' into test-working-beatmap-clock
|
2019-02-20 15:57:46 +09:00 |
|
Dan Balasescu
|
c8311dfe60
|
Merge pull request #4190 from HoLLy-HaCKeR/ctb-diffcalc
Fix Catch DifficultyCalculator being off
|
2019-02-20 15:28:40 +09:00 |
|
smoogipoo
|
c01b18f02f
|
Adjust expected testcase value
|
2019-02-20 15:18:51 +09:00 |
|
smoogipoo
|
cab7a030f0
|
Merge remote-tracking branch 'origin/master' into ctb-diffcalc
|
2019-02-20 15:15:12 +09:00 |
|
Dean Herbert
|
34afb2d897
|
Merge branch 'master' into test-working-beatmap-clock
|
2019-02-20 15:15:08 +09:00 |
|
Dean Herbert
|
850a84b506
|
Merge pull request #4298 from smoogipoo/fix-catch-diffcalc-position
Fix position not being set for the first hitobject
|
2019-02-20 15:14:36 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
smoogipoo
|
d25d10d8fc
|
Fix position not being set for the first hitobject
|
2019-02-20 14:14:45 +09:00 |
|
Dan Balasescu
|
f6d70e687b
|
Use correct local variable
Co-Authored-By: peppy <pe@ppy.sh>
|
2019-02-20 12:27:25 +09:00 |
|
smoogipoo
|
9192f7d717
|
Merge remote-tracking branch 'origin/master' into ctb-diffcalc
# Conflicts:
# osu.Game.Rulesets.Catch/Difficulty/CatchDifficultyCalculator.cs
|
2019-02-20 12:22:32 +09:00 |
|
Dean Herbert
|
a6e055b1f8
|
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
|
2019-02-20 12:08:37 +09:00 |
|
Dean Herbert
|
b4bb87fee3
|
Make TrackVirtualTracking more accurate on seeks/stops
|
2019-02-20 12:08:30 +09:00 |
|
Dan Balasescu
|
5ac1288f9e
|
Merge pull request #4254 from peppy/add-button-tooltip
Add tooltip to key configuration button
|
2019-02-20 11:53:38 +09:00 |
|
Dan Balasescu
|
96590156cd
|
Merge branch 'master' into add-button-tooltip
|
2019-02-20 11:37:55 +09:00 |
|
Dean Herbert
|
f2ad2931c7
|
Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock
|
2019-02-20 11:37:33 +09:00 |
|
Dean Herbert
|
19484d7c5e
|
Merge pull request #4280 from smoogipoo/new-diffcalc-taiko
Migrate taiko to use the new difficulty calculator structure
|
2019-02-20 11:01:25 +09:00 |
|
Dean Herbert
|
58f817ae85
|
Merge branch 'master' into new-diffcalc-taiko
|
2019-02-20 10:46:38 +09:00 |
|
Dean Herbert
|
2c76a039ca
|
Remove unnecessary folder reference
|
2019-02-20 10:46:25 +09:00 |
|
Dean Herbert
|
8ccc935b6b
|
Merge pull request #4278 from smoogipoo/new-diffcalc-mania
Migrate mania to use the new difficulty calculator structure
|
2019-02-20 10:45:37 +09:00 |
|
Dean Herbert
|
43470da4ef
|
Merge branch 'master' into new-diffcalc-mania
|
2019-02-20 10:30:48 +09:00 |
|
Dean Herbert
|
fd442372ce
|
Merge pull request #4279 from smoogipoo/new-diffcalc-catch
Migrate catch to use the new difficulty calculator structure
|
2019-02-20 10:30:24 +09:00 |
|
Dean Herbert
|
d6a2fe6891
|
Remove excess newline
|
2019-02-20 10:29:08 +09:00 |
|
Dean Herbert
|
ebb3fd8200
|
Merge branch 'master' into new-diffcalc-mania
|
2019-02-20 10:20:49 +09:00 |
|
Dean Herbert
|
cf3e13c984
|
Merge branch 'master' into new-diffcalc-catch
|
2019-02-20 10:20:43 +09:00 |
|
Dean Herbert
|
6bf0363db5
|
Merge branch 'master' into new-diffcalc-taiko
|
2019-02-20 10:20:22 +09:00 |
|
Dean Herbert
|
9cbd3f43f3
|
Merge pull request #4281 from smoogipoo/new-diffcalc-osu
Migrate osu to use the new difficulty calculator structure
|
2019-02-20 09:45:17 +09:00 |
|
smoogipoo
|
49eadcb575
|
Update active state immediately + fix potential nullref
|
2019-02-19 19:44:09 +09:00 |
|
smoogipoo
|
703df77000
|
Update in-line with framework IsActive changes
|
2019-02-19 19:16:03 +09:00 |
|
smoogipoo
|
0380293098
|
Add beatmap argument
|
2019-02-19 17:58:02 +09:00 |
|
smoogipoo
|
19f2593ef6
|
Merge branch 'remove-populateattributes' into new-diffcalc-osu
|
2019-02-19 17:57:47 +09:00 |
|
smoogipoo
|
5ff890434c
|
Add beatmap argument
|
2019-02-19 17:57:29 +09:00 |
|
smoogipoo
|
256fbfe492
|
Merge branch 'remove-populateattributes' into new-diffcalc-taiko
|
2019-02-19 17:57:14 +09:00 |
|
smoogipoo
|
4efc03cdf0
|
Add beatmap argument + fix crashes
|
2019-02-19 17:56:38 +09:00 |
|