1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Commit Graph

1542 Commits

Author SHA1 Message Date
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
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
Dan Balasescu
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
smoogipooo
efb13b29d1 General cleanups. 2017-03-03 13:01:57 +09:00
smoogipooo
d0894bbc9b Use storage instead of raw file access. 2017-03-03 12:59:58 +09:00
smoogipooo
b7b36b6306 Unused. 2017-03-03 12:59:31 +09:00
smoogipooo
d6c1f82105 Make visualiser lines have no separation. 2017-03-03 12:59:19 +09:00
smoogipooo
d222c523a1 Exit drawings if no drawings.txt file. 2017-03-03 12:43:48 +09:00