Dean Herbert
|
a7ba6bbcfe
|
Merge pull request #489 from smoogipooo/generic_judgements_2
Generic judgements part 1/?
|
2017-03-15 22:13:38 +09:00 |
|
Dean Herbert
|
2e8ffd9cb7
|
Merge branch 'master' into generic_judgements_2
|
2017-03-15 22:09:33 +09:00 |
|
smoogipooo
|
418189effd
|
Adjust/improve a few comments.
|
2017-03-15 21:58:00 +09:00 |
|
smoogipooo
|
afefde7ecf
|
Remove old comments.
|
2017-03-15 21:53:01 +09:00 |
|
Dean Herbert
|
0ec166f701
|
Remove broken dependency.
|
2017-03-15 21:50:28 +09:00 |
|
smoogipooo
|
0a24a30b1d
|
Use DrawableOsuHitObject instead.
|
2017-03-15 21:48:01 +09:00 |
|
smoogipooo
|
4de3dde44d
|
Fix post-merge error.
|
2017-03-15 21:40:19 +09:00 |
|
smoogipooo
|
42da0f1a72
|
Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
osu.Game/Modes/UI/HitRenderer.cs
osu.Game/osu.Game.csproj
|
2017-03-15 21:36:43 +09:00 |
|
smoogipooo
|
3a8d1d3619
|
Add license headers.
|
2017-03-15 21:32:47 +09:00 |
|
Dean Herbert
|
b5edcf864b
|
Update framework.
|
2017-03-15 21:10:00 +09:00 |
|
Dean Herbert
|
ae645f85d6
|
Merge pull request #473 from smoogipooo/beatmap_parsing
Rework/rewrite beatmap parsing to parse to base hit objects, which mo…
|
2017-03-15 21:08:50 +09:00 |
|
smoogipooo
|
0f4df0566b
|
HasSpecial -> HasHold.
|
2017-03-15 19:43:38 +09:00 |
|
smoogipooo
|
c24d98cd11
|
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
|
2017-03-15 19:40:12 +09:00 |
|
smoogipooo
|
76c0a4d836
|
HitObjectType -> LegacyHitObjectType, move to Legacy namespace.
|
2017-03-15 19:39:40 +09:00 |
|
Dan Balasescu
|
a3906820ec
|
Merge branch 'master' into beatmap_parsing
|
2017-03-15 19:29:45 +09:00 |
|
smoogipooo
|
e0e0a2726d
|
Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo.
|
2017-03-15 19:23:42 +09:00 |
|
smoogipooo
|
a9bc253b8c
|
General refactoring (no more casts :D).
|
2017-03-15 19:18:23 +09:00 |
|
smoogipooo
|
36e8618370
|
Make DrawableHitObjects have generic JudgementInfos.
|
2017-03-15 18:55:38 +09:00 |
|
smoogipooo
|
1c87d998a6
|
Rename HitObjectType -> TObject.
|
2017-03-15 16:29:14 +09:00 |
|
smoogipooo
|
bf66b84ff8
|
Move a few classes/enums into separate files.
|
2017-03-15 16:07:40 +09:00 |
|
smoogipooo
|
ae7547bbda
|
Fix up distance -> positional length comments.
|
2017-03-15 12:59:19 +09:00 |
|
smoogipooo
|
41f912836a
|
Refactorings.
|
2017-03-15 12:57:17 +09:00 |
|
smoogipooo
|
6a31219781
|
Add further abstraction to Sliders/IHasCurve.
|
2017-03-15 12:52:25 +09:00 |
|
smoogipooo
|
9fdeff3f9e
|
Make interfaces inherit other interfaces for now.
|
2017-03-15 12:30:31 +09:00 |
|
smoogipooo
|
808f9fccca
|
Add comment to IHasSpecial.
|
2017-03-15 12:29:54 +09:00 |
|
Dean Herbert
|
1317198628
|
Merge pull request #482 from huoyaoyuan/more-songselect
More SongSelect
|
2017-03-15 11:28:21 +09:00 |
|
Dean Herbert
|
2e71869951
|
Merge branch 'master' into beatmap_parsing
|
2017-03-15 11:26:47 +09:00 |
|
Dean Herbert
|
e008574697
|
Merge branch 'master' into more-songselect
|
2017-03-15 11:24:14 +09:00 |
|
Huo Yaoyuan
|
37ff1f3971
|
Control footer by virtual property.
|
2017-03-15 10:10:59 +08:00 |
|
Dean Herbert
|
c35977584a
|
Merge pull request #484 from peppy/general-fixes
Update framework.
|
2017-03-15 10:47:56 +09:00 |
|
Dean Herbert
|
b5a8ef07fe
|
Update framework.
|
2017-03-15 09:46:03 +09:00 |
|
Huo Yaoyuan
|
8c991eae01
|
Fix CI issues.
|
2017-03-14 22:27:24 +08:00 |
|
Huo Yaoyuan
|
a8d15e616b
|
Remove parameter of OnSelected.
|
2017-03-14 22:22:23 +08:00 |
|
Huo Yaoyuan
|
b2dd9afcf3
|
Update editor workflow and make edit button works.
|
2017-03-14 22:18:40 +08:00 |
|
Huo Yaoyuan
|
f068f7c4bd
|
No footer in EditSongSelect.
|
2017-03-14 21:51:26 +08:00 |
|
Huo Yaoyuan
|
259d39c6ad
|
Stop playing the track in editor
to avoid unused member warning
|
2017-03-14 21:28:33 +08:00 |
|
Huo Yaoyuan
|
f97e8ae97f
|
Fix typo and warnings.
|
2017-03-14 21:20:38 +08:00 |
|
Huo Yaoyuan
|
c939897a8a
|
Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
|
2017-03-14 21:13:57 +08:00 |
|
Huo Yaoyuan
|
e1cc74bb40
|
Merge branch 'master' into more-songselect
|
2017-03-14 20:50:53 +08:00 |
|
Huo Yaoyuan
|
beb0a8ff03
|
Auto assign hotkeys for BeatmapOptionsButton.
|
2017-03-14 20:50:43 +08:00 |
|
smoogipooo
|
5b58daa23d
|
Add check for no combo colours.
|
2017-03-14 21:47:31 +09:00 |
|
Huo Yaoyuan
|
35a60a8f7d
|
Use depth to arrange buttons.
|
2017-03-14 20:19:05 +08:00 |
|
Huo Yaoyuan
|
618e8e822b
|
Implement EditSongSelect and MatchSongSelect.
|
2017-03-14 19:53:20 +08:00 |
|
Huo Yaoyuan
|
3871a350f8
|
Move BeatmapOptions buttons to derived class and simplify.
|
2017-03-14 19:38:21 +08:00 |
|
Dean Herbert
|
10ab015501
|
Fix typo.
|
2017-03-14 20:23:58 +09:00 |
|
Dean Herbert
|
864a97fa45
|
Output StandardError when an error occurs with a command line invocation.
|
2017-03-14 20:23:53 +09:00 |
|
Dean Herbert
|
1699c9fb1d
|
Don't download executables when pulling down existing assets.
|
2017-03-14 20:23:37 +09:00 |
|
Dean Herbert
|
c192de9ebd
|
Give deploy uploads more time before dying.
|
2017-03-14 20:23:23 +09:00 |
|
Dean Herbert
|
31c41e3e14
|
Don't overwrite newer config files (doesn't seem to fix anything buut..).
|
2017-03-14 20:23:07 +09:00 |
|
smoogipooo
|
72e1612f32
|
Null-safety in the case where there are no HitObjects.
|
2017-03-14 19:44:14 +09:00 |
|