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 |
|
smoogipoo
|
b7b1f0ef0c
|
Merge branch 'remove-populateattributes' into new-diffcalc-mania
|
2019-02-19 17:55:56 +09:00 |
|
smoogipoo
|
ea281e8596
|
Add beatmap argument
|
2019-02-19 17:54:00 +09:00 |
|
smoogipoo
|
dac3c4564e
|
Merge branch 'remove-populateattributes' into new-diffcalc-catch
|
2019-02-19 17:53:35 +09:00 |
|
smoogipoo
|
4dcf39846d
|
Pass beatmap to CreateSkills()
|
2019-02-19 17:52:59 +09:00 |
|
smoogipoo
|
5457097342
|
Update with PopulateAttributes() removal
|
2019-02-19 17:48:00 +09:00 |
|
smoogipoo
|
1efc5179aa
|
Merge branch 'remove-populateattributes' into new-diffcalc-mania
|
2019-02-19 17:46:52 +09:00 |
|
smoogipoo
|
c264a9cc74
|
Fix mods not being populated
|
2019-02-19 17:46:40 +09:00 |
|
smoogipoo
|
21f9c813b2
|
Fix mods not being populated
|
2019-02-19 17:46:18 +09:00 |
|
smoogipoo
|
1a645b5115
|
Fix mods not being populated
|
2019-02-19 17:45:52 +09:00 |
|
smoogipoo
|
0ef15f5bd5
|
Update with PopulateAttributes() removal
|
2019-02-19 17:45:16 +09:00 |
|
smoogipoo
|
6433ecf6aa
|
Merge branch 'remove-populateattributes' into new-diffcalc-taiko
|
2019-02-19 17:43:28 +09:00 |
|
smoogipoo
|
8459cf6ed0
|
Missed argument
|
2019-02-19 17:43:12 +09:00 |
|
smoogipoo
|
2765ffa190
|
Update with PopulateAttributes() removal
|
2019-02-19 17:42:24 +09:00 |
|
smoogipoo
|
419f541ab5
|
Merge branch 'remove-populateattributes' into new-diffcalc-catch
|
2019-02-19 17:40:56 +09:00 |
|
smoogipoo
|
f19a52b960
|
Rename argument
|
2019-02-19 17:40:35 +09:00 |
|
smoogipoo
|
37f9ac6eca
|
Populate mods too
|
2019-02-19 17:39:30 +09:00 |
|
smoogipoo
|
847f7d8658
|
Adjust with PopulateAttributes() removal
|
2019-02-19 17:38:33 +09:00 |
|
smoogipoo
|
08422912c1
|
Merge branch 'remove-populateattributes' into new-diffcalc-osu
|
2019-02-19 17:36:54 +09:00 |
|
smoogipoo
|
ca8b7f24b4
|
Remove PopulateAttributes()
|
2019-02-19 17:36:33 +09:00 |
|
smoogipoo
|
e298b174d6
|
Merge remote-tracking branch 'origin/master' into new-diffcalc-osu
|
2019-02-19 17:24:53 +09:00 |
|