Huo Yaoyuan
|
c3a0549cdd
|
Move player specific stuff to derived PlaySongSelect.
|
2017-03-14 16:58:34 +08:00 |
|
Dean Herbert
|
5c2bf02c9d
|
Merge branch 'master' into beatmap_parsing
|
2017-03-14 17:50:00 +09:00 |
|
Huo Yaoyuan
|
fae6afa9e3
|
Create basic SongSelect class.
|
2017-03-14 16:44:35 +08:00 |
|
Huo Yaoyuan
|
0198593697
|
Make BeatmapInfoWedge:OverlayContainer and unify transforms.
|
2017-03-14 16:29:20 +08:00 |
|
Dean Herbert
|
14b22445fa
|
Merge remote-tracking branch 'upstream/master' into general-fixes
# Conflicts:
# osu.Game/Modes/UI/HitRenderer.cs
|
2017-03-14 16:15:26 +09:00 |
|
Dean Herbert
|
1f68731a09
|
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
|
2017-03-14 16:00:35 +09:00 |
|
smoogipooo
|
854212a7aa
|
Merge branch 'master' into beatmap_parsing
Conflicts:
osu.Desktop.VisualTests/app.config
osu.Game.Modes.Catch/CatchRuleset.cs
osu.Game.Modes.Mania/ManiaRuleset.cs
osu.Game.Modes.Mania/app.config
osu.Game.Modes.Osu/OsuRuleset.cs
osu.Game.Modes.Osu/app.config
osu.Game.Modes.Taiko/TaikoRuleset.cs
osu.Game/Modes/Ruleset.cs
osu.Game/app.config
osu.Game/osu.Game.csproj
|
2017-03-14 13:39:19 +09:00 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
Dean Herbert
|
0da950beac
|
Fix KeyCounter M1 M2 display.
|
2017-03-14 12:31:09 +09:00 |
|
Dean Herbert
|
1eacafc7b4
|
Merge branch 'master' into general-fixes
|
2017-03-14 12:02:24 +09:00 |
|
Dean Herbert
|
4fa037c0b2
|
Update framework.
|
2017-03-14 12:01:58 +09:00 |
|
Huo Yaoyuan
|
3913a0a9ee
|
Fix removal of the last one beatmap.
|
2017-03-14 05:35:58 +08:00 |
|
Huo Yaoyuan
|
14a22f032f
|
Fix beatmap panel removal.
|
2017-03-14 04:35:43 +08:00 |
|
smoogipooo
|
f50e0bbf3c
|
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
|
2017-03-13 19:15:25 +09:00 |
|
smoogipooo
|
c0e29652a6
|
Initial attempt at making mods apply better.
|
2017-03-12 22:13:43 +09:00 |
|
smoogipooo
|
64aab090d5
|
Instantiate HitRenderer with WorkingBeatmap.
|
2017-03-12 18:03:13 +09:00 |
|
smoogipooo
|
529cabb001
|
Make HudOverlay not dependent on Ruleset.
|
2017-03-10 16:16:07 +09:00 |
|
smoogipooo
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +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 |
|
Dean Herbert
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +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
|
9772f2a042
|
Update framework.
|
2017-03-09 13:50:33 +09:00 |
|
Dean Herbert
|
5a42035f88
|
Update license headers.
|
2017-03-08 15:50:52 +09: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 |
|
Dean Herbert
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +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
|
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 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01: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
|
88f3dc0e02
|
Fix a few naming issues.
|
2017-03-06 18:49:23 +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
|
e356758a7d
|
Don't expicitly set origin of TextAwesome.
|
2017-03-06 17:06:48 +09:00 |
|
Dean Herbert
|
76ef8c1a6c
|
Add bindable mods and autoplay support.
|
2017-03-06 14:52:37 +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
|
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
|
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 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01: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 |
|
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 |
|
Jorolf
|
b9e4c920c5
|
SelectRandom doesnt select hidden groups now
|
2017-03-03 21:11:38 +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
|
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 |
|
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
|
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 |
|