h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 12:17:46 +08:00
Code Issues Releases Wiki Activity
3,131 Commits 3 Branches 653 Tags 366 MiB
cdb3150c56
Commit Graph

393 Commits

Author SHA1 Message Date
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