h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 06:42:54 +08:00
Code Issues Releases Wiki Activity
2,596 Commits 3 Branches 661 Tags 357 MiB
33d70b9bbc
Commit Graph

1863 Commits

Author SHA1 Message Date
smoogipooo
4015b87965 General fixes. 2017-03-10 13:09:50 +09:00
smoogipooo
444c645da0 General fixes. 2017-03-10 13:02:50 +09:00
smoogipooo
4cc032e1d7 Make ComboCounter count a bindable, and properly bind it to the processor. 2017-03-10 12:55:10 +09:00
smoogipooo
617ceb8001 Rename to StandardComboCounter, add HealthDisplay abstraction. 2017-03-10 12:47:00 +09:00
smoogipooo
31f6cbd8cf Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets. 2017-03-10 12:14:13 +09:00
Jorolf
9dd835e256 didn't see this was unnecessary after my changes 2017-03-09 21:43:11 +01:00
Jorolf
d9a4a677fd Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Lahvuun
427a0dd0f5 Options sidebar flickering fix. 2017-03-09 22:29:39 +02:00
Alex Amadori
faecaa297a Fix warnings 2017-03-09 21:07:21 +01:00
Alex Amadori
c60353faf7 Merge branch 'archive-reader' of https://github.com/tacchinotacchi/osu into archive-reader 2017-03-09 17:07:37 +01:00
Alex Amadori
7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Huo Yaoyuan
9007409072 Follow appveyor's code style check. 2017-03-09 16:44:45 +08:00
Dean Herbert
115ebd4773 Merge branch 'master' into modselect 2017-03-09 17:31:25 +09:00
Huo Yaoyuan
1b182b1361 Fix typo. 2017-03-09 15:55:40 +08:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert
1b532b0741
Fix second mono regression. 2017-03-09 15:53:16 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
a048e666d7
Fix autoproperty which doesn't work on mono. 2017-03-09 14:26:09 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
01c379da19
User invariant culture sorting. 2017-03-09 14:02:20 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected. 2017-03-09 14:01:08 +09:00
Dean Herbert
0976e205d8
Remove redundant parentheses. 2017-03-09 14:00:17 +09:00
Dean Herbert
dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Dean Herbert
9772f2a042
Update framework. 2017-03-09 13:50:33 +09:00
Dean Herbert
0c4c1689b6 Merge branch 'master' into modselect 2017-03-09 12:51:40 +09:00
Alex Amadori
9f40a888ec Update BeatmapArchiveReader's test 2017-03-08 21:55:38 +01:00
Alex Amadori
1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert
2821451d5b
Remove unused file. 2017-03-08 16:01:54 +09:00
Dean Herbert
5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Dean Herbert
123c8f3489
Add comment. 2017-03-08 11:54:52 +09:00
Huo Yaoyuan
b19405c987 Allow null in mod list to generate a placeholder ModButton. 2017-03-07 19:52:51 +08:00
Dean Herbert
02cab41d34
Move InputManager to a higher and more implicit level. 
Also makes KeyCounterCollection work with replays.
 2017-03-07 19:30:48 +09:00
Huo Yaoyuan
ffd79bee06 Remove inherited mods in incompatible list and add between Auto and NoFail. 2017-03-07 16:27:55 +08:00
Huo Yaoyuan
8979b28496 Remove usages of the 'new' keyword. 2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b Merge branch 'master' into modselect 2017-03-07 16:10:53 +08:00
Alex Amadori
2c7a9d2f77 Remove unnecessary using 2017-03-07 08:47:50 +01:00
Alex Amadori
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert
1fb846e61d
Make playfield scaling optional. 2017-03-07 15:49:04 +09:00
Dean Herbert
bff1179624
Merge branch 'master' into replay 
# Conflicts:
#	osu.Game/Modes/Mod.cs
 2017-03-07 14:32:14 +09:00
Dean Herbert
5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections. 2017-03-07 13:52:47 +09:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
 2017-03-07 13:50:08 +09:00
Dean Herbert
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum 
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
 2017-03-07 13:42:50 +09:00
Dean Herbert
1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
12c316aba4 Fix int truncation. 2017-03-07 11:29:55 +09:00
Dean Herbert
9106c45858
Fix remaining errors. 2017-03-07 10:42:59 +09:00
Dean Herbert
39ff68a812 Add missing IncompatibleMods. 2017-03-07 09:16:47 +09:00
Alex Amadori
aee7b05bae ArchiveManager decoupling 2017-03-07 00:10:33 +01:00
Alex Amadori
fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
Thomas Müller
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
Thomas Müller
6e9c4a4251 Merge branch 'master' into options-footer 2017-03-06 20:01:51 +01:00
Thomas Müller
9fd16be2d4 Refactor IsDebug 2017-03-06 19:59:29 +01:00
Huo Yaoyuan
27edc9971e Update deselect logic. 
Change to DeselectTypes to avoid enumerating children for multi times.
 2017-03-07 01:15:21 +08:00
