Dean Herbert
|
681ed38941
|
Use const whenever possible.
|
2017-03-23 13:52:38 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
DrabWeb
|
b8b45262c5
|
Formatting
|
2017-03-23 01:35:55 -03:00 |
|
DrabWeb
|
67421cdf1c
|
Even though it was 5 minutes ago what was I thinking
|
2017-03-23 01:34:06 -03:00 |
|
DrabWeb
|
677b8afc1f
|
Integration
|
2017-03-23 01:19:29 -03:00 |
|
DrabWeb
|
87b8015e8f
|
Cleanup
|
2017-03-23 00:29:28 -03:00 |
|
DrabWeb
|
c173c4b7ee
|
Tab control
|
2017-03-23 00:22:31 -03:00 |
|
Dean Herbert
|
f3486b7288
|
Add correct lifetime expiry for leaderboard content
|
2017-03-22 09:07:02 +09:00 |
|
Dean Herbert
|
7387dbd9fc
|
Tidy up LeaderboardScore
|
2017-03-22 09:04:33 +09:00 |
|
Dean Herbert
|
1699daaf7f
|
Make DrawableRank safer.
|
2017-03-22 08:32:28 +09:00 |
|
Dean Herbert
|
8983bbcaad
|
Merge branch 'master' into leaderboards
|
2017-03-22 08:24:49 +09:00 |
|
smoogipooo
|
d27f37beb5
|
Hard-code text size in cases it wasn't set.
|
2017-03-20 13:48:06 +09:00 |
|
Dean Herbert
|
09bf014ded
|
Simplify fade out gradient code.
|
2017-03-19 21:49:29 +09:00 |
|
Dean Herbert
|
5d0adc6454
|
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
|
2017-03-19 18:51:53 +09:00 |
|
Dean Herbert
|
256a3268ac
|
Inline single usage of EdgeEffect.
|
2017-03-19 18:51:40 +09:00 |
|
Dean Herbert
|
8cb334a118
|
Adjust sizing a touch.
|
2017-03-19 16:34:29 +09:00 |
|
DrabWeb
|
b0e7296e25
|
-IHasDrawableRepresentation, User.Region -> Country
|
2017-03-19 00:09:58 -03:00 |
|
Dean Herbert
|
3d8ec4fa05
|
FIx transition not always being correct.
|
2017-03-19 02:33:25 +09:00 |
|
DrabWeb
|
0bc8ed9c9e
|
Use Colour for non-faded scores
|
2017-03-18 01:56:19 -03:00 |
|
DrabWeb
|
e78069af12
|
Parenthesis
|
2017-03-18 01:48:29 -03:00 |
|
DrabWeb
|
b9d5ab5d8c
|
Only calculate fade for fading leaderboard scores
|
2017-03-18 01:44:05 -03:00 |
|
DrabWeb
|
fbb8e79f1a
|
Move ctor above methods
|
2017-03-17 19:45:51 -03:00 |
|
DrabWeb
|
137611ecf3
|
Use LeaderboardScore height for fade
|
2017-03-17 19:07:45 -03:00 |
|
DrabWeb
|
82c02fa1fc
|
Formatting
|
2017-03-17 18:29:55 -03:00 |
|
Seth
|
4aea06be22
|
Merge branch 'master' into leaderboards
|
2017-03-17 18:23:01 -03:00 |
|
DrabWeb
|
27ab8e2e86
|
Merge
|
2017-03-17 18:21:35 -03:00 |
|
DrabWeb
|
0834b5b794
|
Made requested changes
|
2017-03-17 18:16:59 -03:00 |
|
smoogipooo
|
bcaf12e3d9
|
Rename Criteria -> CreateCriteria and make into method.
|
2017-03-18 02:11:14 +09:00 |
|
Dean Herbert
|
3e3cde01ef
|
Fix missing permitNulls.
|
2017-03-17 21:21:16 +09:00 |
|
Dean Herbert
|
0a03bdc428
|
Add missing license header.
|
2017-03-17 20:44:02 +09:00 |
|
Dean Herbert
|
c7fa79b027
|
Fix nullref.
|
2017-03-17 20:09:23 +09:00 |
|
Dean Herbert
|
907236e475
|
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.
|
2017-03-17 19:54:51 +09:00 |
|
Dean Herbert
|
4b97304603
|
CarouselContainer -> BeatmapCarousel.
|
2017-03-17 19:12:54 +09:00 |
|
Dean Herbert
|
dc28f8c79e
|
Remove all external access to BeatmapGroup.
|
2017-03-17 19:12:15 +09:00 |
|
Dean Herbert
|
9c664e5b05
|
Reorganise song select methods to allow for more flexibility.
|
2017-03-17 11:52:54 +09:00 |
|
Dean Herbert
|
e78bcf8739
|
Update TabControl in line with framework changes.
|
2017-03-17 00:39:40 +09:00 |
|
Dean Herbert
|
60fc782e93
|
Merge branch 'master' into beatmap_timinginfo
|
2017-03-16 23:08:24 +09:00 |
|
Dean Herbert
|
110bdbd0c1
|
Make everything share DropDown implementations again. Remove unnecessary files.
|
2017-03-16 21:17:14 +09:00 |
|
Dean Herbert
|
ab8a5afdb9
|
AlwaysReceiveInput and InternalContains.
|
2017-03-16 17:38:36 +09:00 |
|
smoogipooo
|
5137338c7c
|
Replace List<ControlPoint> with TimingInfo in Beatmap.
|
2017-03-16 17:11:24 +09:00 |
|
Dean Herbert
|
e17f728282
|
Fix CI.
|
2017-03-16 17:04:03 +09:00 |
|
Dean Herbert
|
1a7c2eda5e
|
Size FilterControl relatively now that we can.
|
2017-03-16 17:01:02 +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 |
|
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 |
|
Dean Herbert
|
ff37d2da03
|
Index -> Rank + some formatting.
|
2017-03-16 13:15:06 +09:00 |
|
Dean Herbert
|
8e5d83b857
|
Isolate leaderboard retrieval code into its own method.
|
2017-03-16 12:56:59 +09:00 |
|
Dean Herbert
|
a22b34817c
|
Merge branch 'master' into leaderboards
|
2017-03-16 11:12:53 +09: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 |
|
DrabWeb
|
cf81467e13
|
Move fade start out of loop
|
2017-03-15 14:00:31 -03:00 |
|
DrabWeb
|
cd37ebdff2
|
Fading
|
2017-03-15 13:57:41 -03:00 |
|
DrabWeb
|
efd617dd34
|
Formatting
|
2017-03-15 08:53:36 -03:00 |
|
DrabWeb
|
20685d51cd
|
Adjust delays to start at 0
|
2017-03-15 08:51:07 -03:00 |
|
DrabWeb
|
847d485d5f
|
Remove schedules
|
2017-03-15 08:49:17 -03:00 |
|
DrabWeb
|
aea9a7b795
|
LeaderboardScore state, initial delay handled by leaderboard
|
2017-03-15 08:44:29 -03:00 |
|
DrabWeb
|
7572947214
|
Badge -> Team
|
2017-03-15 08:09:44 -03:00 |
|
Dan Balasescu
|
a3906820ec
|
Merge branch 'master' into beatmap_parsing
|
2017-03-15 19:29:45 +09:00 |
|
Dean Herbert
|
56868e3c06
|
Make a few more strings literals.
|
2017-03-15 19:21:55 +09:00 |
|
Dean Herbert
|
1855f48997
|
Add cancellation support for API requests.
|
2017-03-15 18:07:26 +09:00 |
|
Dean Herbert
|
295f821025
|
Add leaderboard to song select.
|
2017-03-15 17:11:08 +09:00 |
|
Dean Herbert
|
4f95378f27
|
Add fade out of previously displayed scores.
|
2017-03-15 17:10:54 +09:00 |
|
Dean Herbert
|
78efecb89d
|
Remove Alpha 0.001 hack.
|
2017-03-15 17:07:56 +09:00 |
|
Dean Herbert
|
775a86e798
|
Add null-checks and fallbacks to make display work with current API version.
|
2017-03-15 15:22:46 +09:00 |
|
Dean Herbert
|
1ae4c2dfbb
|
Remove a lot of customisation from Avatar (and add it in individual usages).
|
2017-03-15 15:22:28 +09:00 |
|
Dean Herbert
|
7bc0a1fdfe
|
Use fixed-width for score display.
|
2017-03-15 15:21:07 +09:00 |
|
Dean Herbert
|
dfc4bccbe0
|
Add some padding to leaderboard.
|
2017-03-15 14:42:56 +09:00 |
|
Dean Herbert
|
c1f56c7c0e
|
Scores should be enumerable.
|
2017-03-15 14:38:38 +09:00 |
|
Dean Herbert
|
15e713899d
|
Add a left content area to song select.
|
2017-03-15 14:34:19 +09:00 |
|
Dean Herbert
|
d96a78459d
|
Rename ScoreRanks to be in line with current API.
|
2017-03-15 13:55:29 +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 |
|
Dean Herbert
|
253bcebf51
|
Merge remote-tracking branch 'upstream/master' into leaderboards
# Conflicts:
# osu.Game/osu.Game.csproj
|
2017-03-15 12:23:34 +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 |
|
Huo Yaoyuan
|
37ff1f3971
|
Control footer by virtual property.
|
2017-03-15 10:10:59 +08:00 |
|
DrabWeb
|
09cb0d6bbc
|
Proper icons
|
2017-03-14 12:58:22 -03:00 |
|
DrabWeb
|
94c2734b09
|
More warnings
|
2017-03-14 12:15:19 -03:00 |
|
DrabWeb
|
55187a8380
|
Warnings, accuracy formatting
|
2017-03-14 11:55:19 -03:00 |
|
Huo Yaoyuan
|
8c991eae01
|
Fix CI issues.
|
2017-03-14 22:27:24 +08:00 |
|
DrabWeb
|
4c03b62a75
|
More usings
|
2017-03-14 11:23:48 -03: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 |
|
DrabWeb
|
ebe48b7c24
|
Removed D rank
|
2017-03-14 11:14:27 -03:00 |
|
DrabWeb
|
322446effe
|
-Unused usings
|
2017-03-14 11:11:23 -03:00 |
|
DrabWeb
|
650fc7563d
|
ScoreRank, Avatar to own files, +DrawableRank
|
2017-03-14 10:58:28 -03:00 |
|
Huo Yaoyuan
|
f068f7c4bd
|
No footer in EditSongSelect.
|
2017-03-14 21:51:26 +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 |
|
Dean Herbert
|
8176b4ef77
|
Fix merge errors.
|
2017-03-14 22:11:38 +09:00 |
|
Dean Herbert
|
12326f610e
|
Adjust transition to flyte's liking.
|
2017-03-14 22:11:29 +09:00 |
|
Seth
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -03:00 |
|
DrabWeb
|
d53f219051
|
Adjusted score rank size
|
2017-03-14 10:04:42 -03: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 |
|
Huo Yaoyuan
|
9a4247f67e
|
Make Footer handles hotkey.
|
2017-03-14 18:16:04 +08:00 |
|
Huo Yaoyuan
|
c3a0549cdd
|
Move player specific stuff to derived PlaySongSelect.
|
2017-03-14 16:58:34 +08: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
|
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 |
|
Huo Yaoyuan
|
3913a0a9ee
|
Fix removal of the last one beatmap.
|
2017-03-14 05:35:58 +08:00 |
|
DrabWeb
|
6bd9e3cac1
|
+Score ranks
|
2017-03-13 18:34:43 -03:00 |
|
Huo Yaoyuan
|
14a22f032f
|
Fix beatmap panel removal.
|
2017-03-14 04:35:43 +08:00 |
|
DrabWeb
|
8e90e05f23
|
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
|
2017-03-13 12:31:46 -03:00 |
|
DrabWeb
|
442a2c97db
|
Merge conflicts
|
2017-03-13 09:44:22 -03:00 |
|
DrabWeb
|
dbc8d513f9
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-13 09:36:16 -03:00 |
|
DrabWeb
|
9912f5f9e1
|
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
|
2017-03-13 09:33:25 -03: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 |
|
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
|
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
|
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
|
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
|
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 |
|
DrabWeb
|
5719c6656a
|
Update to work with latest framework
|
2017-03-04 22:38:01 -04:00 |
|
DrabWeb
|
9cde20ffc7
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-04 22:33:05 -04:00 |
|
DrabWeb
|
b02e413e56
|
Removed LeaderboardFade fully
|
2017-03-04 22:30:48 -04:00 |
|
DrabWeb
|
269c139d2a
|
Flags(redoing later), glowing text, proper Score and User usage
|
2017-03-04 22:29:52 -04: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 |
|
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 |
|
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 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
DrabWeb
|
d1bad34434
|
Enter animation, remove testing mod icons
|
2017-03-04 05:01:55 -04: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 |
|
DrabWeb
|
d6f53c8b77
|
Moved test data to visual test
|
2017-03-04 04:05:31 -04:00 |
|
Thomas Müller
|
a97a7f1024
|
No more custom lifetimelist in CarouselContainer
|
2017-03-04 08:54:14 +01:00 |
|
DrabWeb
|
a112b354f0
|
Basic implementation of score UI
|
2017-03-04 03:37:34 -04:00 |
|
Jorolf
|
b9e4c920c5
|
SelectRandom doesnt select hidden groups now
|
2017-03-03 21:11:38 +01: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 |
|
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 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04: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 |
|
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
|
ecd3453774
|
Fix potential nullref.
|
2017-03-02 22:17:14 +09: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 |
|
DrabWeb
|
b856fb5991
|
Implemented beatmap options overlay
|
2017-03-02 08:40:55 -04:00 |
|
Dean Herbert
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +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
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
Dean Herbert
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
DrabWeb
|
6c680825ed
|
ModSections in Ruleset, fixed toolbar play mode changed not firing
|
2017-03-01 22:05:52 -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 |
|
DrabWeb
|
d5d8352b62
|
Testing build
|
2017-02-28 17:09:31 -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 |
|
DrabWeb
|
fbd9523596
|
Added beatmap delete dialog
|
2017-02-27 23:19:28 -04:00 |
|
default0
|
03889e6ca6
|
Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
|
2017-02-27 16:55:55 +01:00 |
|
Dean Herbert
|
e8b027130f
|
Remove unused variable.
|
2017-02-27 23:17:21 +09:00 |
|
Alex Amadori
|
8b336156f0
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-27 14:55:44 +01:00 |
|
Dean Herbert
|
afdb95f4d5
|
Fix even more test regressions.
|
2017-02-27 20:39:04 +09:00 |
|
Dean Herbert
|
7c602a2af3
|
Update framework.
|
2017-02-27 15:55:57 +09:00 |
|
default0
|
8d91519d59
|
Update usage of FlowContainer and its subclasses
|
2017-02-26 21:32:43 +01:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Thomas Müller
|
f7d985fe18
|
Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
|
2017-02-24 19:36:17 +01:00 |
|
Alex Amadori
|
ace023f0c7
|
Refactor local vars named in a c-like fashion
|
2017-02-24 17:08:18 +01:00 |
|
Alex Amadori
|
90b0f035ad
|
Compute average of star ratings
|
2017-02-24 17:01:14 +01:00 |
|
Alex Amadori
|
51b6075210
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-24 16:54:37 +01:00 |
|
Alex Amadori
|
e2ae03e798
|
Merge with upstream/master
|
2017-02-24 16:54:27 +01:00 |
|
Dean Herbert
|
ea4639932c
|
Simplify event names.
|
2017-02-24 17:21:14 +09:00 |
|
Dean Herbert
|
d24403e58e
|
Remove unused using statement.
|
2017-02-24 17:20:00 +09:00 |
|
Dean Herbert
|
958bf54c31
|
Add safe deletion support.
|
2017-02-24 17:08:13 +09:00 |
|
Dean Herbert
|
6c3bda18b6
|
Add beatmap deletion support.
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
|
2017-02-24 14:37:54 +09:00 |
|
Dean Herbert
|
3a89348413
|
Centralise access to WorkingBeatmaps.
They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).
|
2017-02-24 13:43:21 +09:00 |
|
Dean Herbert
|
355bbb6324
|
SearchTextBox should not handle shift-delete.
|
2017-02-24 11:44:40 +09:00 |
|
Dean Herbert
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09:00 |
|
Thomas Müller
|
2689de0c0c
|
Update framework and add "Async" suffix to asynchronous methods
|
2017-02-23 22:32:10 +01:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
Seth
|
b4b88712ad
|
Merge branch 'master' into mod-overlay
|
2017-02-23 08:00:24 -04:00 |
|
Dean Herbert
|
6701cd9016
|
Merge branch 'master' into general-fixes
|
2017-02-23 17:04:53 +09:00 |
|
Dean Herbert
|
da2bfe6d3c
|
Framework updates.
|
2017-02-23 16:42:12 +09:00 |
|
DrabWeb
|
99f1f88c75
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-22 12:35:55 -04:00 |
|
Dean Herbert
|
aef0eb49a1
|
Add loading screen.
|
2017-02-22 21:53:59 +09:00 |
|
Alex Amadori
|
3d19199218
|
Fixed for star difficulty
|
2017-02-21 18:27:39 +01:00 |
|
Alex Amadori
|
6c161fb167
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-21 18:15:46 +01:00 |
|
Dean Herbert
|
afba4fbfad
|
Merge remote-tracking branch 'upstream/master' into chat-improvement
|
2017-02-21 15:46:28 +09:00 |
|
Thomas Müller
|
417f146386
|
Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
|
2017-02-19 17:41:51 +01:00 |
|
Dean Herbert
|
520e040396
|
Add FocusedTextBox abstraction.
|
2017-02-19 17:59:22 +09:00 |
|
Alex Amadori
|
21cf96ec10
|
More sorting rookie mistakes
|
2017-02-18 16:23:13 +01:00 |
|
Alex Amadori
|
f48c83b787
|
Fix silly sorting mistakes
|
2017-02-18 15:56:29 +01:00 |
|
Alex Amadori
|
d92382c1aa
|
Merge remote-tracking branch 'upstream/master'
|
2017-02-18 15:18:26 +01:00 |
|
Alex Amadori
|
6bbbbd8f96
|
Implemented sorting in TestCasePlaySong
|
2017-02-18 15:11:40 +01:00 |
|
DrabWeb
|
006fb5502d
|
ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select
|
2017-02-18 07:28:22 -04:00 |
|
Dean Herbert
|
32ce8cf723
|
Audio class renames in line with framework changes.
|
2017-02-18 17:35:04 +09:00 |
|
Alex Amadori
|
1cd93f79b3
|
General sorting improvements
|
2017-02-18 07:59:01 +01:00 |
|
Alex Amadori
|
6b3ecc28b8
|
Fixed BeatmapPanels disappearing
|
2017-02-17 23:32:14 +01:00 |
|
Alex Amadori
|
7dcbefd50f
|
Implemented basic sorting logic
|
2017-02-17 17:41:53 +01:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
DrabWeb
|
9fc3726925
|
ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly
|
2017-02-16 18:32:27 -04:00 |
|
DrabWeb
|
0a58fc62db
|
Added mod selection overlay
|
2017-02-16 16:05:03 -04:00 |
|
Dean Herbert
|
04346dbb92
|
Make osu! logo at song select correctly handle mouse focus.
|
2017-02-16 22:24:25 +09:00 |
|
Dean Herbert
|
67105e6dfd
|
Replace all usage of SpriteText with OsuSpriteText.
|
2017-02-15 21:37:43 +09:00 |
|
Dean Herbert
|
d570a6d308
|
Handle cases where HitObjects were not parsed.
|
2017-02-15 12:38:10 +09:00 |
|
Thomas Müller
|
aaaf7163e0
|
Update framework.
|
2017-02-13 17:46:50 +09:00 |
|
Dean Herbert
|
faa805e437
|
Fix SearchTextBox's handling of keyboard input to allow for IME input.
|
2017-02-09 12:33:24 +09:00 |
|
Dean Herbert
|
d230c3f9ac
|
Correct masking layers on song select.
|
2017-02-08 20:39:17 +09:00 |
|
Dean Herbert
|
050fa7fbe8
|
Adjust FilterControl to match design and give an absolute height.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
2e119cd74f
|
Handle toolbar offsets better.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
417b0817a9
|
Improve arrow key redirection at song select.
|
2017-02-08 15:30:20 +09:00 |
|
Dean Herbert
|
937c065af7
|
Clear content of SearchTextBox on first escape keypress.
|
2017-02-08 15:14:15 +09:00 |
|
Dean Herbert
|
bbf8d1000b
|
Update focus requesting code in SearchTextBox.
|
2017-02-08 15:13:56 +09:00 |
|
Dean Herbert
|
a6f02106a4
|
Use new placeholder logic.
|
2017-02-08 14:08:01 +09:00 |
|
Dean Herbert
|
5a89ba1040
|
Make OsuTextBox use OsuSpriteText.
|
2017-02-08 11:22:46 +09:00 |
|
Dean Herbert
|
6b011a50d2
|
Naming standardisation and enforcing.
|
2017-02-07 16:20:36 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
86205c35a4
|
Fix weird state changes of footer buttons.
|
2017-02-06 20:46:53 +09:00 |
|
Thomas Müller
|
8271b139e9
|
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
|
2017-02-05 09:40:58 +01:00 |
|
Dean Herbert
|
ddea76927f
|
Better SearchTextBox focus handling.
|
2017-02-03 19:12:57 +09:00 |
|
Dean Herbert
|
16a01abc4d
|
Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
|
2017-02-03 13:16:07 +09:00 |
|
Drew DeVault
|
437cc834eb
|
@Tom94 pointed out this problem
|
2017-02-02 12:23:06 -05:00 |
|
Dean Herbert
|
966121a438
|
Fix keyboard controls not respecting search filter.
|
2017-02-02 19:37:35 +09:00 |
|
Dean Herbert
|
0c887d3a46
|
Fix deselected group remaining visible after search.
|
2017-02-02 19:24:43 +09:00 |
|
Dean Herbert
|
aec84ae725
|
Fix laggy animations, incorrect hiding logic.
|
2017-02-02 19:24:14 +09:00 |
|
Drew DeVault
|
5003b3738a
|
Remove constant boolean expressions
|
2017-02-01 19:15:22 -05:00 |
|
Drew DeVault
|
3c7c3d1cb9
|
Tidy up GetEnumerable
|
2017-02-01 19:12:24 -05:00 |
|