Commit Graph

10527 Commits

Author SHA1 Message Date
1fdb8ca37a Fix auto-generated lisence header 2019-02-23 14:14:34 +09:00
8e09c66cbb Split out testcase player for use in slider input tests 2019-02-23 14:14:34 +09:00
367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
a0dae820ee Woops 2019-02-22 19:49:37 +09:00
d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
3015d40f8f Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
0431582959 Remove excess new line 2019-02-22 17:57:49 +09:00
3fe4b8fd1c Update variable names
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
2c9e6adfd4 Merge branch 'master' into bindable-valuechanged 2019-02-22 17:14:05 +09:00
452caabd40 Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
f919f2252f Add ToString for Judgements to ease debugging 2019-02-22 12:02:54 +09:00
8f53af1c71 Update framework 2019-02-22 11:32:14 +09:00
8853f7ad76 Explicitly set exo typeface in a few places 2019-02-21 19:26:02 +09:00
d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
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
7e41fbc29b Remove LegacyDifficultyCalculator 2019-02-21 13:12:37 +09:00
be9be5dee2 Add some xmldocs 2019-02-20 21:04:18 +09:00
062196c7da Cleanup 2019-02-20 20:52:56 +09:00
cc33f230b4 Merge remote-tracking branch 'origin/master' into osu-fontusage 2019-02-20 20:37:48 +09:00
9b3f2fdd24 Change RelativePositionAxes default on osu! logo to be both 2019-02-20 19:34:55 +09:00
4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
dbfa95b9e7 Made medium the default font weight 2019-02-20 16:52:36 +09:00
b1337ed07f Update framework 2019-02-20 16:09:29 +09:00
a4768a75e2 Merge remote-tracking branch 'upstream/master' into isactive-changes 2019-02-20 16:09:24 +09:00
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
a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
f6d70e687b Use correct local variable
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-20 12:27:25 +09:00
a6e055b1f8 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 12:08:37 +09:00
b4bb87fee3 Make TrackVirtualTracking more accurate on seeks/stops 2019-02-20 12:08:30 +09:00
96590156cd Merge branch 'master' into add-button-tooltip 2019-02-20 11:37:55 +09:00
f2ad2931c7 Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock 2019-02-20 11:37:33 +09:00
49eadcb575 Update active state immediately + fix potential nullref 2019-02-19 19:44:09 +09:00
703df77000 Update in-line with framework IsActive changes 2019-02-19 19:16:03 +09:00
b7b1f0ef0c Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:55:56 +09:00
4dcf39846d Pass beatmap to CreateSkills() 2019-02-19 17:52:59 +09:00
1efc5179aa Merge branch 'remove-populateattributes' into new-diffcalc-mania 2019-02-19 17:46:52 +09:00
ca8b7f24b4 Remove PopulateAttributes() 2019-02-19 17:36:33 +09:00
8104c45c25 Merge remote-tracking branch 'origin/master' into new-diffcalc-mania
# Conflicts:
#	osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs
2019-02-19 16:30:05 +09:00
151388dfad Merge branch 'master' into diffcalc-merging-2 2019-02-19 15:42:15 +09:00
7ed461aa8c XMLDoc DifficultyHitObject 2019-02-19 14:30:59 +09:00
93b7b51d0a timeRate -> clockRate 2019-02-19 14:29:23 +09:00
3784b673ae History -> LimitedCapacityStack + re-xmldoc 2019-02-19 13:51:19 +09:00
af0bb4d5e8 Remove mods from constructor 2019-02-19 13:40:39 +09:00
87dd7bcf6b Fix one more test regression 2019-02-19 13:02:33 +09:00
0fce23a36b Fix test regression 2019-02-19 12:38:45 +09:00
62fe5ad481 Nest class 2019-02-19 12:35:52 +09:00
f8033a3b35 Give TestWorkingBeatmap a reference clock 2019-02-19 12:27:30 +09:00
133c002d02 Fix test dlls being loaded as actual rulesets (and failing) 2019-02-19 12:13:55 +09:00
9cce9ce97c Consider aggregate peaks 2019-02-18 15:00:32 +09:00