RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,048 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

7703 Commits

Author SHA1 Message Date
Dean Herbert 345e213eff
Merge branch 'master' into fix-wedge-nullref 2018-05-14 15:08:48 +09:00
Dean Herbert 5c41e7c39c
Merge pull request #2527 from peppy/fix-mousewheel-startup-crash 
Fix crash on startup when adjusting volume before volume control loaded
 2018-05-14 14:23:08 +09:00
Dan Balasescu d7cba000ab
Merge branch 'master' into fix-wedge-nullref 2018-05-14 13:36:07 +09:00
Dan Balasescu 2e648a90c8
Merge branch 'master' into fix-song-progress-counters 2018-05-14 13:27:50 +09:00
Dean Herbert db0470243a Fix nullref when changing ruleset at main menu 2018-05-13 12:55:54 +09:00
Dean Herbert a162453e9b Merge remote-tracking branch 'upstream/master' into joystick 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
 2018-05-13 00:11:17 +09:00
Dean Herbert 36af7feab3
Merge branch 'master' into diffcalc-fixes 2018-05-12 21:01:58 +09:00
Dean Herbert a14531b9a4 Fix crash on startup when adjusting volume before volume control loaded 2018-05-11 22:57:36 +09:00
Dean Herbert cfa18bdf1f Fix song progress time counters wrapping after an hour 
Resolves #2466.
Supersedes and closes #2487.
 2018-05-11 22:10:26 +09:00
smoogipoo 7e7a5f8964 Fix score accuracy not being populated 2018-05-11 21:49:10 +09:00
smoogipoo 8ca67f63ec Fix score statistics not being read 2018-05-11 21:49:06 +09:00
Dean Herbert aa5d5ab2a8 Fix readonly field 2018-05-11 21:48:35 +09:00
Dean Herbert f1fd2ae7be
Merge branch 'master' into modmouseup 2018-05-11 21:41:14 +09:00
Dean Herbert 4fc887b25f Add a pressing effect to make mouse up response feel good 2018-05-11 21:40:36 +09:00
Dean Herbert c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics 2018-05-11 17:37:50 +09:00
Dean Herbert 2afc0c1abd
Merge branch 'master' into breadcrumb-design-adjustments 2018-05-11 17:19:26 +09:00
smoogipoo fd9796d08c Remove some unnecessary changes 2018-05-11 14:13:52 +09:00
smoogipoo 816ad5c426 Pass down ruleset to the buffered wedge 2018-05-11 14:10:53 +09:00
smoogipoo 2bab08c437 Fix post-merge errors 2018-05-11 14:08:17 +09:00
smoogipoo 73465c35fa Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics 
# Conflicts:
#	osu.Game/Beatmaps/Beatmap.cs
 2018-05-11 14:05:40 +09:00
DrabWeb a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb 2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
DrabWeb c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
DrabWeb ecb8de29a2 Adjust BreadcrumbControl to better match the designs. 2018-05-10 20:30:03 -03:00
Dean Herbert 8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework 2018-05-10 19:10:07 +08:00
Dean Herbert 9e26bcd571 Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap 2018-05-10 19:51:52 +09:00
Dean Herbert 40c1b24b3d Move IBeatmap to its own file 2018-05-10 19:51:40 +09:00
Dean Herbert 2e9c91c32f
Merge branch 'master' into use-bindable-transforms 2018-05-10 11:45:29 +08:00
Dean Herbert fff34be814
Merge branch 'master' into fix-editor-beatmap-change 2018-05-10 11:37:36 +08:00
smoogipoo 674e45d49b Fix beatmap/ruleset being changeable while in the editor 2018-05-07 16:32:15 +09:00
smoogipoo fbd7ccc03f Make BeatmapInfoWedge display properly for converts 2018-05-07 15:51:08 +09:00
smoogipoo 5489976c20 Implement ruleset-specific beatmap statistics 2018-05-07 15:51:08 +09:00
smoogipoo 30a3f4f29f Fix not being able to convert beatmaps with 0 hitobjects 2018-05-07 15:27:45 +09:00
Dean Herbert 1be1b10059
Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen 2018-05-07 13:32:19 +08:00
smoogipoo 68441f1ef0 Output ruleset instantiation info 2018-05-07 14:28:30 +09:00
smoogipoo 6867886f4c Give conversion-tested beatmaps a ruleset 2018-05-07 14:04:37 +09:00
smoogipoo ad2c2a5fe6 Restore star difficulty calculation 2018-05-07 12:25:21 +09:00
smoogipoo 794418432f Fix incorrect method name 2018-05-07 11:22:25 +09:00
smoogipoo db3e48c194 Rename GetBeatmap() to GetPlayableBeatmap() 2018-05-07 10:40:30 +09:00
smoogipoo 9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo 7e83c75888 Add xmldoc 2018-05-07 10:23:32 +09:00
smoogipoo b68ee39136 Reword beatmap conversion error 2018-05-07 10:18:47 +09:00
smoogipoo 4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo 77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo 1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
smoogipoo f3aa9269ff Fix mania-specific beatmap conversion 2018-05-07 09:17:12 +09:00
Roman Kapustin 33e2b91ccc Decouple FilterControl.Ruleset from the game-wide ruleset bindable 2018-05-03 22:59:49 +03:00
Santeri Nogelainen 89db7f81cb Selecting a mod now triggers on mouseup 2018-05-02 17:11:55 +03:00
smoogipoo 2d6b2d10f7 Use bindable transforms 2018-05-02 18:26:23 +09:00