|
|
f068f7c4bd
|
No footer in EditSongSelect.
|
2017-03-14 21:51:26 +08:00 |
|
|
|
259d39c6ad
|
Stop playing the track in editor
to avoid unused member warning
|
2017-03-14 21:28:33 +08:00 |
|
|
|
f97e8ae97f
|
Fix typo and warnings.
|
2017-03-14 21:20:38 +08:00 |
|
|
|
c939897a8a
|
Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
|
2017-03-14 21:13:57 +08:00 |
|
|
|
8176b4ef77
|
Fix merge errors.
|
2017-03-14 22:11:38 +09:00 |
|
|
|
12326f610e
|
Adjust transition to flyte's liking.
|
2017-03-14 22:11:29 +09:00 |
|
|
|
2e8b1ad390
|
Woops
|
2017-03-14 10:09:58 -03:00 |
|
|
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -03:00 |
|
|
|
d53f219051
|
Adjusted score rank size
|
2017-03-14 10:04:42 -03:00 |
|
|
|
e1cc74bb40
|
Merge branch 'master' into more-songselect
|
2017-03-14 20:50:53 +08:00 |
|
|
|
beb0a8ff03
|
Auto assign hotkeys for BeatmapOptionsButton.
|
2017-03-14 20:50:43 +08:00 |
|
|
|
35a60a8f7d
|
Use depth to arrange buttons.
|
2017-03-14 20:19:05 +08:00 |
|
|
|
618e8e822b
|
Implement EditSongSelect and MatchSongSelect.
|
2017-03-14 19:53:20 +08:00 |
|
|
|
3871a350f8
|
Move BeatmapOptions buttons to derived class and simplify.
|
2017-03-14 19:38:21 +08:00 |
|
|
|
72e1612f32
|
Null-safety in the case where there are no HitObjects.
|
2017-03-14 19:44:14 +09:00 |
|
|
|
c4e5eac35b
|
Move footer stuff to derived.
|
2017-03-14 18:38:06 +08:00 |
|
|
|
c2d80936cf
|
More closely replicate osu!'s parsing code.
|
2017-03-14 19:25:04 +09:00 |
|
|
|
c315c8690b
|
Fix incorrect hit object type.
|
2017-03-14 19:24:47 +09:00 |
|
|
|
9a4247f67e
|
Make Footer handles hotkey.
|
2017-03-14 18:16:04 +08:00 |
|
|
|
069a7a24ce
|
Fix defaults not being set (keep in mind this will be changed in a later pullrequest).
|
2017-03-14 19:04:40 +09:00 |
|
|
|
785b970125
|
Add special interface for LegacyHold.
|
2017-03-14 18:49:22 +09:00 |
|
|
|
a1833fd6b0
|
Whoops, naming.
|
2017-03-14 18:49:01 +09:00 |
|
|
|
4c7f0fcb73
|
Fix unit tests.
|
2017-03-14 18:46:34 +09:00 |
|
|
|
ad9583a179
|
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
|
2017-03-14 18:06:50 +09:00 |
|
|
|
1f43370886
|
Fix failing unit test, move legacy hitobjects to Objects/Legacy/.
|
2017-03-14 18:06:32 +09:00 |
|
|
|
c3a0549cdd
|
Move player specific stuff to derived PlaySongSelect.
|
2017-03-14 16:58:34 +08:00 |
|
|
|
5c2bf02c9d
|
Merge branch 'master' into beatmap_parsing
|
2017-03-14 17:50:00 +09:00 |
|
|
|
d6ccc66b23
|
Attempt to fix nullref warning.
|
2017-03-14 17:46:35 +09:00 |
|
|
|
fae6afa9e3
|
Create basic SongSelect class.
|
2017-03-14 16:44:35 +08:00 |
|
|
|
0198593697
|
Make BeatmapInfoWedge:OverlayContainer and unify transforms.
|
2017-03-14 16:29:20 +08:00 |
|
|
|
2b3b3b7255
|
Fix license headers (sorry I have to do this as post-processing for now cos VS 2017...).
|
2017-03-14 17:07:38 +09:00 |
|
|
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +09:00 |
|
|
|
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 |
|
|
|
1f68731a09
|
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
|
2017-03-14 16:00:35 +09:00 |
|
|
|
90ad2e9731
|
Remove unused interface.
|
2017-03-14 15:50:36 +09:00 |
|
|
|
e42c790df2
|
Refactorings.
|
2017-03-14 15:45:27 +09:00 |
|
|
|
e8d5cff790
|
Fix license headers.
|
2017-03-14 14:53:17 +09:00 |
|
|
|
072eea82ea
|
Fix up combo colours + a few nullrefs.
|
2017-03-14 14:50:12 +09:00 |
|
|
|
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 |
|
|
|
bbd81dbc47
|
Add license headers.
|
2017-03-14 13:02:42 +09:00 |
|
|
|
99c23d8715
|
I don't like this renaming.
|
2017-03-14 12:54:09 +09:00 |
|
|
|
db8cbba8d5
|
Okay resharper u da boss.
|
2017-03-14 12:52:12 +09:00 |
|
|
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
|
|
6ebd88060a
|
Simplify foreach.
|
2017-03-14 12:38:30 +09:00 |
|
|
|
bc5912eab5
|
Applyable -> Applicable.
|
2017-03-14 12:32:31 +09:00 |
|
|
|
0da950beac
|
Fix KeyCounter M1 M2 display.
|
2017-03-14 12:31:09 +09:00 |
|
|
|
1eacafc7b4
|
Merge branch 'master' into general-fixes
|
2017-03-14 12:02:24 +09:00 |
|
|
|
4fa037c0b2
|
Update framework.
|
2017-03-14 12:01:58 +09:00 |
|
|
|
ba10c3a8db
|
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
|
2017-03-14 11:46:34 +09:00 |
|
|
|
e1bd168c16
|
Remaining GameMode -> Screen.
|
2017-03-14 07:22:46 +08:00 |
|