Huo Yaoyuan
eda7e1b26f Fix and update mode changing handling. 2017-03-07 01:01:42 +08:00
Huo Yaoyuan
5cd859ecf1 Fix missed color during loading. 2017-03-07 00:46:36 +08:00
Huo Yaoyuan
836484ba51 Add abstract ModType for ModSection. 2017-03-07 00:32:22 +08:00
Huo Yaoyuan
318ab68af1 Use Bindable<IEnumerable<Mod>> to fit other changes. 2017-03-07 00:17:06 +08:00
Huo Yaoyuan
59d1fdb032 Simplify ModSection. 2017-03-07 00:12:06 +08:00
Dean Herbert
57cbecba83
Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554). 2017-03-06 22:08:02 +09:00
Dean Herbert
dcc7386609
Add option toggle for debug cached setting. 2017-03-06 22:07:46 +09:00
Huo Yaoyuan
564b3f0706 Refactor icon management of ModButton. 2017-03-06 19:03:26 +08:00
Dean Herbert
f5c27d99a4
Add error handling to import process (resolves await warning). 2017-03-06 19:59:40 +09:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
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
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
smoogipooo
26b81a14cf Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it. 2017-03-03 12:42:19 +09:00
smoogipooo
062d8ddc7c Don't handle menu buttons when Shift or Ctrl or Alt is pressed. 2017-03-03 12:41:45 +09:00
John Leuenhagen
417c7e341a
Password textbox now performs login on enter 2017-03-02 22:41:14 -05:00
smoogipooo
febdfd5de4 Make groups fill up in round robin way, rather than sequentially. 2017-03-03 12:06:35 +09:00
Dean Herbert
78a0bce3bb Merge pull request #423 from peppy/general-fixes 
Move PauseOverlay to correct namespace.
 2017-03-03 11:32:42 +09:00
Dean Herbert
70f046092c Merge pull request #424 from DrabWeb/namespace-fix 
Fix BeatmapDeleteDialog namespace
 2017-03-03 11:32:35 +09:00
Huo Yaoyuan
ef13cdbff7 Disallow copying from OsuPasswordTextBox. 2017-03-03 10:00:39 +08:00
DrabWeb
f872330902 Fix BeatmapDeleteDialog namespace 2017-03-02 21:28:05 -04:00
DrabWeb
7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
Dean Herbert
3a8246f56d
Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09:00
Dean Herbert
f81836f635
Merge remote-tracking branch 'upstream/master' into no-negative-margin 2017-03-03 09:58:40 +09:00
Thomas Müller
c732890664 Remove usages of negative Margin / Padding 
Replaces such usage with more sensible settings, like changing the
position or size.
 2017-03-02 19:16:31 +01:00
Mikal Stodal
c88c6c4c62 More summaries 2017-03-02 15:37:45 +01:00
Dean Herbert
ecd3453774
Fix potential nullref. 2017-03-02 22:17:14 +09:00
Mikal Stodal
dfa21444b4 Ensure correct exception logged 2017-03-02 14:10:32 +01:00
DrabWeb
fcda2f0e4e Fixed shadow 2017-03-02 09:05:10 -04:00
Dean Herbert
f9b87ad08c
Fix selection on entry to song select. 
Also only shows sets with beatmaps for current play mode.
 2017-03-02 22:02:32 +09:00
Dean Herbert
9ea83230aa
Formatting fixes. 2017-03-02 22:01:53 +09:00
Dean Herbert
ef8a35f5cc
Fix Toolbar's mode changer not working correctly. 2017-03-02 22:01:24 +09:00
DrabWeb
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00
Mikal Stodal
2498305174 Merged branch master into remove-source-on-import 2017-03-02 13:39:22 +01:00
Mikal Stodal
47162a3e91 Update summary and commentary 2017-03-02 13:39:02 +01:00
Mikal Stodal
6661195e92 Only add set if ID is 0 2017-03-02 13:36:01 +01:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode. 2017-03-02 21:16:58 +09:00
Dean Herbert
ab91333b21
Replace missing perfect icon with cross. 2017-03-02 20:29:48 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
 2017-03-02 20:27:04 +09:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
