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

1648 Commits

Author SHA1 Message Date
Huo Yaoyuan a91d897282 Handle left and right mouse button only. 2017-03-06 18:02:51 +08:00
Dean Herbert 1e48b0a037
Ensure AssemblyName is never null (seems to be on CI server). 2017-03-06 19:00:15 +09:00
Dean Herbert 88f3dc0e02
Fix a few naming issues. 2017-03-06 18:49:23 +09:00
Huo Yaoyuan f6f20cafd3 Merge remote-tracking branch 'peppy/less-mods-enum' into modselect 2017-03-06 17:35:15 +08:00
Dean Herbert 12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
Dean Herbert 45f500920c
Don't use Mods enum for handling incompatible mods. 2017-03-06 18:29:17 +09:00
Huo Yaoyuan ad75ead665 selectedMod -> selectedIndex 2017-03-06 17:21:25 +08:00
Huo Yaoyuan c2cf5242e1 Remove one-entry backing fields. 2017-03-06 17:14:41 +08:00
Dean Herbert 463c887879
Fix WaveOverlayContainer staying visible when hidden. 2017-03-06 17:32:13 +09:00
Dean Herbert 9908c1905d
Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
Dean Herbert 5ec2db6558
Fix crash on opening options before intro has played. 2017-03-06 17:32:10 +09:00
Dean Herbert b5aff9df5f
Add options footer. 2017-03-06 17:30:46 +09:00
Dean Herbert 0ee38571a6
Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
Dean Herbert e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Huo Yaoyuan a34e6453bf Simplify SelectedMods. 2017-03-06 15:39:27 +08:00
Dean Herbert 610de4a34c
Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
Dean Herbert 2de25c23b4
Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00
Dean Herbert 76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert 1ea21daa91
Fix PlayMode regression. 2017-03-06 14:25:38 +09:00
Dean Herbert 652d18aada
Update second usage of comment. 2017-03-06 14:20:44 +09:00
Dean Herbert 4118be6388
Remove unnecessary bounds check. 2017-03-06 14:19:22 +09:00
Dean Herbert 809828f0ba
Improve NextFrame. 2017-03-06 14:18:44 +09:00
Dean Herbert 1b03998b86
Improve comment of SetFrameFromTime. 2017-03-06 14:15:43 +09:00
Dean Herbert 3b0445a244
Improve comment for PreferredPlayMode and allow null. 2017-03-06 14:08:58 +09:00
Dean Herbert faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert 81cc27e104
Fix typo. 2017-03-06 10:06:25 +09:00
Dean Herbert 5b4424d4fa
CreateAutoplayReplay -> CreateAutoplayScore. 2017-03-06 10:06:14 +09:00
Dean Herbert 1c5b918f9e Add osu! autoplay generation. 
Doesn't work on complex sliders yet.
 2017-03-05 17:46:00 +09:00
Dean Herbert 7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
Dean Herbert 4e4408cd20 Merge branch 'master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
 2017-03-05 17:45:03 +09:00
Thomas Müller 73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Jorolf 7eebee36ab Merge branch 'master' into moarOptions 2017-03-04 16:11:27 +01:00
Thomas Müller a3f1cb2232 Merge branch 'master' into update-flow 2017-03-04 15:35:53 +01:00
Jorolf 5c5066e1ae renamed local groups 2017-03-04 15:30:14 +01:00
Dean Herbert e12d89529c
Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
smoogipooo 112545f135 Fix unnecessarily throwing exception if there's no last drawings results file. 2017-03-04 23:24:32 +09:00
Dean Herbert 00fdffe9c8
Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
Dean Herbert 84d84f6539 Merge pull request #434 from Tom94/song-select-refactorr 
Song select refactor
 2017-03-04 22:14:35 +09:00
Dean Herbert 389635c7ed
Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00
Dean Herbert 8f3621ca24
Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
Dean Herbert 7a6a614358
Don't show pause menu when watching replays. 2017-03-04 21:35:26 +09:00
Dean Herbert a5d044067c
Cancel previous load attempts before starting a new score load. 2017-03-04 21:35:12 +09:00
Dean Herbert 95e2e2b027
Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Dean Herbert a8deb4ff50
Fix WaveOverlayContainer always being visible. 2017-03-04 19:02:13 +09:00
Thomas Müller a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert aa9d85624d
Change IPC to make sense. 2017-03-04 18:51:16 +09:00
Thomas Müller a2b79de672 Add comments to CarouselContainer 2017-03-04 09:34:39 +01:00
Thomas Müller aaa1f766af Fix beatmap removal 2017-03-04 09:34:28 +01:00
Thomas Müller 9bddd1ed4b Fix broken CarouselContainer animations 
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
 2017-03-04 09:33:24 +01:00
Thomas Müller a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
TheGui e3c3806759 Fixed accuracy's counter first value change. 2017-03-04 04:48:32 -03:00
Dean Herbert b294386077
Remove misleading beatmap import method. 2017-03-04 16:47:37 +09:00
Thomas Müller c44bf5291c Merge branch 'master' into mod-select-performance 2017-03-04 07:35:40 +01:00
Dean Herbert adb6f01e39
Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
Dean Herbert 9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
 2017-03-04 13:17:01 +09:00
