Dean Herbert
|
1156e76c28
|
Don't directly access Header.
|
2017-03-16 17:00:49 +09:00 |
|
Dean Herbert
|
bd5493fb25
|
Add back correct defaults.
|
2017-03-16 16:44:14 +09:00 |
|
Dean Herbert
|
334e389518
|
Tidy up OsuTabControl and FilterControl.
|
2017-03-16 16:35:44 +09:00 |
|
smoogipooo
|
d63b1a5cc5
|
Add target score computation functionality to ScoreProcessor.
|
2017-03-16 14:54:57 +09:00 |
|
Dean Herbert
|
4bedd4d2d7
|
Block input behind FilterControl.
|
2017-03-16 14:33:31 +09:00 |
|
Dean Herbert
|
da6b98db10
|
fixup! Filter doesn't need to be public, nor have a property.
|
2017-03-16 14:23:48 +09:00 |
|
Dean Herbert
|
269c1a5e5c
|
Reword some comments.
|
2017-03-16 14:08:37 +09:00 |
|
Dean Herbert
|
352de22590
|
Filter doesn't need to be public, nor have a property.
|
2017-03-16 14:08:29 +09:00 |
|
Dean Herbert
|
4d84bf7350
|
Change difficulty sort to be based on MaxStarDifficulty.
|
2017-03-16 13:59:23 +09:00 |
|
smoogipooo
|
7764474cfe
|
Fix possible nullref.
|
2017-03-16 13:49:16 +09:00 |
|
smoogipooo
|
2a2caeba32
|
Add better failing support to ScoreProcessor.
|
2017-03-16 13:39:57 +09:00 |
|
smoogipooo
|
5cafec3b6a
|
Add back CreateScoreProcessor to Ruleset to instantiate a non-generic ScoreProcessor for ScoreDatabase.
|
2017-03-16 13:13:45 +09:00 |
|
smoogipooo
|
7b66faab9e
|
Fix filename.
|
2017-03-16 12:59:09 +09:00 |
|
smoogipooo
|
82033faaab
|
Warning/error fixing.
|
2017-03-16 12:57:50 +09:00 |
|
smoogipooo
|
c82ae011fb
|
Make ScoreProcessors take generic judgements.
|
2017-03-16 12:45:23 +09:00 |
|
Drew DeVault
|
360340c61d
|
Fix linter issues
|
2017-03-15 22:39:09 -04:00 |
|
Drew DeVault
|
01cca1a4d2
|
Refactor color handling
colour*
|
2017-03-15 20:52:31 -04:00 |
|
Drew DeVault
|
db5a1e241a
|
Don't crash on unimplemented sorts
|
2017-03-15 20:18:20 -04:00 |
|
Drew DeVault
|
3aecbf5739
|
Rearrange things somewhat
|
2017-03-15 20:15:40 -04:00 |
|
Drew DeVault
|
cac6c42aac
|
Merge remote-tracking branch 'upstream/master' into tab-control
|
2017-03-15 20:15:28 -04:00 |
|
smoogipooo
|
418189effd
|
Adjust/improve a few comments.
|
2017-03-15 21:58:00 +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 |
|
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 |
|
Kelvin
|
4353c9dc3d
|
Fixed Warnings
|
2017-03-14 20:42:02 -07:00 |
|
Kelvin
|
18afd8eabe
|
Fixed license headers
|
2017-03-14 20:30:42 -07: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 |
|
Kelvin
|
20e2e7a8c8
|
Sort on SortTabs ValueChanged
|
2017-03-14 20:19:41 -07:00 |
|
Kelvin
|
755fb260db
|
Updated TabControl Usage
|
2017-03-14 19:52:21 -07:00 |
|
Kelvin
|
ee3d3b682f
|
Updated usage for DropDownHeader of FilterTabControl
|
2017-03-14 19:49:40 -07:00 |
|
Kelvin
|
40bcc63a90
|
Added and styled FilterTabControls
|
2017-03-14 19:49:40 -07:00 |
|
Kelvin
|
2629f78afc
|
Add FilterControl and FilterTabControl
|
2017-03-14 19:49:40 -07: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
|
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 |
|
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 |
|
smoogipooo
|
72e1612f32
|
Null-safety in the case where there are no HitObjects.
|
2017-03-14 19:44:14 +09:00 |
|
Huo Yaoyuan
|
c4e5eac35b
|
Move footer stuff to derived.
|
2017-03-14 18:38:06 +08:00 |
|
smoogipooo
|
c2d80936cf
|
More closely replicate osu!'s parsing code.
|
2017-03-14 19:25:04 +09:00 |
|
smoogipooo
|
c315c8690b
|
Fix incorrect hit object type.
|
2017-03-14 19:24:47 +09:00 |
|
Huo Yaoyuan
|
9a4247f67e
|
Make Footer handles hotkey.
|
2017-03-14 18:16:04 +08:00 |
|
smoogipooo
|
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 |
|
smoogipooo
|
785b970125
|
Add special interface for LegacyHold.
|
2017-03-14 18:49:22 +09:00 |
|
smoogipooo
|
a1833fd6b0
|
Whoops, naming.
|
2017-03-14 18:49:01 +09:00 |
|
smoogipooo
|
4c7f0fcb73
|
Fix unit tests.
|
2017-03-14 18:46:34 +09:00 |
|
smoogipooo
|
ad9583a179
|
Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing
|
2017-03-14 18:06:50 +09:00 |
|
smoogipooo
|
1f43370886
|
Fix failing unit test, move legacy hitobjects to Objects/Legacy/.
|
2017-03-14 18:06:32 +09:00 |
|
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 |
|
smoogipooo
|
d6ccc66b23
|
Attempt to fix nullref warning.
|
2017-03-14 17:46:35 +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 |
|
smoogipooo
|
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 |
|
smoogipooo
|
7141bc86d3
|
Rework beatmap post-processing into HitRenderer.
|
2017-03-14 17:01:21 +09: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
|
90ad2e9731
|
Remove unused interface.
|
2017-03-14 15:50:36 +09:00 |
|
smoogipooo
|
e42c790df2
|
Refactorings.
|
2017-03-14 15:45:27 +09:00 |
|
smoogipooo
|
e8d5cff790
|
Fix license headers.
|
2017-03-14 14:53:17 +09:00 |
|
smoogipooo
|
072eea82ea
|
Fix up combo colours + a few nullrefs.
|
2017-03-14 14:50:12 +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 |
|
smoogipooo
|
bbd81dbc47
|
Add license headers.
|
2017-03-14 13:02:42 +09:00 |
|
smoogipooo
|
99c23d8715
|
I don't like this renaming.
|
2017-03-14 12:54:09 +09:00 |
|
smoogipooo
|
db8cbba8d5
|
Okay resharper u da boss.
|
2017-03-14 12:52:12 +09:00 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
smoogipooo
|
6ebd88060a
|
Simplify foreach.
|
2017-03-14 12:38:30 +09:00 |
|
smoogipooo
|
bc5912eab5
|
Applyable -> Applicable.
|
2017-03-14 12:32:31 +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 |
|
Dean Herbert
|
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 |
|
Huo Yaoyuan
|
e1bd168c16
|
Remaining GameMode -> Screen.
|
2017-03-14 07:22:46 +08: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 |
|
Huo Yaoyuan
|
db104d04d3
|
Use AutoGenerateBindingRedirects instead of explicit app.config.
|
2017-03-14 03:20:33 +08:00 |
|