Dean Herbert
68a359698d
Fix potential nullref caused by test data. 2017-03-02 18:35:24 +09:00
Dean Herbert
51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
Dean Herbert
963117f07d
Fix incorrect event order. 2017-03-02 17:41:33 +09:00
Dean Herbert
68857b573d
More code tidying. 2017-03-02 17:14:05 +09:00
Dean Herbert
c4871bbbf3
Tidy up code. 
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
 2017-03-02 17:08:00 +09:00
Dean Herbert
d1cd077e0d
Post-merge fixes. 2017-03-02 16:54:55 +09:00
Dean Herbert
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
Dean Herbert
c4ca18eeba
Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
Dean Herbert
8040d6a03f
Fix CursorTrail corruption by resetting on load. 2017-03-02 16:08:10 +09:00
DrabWeb
482be9f451 Remove AvailableMods 2017-03-02 02:04:26 -04:00
DrabWeb
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
DrabWeb
37ed1b3d09 Moved key press select mods to ModSection 2017-03-02 01:24:32 -04:00
DrabWeb
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
smoogipooo
b0d5d88fe9 Fix slight threading scheduling issue. 2017-03-02 12:26:42 +09:00
smoogipooo
1a4f0a92a5 Add saving + reloading (to/from drawings_results.txt) functionality. 2017-03-02 12:20:31 +09:00
DrabWeb
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
DrabWeb
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -04:00
DrabWeb
befdf68abe Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once 2017-03-01 18:41:00 -04:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
 2017-03-01 18:05:58 +01:00
Mikal Stodal
418ae24fea Document private method getBeatmapSet(path) 2017-03-01 17:57:57 +01:00
Mikal Stodal
1e901a1604 Only set StoryBoardFile once 2017-03-01 17:08:12 +01:00
Dean Herbert
b6e7e054c3
wankoz 2017-03-01 22:56:20 +09:00
Dean Herbert
58ae9e888d
Basic partial replay support. 2017-03-01 22:04:20 +09:00
Andrey Zavadskiy
a6504e8f22 Triggering fix 2017-03-01 13:36:53 +03:00
smoogipooo
35d246b59d Merge remote-tracking branch 'origin/master' into tournament_drawings 2017-03-01 19:32:33 +09:00
Andrey Zavadskiy
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00
Dean Herbert
327300e9a7 Merge pull request #408 from Jorolf/pluginManager 
Disable mousewheel while playing
 2017-03-01 13:10:47 +09:00
DrabWeb
d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
Jorolf
61cbcfd597 Merge branch 'master' into pluginManager 2017-02-28 20:34:56 +01:00
Thomas Müller
e462ec46c3 Merge branch 'master' into general-fixes 2017-02-28 19:02:07 +01:00
Thomas Müller
585d42f89f Improve naming and correctness of triangles fading 2017-02-28 19:01:02 +01:00
Mikal Stodal
eff66a1da6 Only delete on successful import. 2017-02-28 14:46:16 +01:00
Mikal Stodal
d54a75a5c5 Delete file after importing BeatmapSet w/error handling, 
also changed batch-commit of multiple sets to database.
 2017-02-28 14:35:42 +01:00
Jorolf
522034020e Moved Bindable init 2017-02-28 11:44:12 +01:00
DrabWeb
c3a81127f2 Updated to work with latest framework 2017-02-28 02:25:38 -04:00
DrabWeb
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
Dean Herbert
654859a2a1
Restore potentially breaking change. 2017-02-28 13:56:35 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
DrabWeb
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
DrabWeb
bc7fd3bd39 Remove uneccesary cast, move enter OK button to one liner 2017-02-27 22:38:44 -04:00
DrabWeb
94f34b985b Forgot returns 2017-02-27 22:32:30 -04:00
DrabWeb
0ce8fff666 Enter key presses first OK button, 1-9 presses button at number 2017-02-27 22:31:23 -04:00
Dean Herbert
aa9582c0fa
Add exponential fall-off of triangles' alpha values. 2017-02-28 11:28:25 +09:00
DrabWeb
e8cae3b45e Remove new override in DialogButton 2017-02-27 21:38:25 -04:00
DrabWeb
164f205ee5 Remove SpaceTextOnHover 2017-02-27 21:30:10 -04:00
smoogipooo
1e15318da6 Add background. 2017-02-28 10:26:37 +09:00
DrabWeb
b3a231185b Conform to naming conventions 2017-02-27 20:55:10 -04:00
DrabWeb
34ba3129a3 Removed background triangles 2017-02-27 20:44:27 -04:00