DrabWeb 9141d244bf Focus trigger in WaveOverlayContainer 2017-03-03 18:05:43 -04:00
DrabWeb 5a83687a27 Small cleanups 2017-03-03 18:02:31 -04:00
Jorolf b9e4c920c5 SelectRandom doesnt select hidden groups now 2017-03-03 21:11:38 +01:00
Thomas Müller aff9e3617d Massively improves fill-rate of mod select screen 
This is done by masking away the parts of WaveOverlayContainer that
are behind the content.
 2017-03-03 20:42:03 +01:00
Dean Herbert 6f3b59268a Merge pull request #385 from DrabWeb/mod-overlay 
Mod select
 2017-03-03 21:09:08 +09:00
Dean Herbert 9fe86583f1 Merge pull request #412 from revam/remove-source-on-import 
Remove source on Import(IEnumerable<string> paths), Import(string path)
 2017-03-03 20:59:26 +09:00
Dean Herbert 7a294f770a Merge branch 'master' into remove-source-on-import 2017-03-03 20:51:39 +09:00
Dean Herbert 398b1fcf03 Add comment about .ID == 0 check. 2017-03-03 20:51:07 +09:00
Dean Herbert dc6a728cce Merge branch 'master' into tournament_drawings 2017-03-03 20:48:07 +09:00
Dean Herbert 38a9e820e6
GroupsContainer -> GroupContainer. 2017-03-03 20:46:07 +09:00
Dean Herbert bc01935a89
Move around some namespaces. 2017-03-03 20:42:22 +09:00
Dean Herbert 2ac248c7d0
Use OsuSpriteText. 2017-03-03 20:29:39 +09:00
Dean Herbert 1ea1118db6
Simplify file reading. 2017-03-03 20:24:34 +09:00
Dean Herbert 4a109fcc55
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided. 2017-03-03 20:21:11 +09:00
Dean Herbert ca73b77a9a
Tidying code. 2017-03-03 20:08:32 +09:00
Dean Herbert 41cefd1cb3
xmldoc commenting. 2017-03-03 20:08:21 +09:00
Dean Herbert c3cb225eef
Fix being able to stop rotation when it isn't started. 2017-03-03 20:07:57 +09:00
smoogipooo 5a4d07d770 Better way to initialize team lists. 2017-03-03 18:47:56 +09:00
smoogipooo 890066dae4 Use sprite visualiser lines instead of shader. 2017-03-03 18:47:22 +09:00
smoogipooo 54993b874f Fix idle and stopping -> stopped state. 2017-03-03 18:45:04 +09:00
Dean Herbert 71534b3e13
Fix incorrect triangle density on first display. 2017-03-03 18:09:16 +09:00
smoogipooo 2a49200008 Nothing to see here. 2017-03-03 18:02:02 +09:00
smoogipooo b2661be0b2 Fix setting same state multiple times. 2017-03-03 17:59:16 +09:00
DrabWeb 9d75ab85e9 Put mod select over beatmap options 2017-03-03 04:19:03 -04:00
Seth fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
Dean Herbert 511c072270 Merge pull request #418 from DrabWeb/beatmap-options 
Beatmap options overlay
 2017-03-03 16:59:21 +09:00
Dean Herbert bdb130fabc
Avoid using right-to-left fill direction for now. 2017-03-03 16:54:59 +09:00
Dean Herbert 47845a7fbd
Fix button input handling. 2017-03-03 16:54:43 +09:00
smoogipooo 7cac2680b1 Make test case add test drawings file. 2017-03-03 16:33:40 +09:00
Dean Herbert b0ee728528
Remove full-screen background layer and add half-height holder. 
Doesn't interact well with dialog popups. May add back later with complementing logic.
 2017-03-03 16:11:23 +09:00
smoogipooo 1d1c08125b Further safety checking. 2017-03-03 16:01:24 +09:00
smoogipooo 777996d884 Rewrite VisualiserLine + add VisualiserContainer. 2017-03-03 15:43:16 +09:00
smoogipooo a70b1ae108 Use a singular FlowContainer for teams. 2017-03-03 15:12:26 +09:00
smoogipooo 04dd24b04b OnTeamSelected + async changes. 2017-03-03 14:51:19 +09:00
smoogipooo 3ae55933c4 Remove game dependency. 2017-03-03 14:11:47 +09:00
smoogipooo d96345e408 s/internalPeriod/_period 2017-03-03 14:11:37 +09:00
Seth 1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
smoogipooo e6d911e49b Move modified key conditional location. 2017-03-03 14:08:37 +09:00
Dean Herbert fb6c25edf8
Fix more silly hacks. 2017-03-03 13:58:46 +09:00
Dean Herbert 2e01857782
Better constants. 2017-03-03 13:58:46 +09:00
Dean Herbert 00b139b3df
Remove hack (fixed at framework level). 2017-03-03 13:58:46 +09:00
Seth 2e74b4be60 Merge branch 'master' into beatmap-options 2017-03-03 00:52:45 -04:00
smoogipooo 3174b56e28 Add license headers. 2017-03-03 13:17:24 +09:00
smoogipooo 959a3d49be Post-merge fixes. 2017-03-03 13:17:16 +09:00