h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 22:07:29 +08:00
Code Issues Releases Wiki Activity
4,822 Commits 3 Branches 654 Tags 363 MiB
178f8127b8
Commit Graph

3097 Commits

Author SHA1 Message Date
Dean Herbert
5131371c93 Merge branch 'master' into new-option-search 2017-05-08 10:49:49 +09:00
DrabWeb
de8428c95b Make requested changes 2017-05-07 22:23:33 -03:00
Dan Balasescu
11c2e66cee Merge branch 'master' into option-item-refactor 2017-05-08 10:13:21 +09:00
Dan Balasescu
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00
EVAST9919
f0145c7f4f Trying to woke up AppVeyor 2017-05-08 02:16:56 +03:00
EVAST9919
926ed907c2 CI fixes 2017-05-08 02:00:21 +03:00
EVAST9919
dda25219bc code fixes 2017-05-08 01:54:31 +03:00
EVAST9919
c3a42ded36 Fixed Graph/seeking offset 2017-05-08 01:23:51 +03:00
EVAST9919
531f2c410a removed useless variable 2017-05-08 00:26:34 +03:00
EVAST9919
ea28a9f7ce Adjust values 2017-05-08 00:16:58 +03:00
Jorolf
3c4faae554 add search box and the ability to search 2017-05-07 20:35:57 +02:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
Jorolf
ef02f80881 Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search 2017-05-06 17:55:28 +02:00
EVAST9919
d06b5783cb Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-06 17:33:51 +03:00
Huo Yaoyuan
f37c857af8 CI fixes. 2017-05-06 16:06:38 +08:00
Huo Yaoyuan
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
Huo Yaoyuan
4f49151984 Make metadata a member of WorkingBeatmap. 2017-05-06 14:52:28 +08:00
skettios
36dff94802 removed check if ModSelectOverlay is open 2017-05-05 18:16:48 -07:00
skettios
d129bd0c1f Fix ModSelectOverlay accepting escape when it shouldn't 
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
 2017-05-05 17:03:24 -07:00
WebFreak001
5aecc3d761 Made cursortrail work with multiple positions 2017-05-05 17:44:51 +02:00
DrabWeb
81d67cbe06 Play first visible set in playlist when commiting in the search field. 2017-05-05 01:59:24 -03:00
Dean Herbert
4b385ded26 Tidy up ModIcon. 2017-05-05 13:22:10 +09:00
Dean Herbert
44f06e5423 Add hover expand support. 2017-05-05 13:17:36 +09:00
Dean Herbert
9c4f813da1 Remove unnecessary hide/show logic. 
Also change the way the overlay appears when actually playing.
 2017-05-05 13:14:44 +09:00
Dean Herbert
b547dd6893 CI Fixes. 2017-05-05 13:06:54 +09:00
Dean Herbert
c9ba1ac4f6 Adjust namespaces. 
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
 2017-05-05 13:00:05 +09:00
Dean Herbert
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
EVAST9919
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
EVAST9919
66c858030a Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-04 17:35:41 +03:00
Dean Herbert
98b3b82c07 Apply CI fixes. 2017-05-04 23:32:27 +09:00
EVAST9919
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
Dean Herbert
153951d3dd Add OptionItem class 
Allow for centalised logic for all option UI controls.
 2017-05-04 23:07:48 +09:00
EVAST9919
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
Dean Herbert
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09:00
WebFreak001
063b606a12 Fix readonly warning 2017-05-03 18:48:17 +02:00
WebFreak001
008ff9d2f9 InputResample CursorTrail 2017-05-03 18:33:42 +02:00
EVAST9919
6063231e40 float value fix 2017-05-03 16:58:10 +03:00
EVAST9919
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03:00
Dean Herbert
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
Dean Herbert
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
Dean Herbert
489f586887 Add FPS display toggling. 
Kinda temporary but better than nothing.
 2017-05-03 20:34:53 +09:00
smoogipooo
956a7288fb Add basic DrawableNote. 2017-05-03 20:12:27 +09:00
EVAST9919
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
EVAST9919
9e35eb8d97 Fixes 2017-05-03 13:53:45 +03:00
smoogipooo
06e014708a Defer virtual method to load(). 2017-05-03 15:57:15 +09:00
EVAST9919
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
EVAST9919
898d9495ff line fix 2017-05-03 08:27:47 +03:00
EVAST9919
f49cc124ed Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 08:26:54 +03:00
EVAST9919
a897dcbfbe Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-03 08:26:01 +03:00
EVAST9919
6ea3629c9a Adjust the size 2017-05-03 08:23:52 +03:00
smoogipooo
1fa42b26e8 Make base DrawableHitObject<TJudgement> uninheritable. 2017-05-03 14:02:23 +09:00
Dean Herbert
8825277656 Merge branch 'master' into custom-drawings-flags 2017-05-03 09:36:51 +09:00
EVAST9919
2e30a69b67 removed using 2017-05-02 23:04:36 +03:00
EVAST9919
a955f9cbfd Simplify hiding logic 2017-05-02 22:59:36 +03:00
EVAST9919
37c3133981 Fixes 2017-05-02 22:46:18 +03:00
EVAST9919
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
EVAST9919
00a8dbbacf Added ModType for each mode 2017-05-02 21:36:55 +03:00
EVAST9919
6f44869875 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-02 17:20:10 +03:00
Dean Herbert
a036b059e8 Use provided parameters to avoid a second lookup. 2017-05-02 21:40:06 +09:00
Dean Herbert
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
Dean Herbert
f9de733128 Formatting. 2017-05-02 18:53:33 +09:00
Dean Herbert
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
Dean Herbert
57c2dd1f49 Fix options dropdown labels never being displayed. 2017-05-02 18:35:23 +09:00
smoogipooo
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
smoogipooo
f1f7a26dbd Fix incorrect inheritance. 2017-05-02 17:58:59 +09:00
Dean Herbert
a993790a66 Ensure all searchable terms are non-null non-empty. 2017-05-02 17:54:07 +09:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
smoogipooo
9ca8295149 Oops. 2017-05-02 17:09:16 +09:00
Dean Herbert
116e92a542 Remove silly platform specific logic. 2017-05-02 17:00:30 +09:00
smoogipooo
40d2fee1dc Split up adding of local store from the ctor. 2017-05-02 16:55:04 +09:00
smoogipooo
e2620e2840 Make Team not inherit Country. 2017-05-02 16:54:43 +09:00
Dean Herbert
46ae8bc86b Use value because we need to. 2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
smoogipooo
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
Dean Herbert
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
EVAST9919
108cd28e96 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-02 10:15:56 +03:00
smoogipooo
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
smoogipooo
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work. 
Also standardises searchable terms in beatmap metadata.
 2017-05-02 10:45:55 +09:00
Dan Balasescu
8caba36230 Merge branch 'master' into general-fixes 2017-05-02 09:50:35 +09:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
Dean Herbert
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00
Dean Herbert
3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
Dean Herbert
c59589eba7 Only retrieve colour once. 2017-05-01 19:32:00 +09:00
Dean Herbert
0f4ef16910 Remove custom word splitting logic, add localisation support. 2017-05-01 17:14:59 +09:00
Dean Herbert
d00d4cce35 Merge branch 'master' into autoreplay-refactor-squashed 2017-05-01 16:53:46 +09:00
Dean Herbert
2cfb83436d Add placeholder logic for filtering. 2017-05-01 15:27:41 +09:00
Dean Herbert
a1f341a64f Fix textbox focus issues (and inability to use escape). 2017-05-01 15:23:01 +09:00
Dean Herbert
c1d0aea217 Refactoring part 5. 2017-05-01 15:09:14 +09:00
Dean Herbert
580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
ColdVolcano
f2b0602f90 Double check if the selectedpanel is not the provided as argument 2017-05-01 00:13:00 -05:00
Dean Herbert
97a7f16ab7 Refactoring part 3. 2017-05-01 13:41:22 +09:00
Dean Herbert
7c2e193db1 Refactoring part 2. 2017-05-01 13:25:32 +09:00
Dean Herbert
37944bb04e Initial refactoring. 2017-05-01 13:01:08 +09:00
EVAST9919
698ae0832f Move string formatting inside the class 2017-05-01 07:00:44 +03:00
EVAST9919
ba0fbacda0 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-05-01 06:33:04 +03:00
Dean Herbert
47e4a5b9cb Merge branch 'master' into metadata_additions 2017-05-01 12:02:35 +09:00
EVAST9919
0386e96573 applied requested changes 2017-05-01 05:38:51 +03:00
Dean Herbert
96a4388b20 Merge branch 'master' into song-select-performance 2017-05-01 11:01:10 +09:00
EVAST9919
668262ed06 Applied requested changes 2017-05-01 04:53:46 +03:00
EVAST9919
e9094bac51 Added suggested changes 2017-04-30 17:05:00 +03:00
EVAST9919
e522a8c433 Merge remote-tracking branch 'refs/remotes/ppy/master' into metadata_additions 2017-04-30 16:57:57 +03:00
Jorolf
6b08f485b4 fix typo 2017-04-30 14:45:23 +02:00
Dean Herbert
1e3847c73c Cancel the existing scheduled task when running it ahead of time. 2017-04-29 20:28:56 +09:00
Dean Herbert
2dcb4e9b93 Fix race condition when attempting to start a beatmap during debounce. 2017-04-29 20:12:09 +09:00
Dean Herbert
589e89fed3 Merge remote-tracking branch 'upstream/master' into song-select-performance 2017-04-29 19:52:55 +09:00
Thomas Tan
9c6c017411 Merge branch 'master' into autoreplay-refactor-squashed 2017-04-29 17:47:38 +08:00
DrabWeb
9bdf462dd1 Possible null reference exception 2017-04-29 06:36:06 -03:00
DrabWeb
067b572245 Formatting 2017-04-29 06:28:57 -03:00
DrabWeb
ef811f3cf3 More formatting 2017-04-29 06:17:50 -03:00
DrabWeb
3f73799975 Formatting 2017-04-29 06:10:12 -03:00
DrabWeb
c193a90a16 Merge https://github.com/ppy/osu into playlist 2017-04-29 05:39:52 -03:00
Dean Herbert
f202aee2a9 Fix input not being propagated to the playfield when outside its bounds. 2017-04-29 16:59:23 +09:00
Thomas Tan
d742092d9d CI fixes 2017-04-29 02:30:34 +08:00
Thomas Tan
27632434c6 Add license header 2017-04-29 02:23:07 +08:00
EVAST9919
a8c918f7bf Removed empty line 2017-04-28 21:12:48 +03:00
Thomas Tan
9b8b88601f Create "AutoGenerator" base class and interface. 2017-04-29 02:08:48 +08:00
EVAST9919
d5c56aab7a Initial commit 2017-04-28 21:05:00 +03:00
Dean Herbert
2ece1cbd07 CI Fixes. 2017-04-28 22:26:51 +09:00
Dean Herbert
a681e3e380 Remove unused method. 2017-04-28 22:17:42 +09:00
Dean Herbert
4e65da0fd1 Fix regression in panel select animation. 
Currently we are required to update computeYPositions twice per selection. Without doing this, panels are in the wrong place when using keyboard selection.

There's still a bit of work to be done to make this work correctly. It's caused by a race condition of state application for panels which have not yet been presented (and get their state applied in LoadComplete which breaks the order of things).
 2017-04-28 22:17:35 +09:00
EVAST9919
f8faea8da2 Removed unnecessary nested class 2017-04-28 16:02:00 +03:00
EVAST9919
c4bd21914d warning fixes 2017-04-28 15:37:22 +03:00
EVAST9919
b409a22309 Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage 2017-04-28 15:29:24 +03:00
Dean Herbert
70e81115f4 Refactor BeatmapInfoWedge to suck a little less. 2017-04-28 21:16:37 +09:00
Dean Herbert
59cc5ea00a CI Fixes. 2017-04-28 20:50:23 +09:00
Dean Herbert
45729a8881 Add debounce to WorkingBeatmap creation at song select. 
Improves perceived performance when quickly moving through carousel.
 2017-04-28 20:44:16 +09:00
Dean Herbert
003cf53441 Streamline panel selection event logic. 
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
 2017-04-28 20:43:42 +09:00
Dean Herbert
b78fa99620 Don't perform a selection if we already have the correct panel selected. 2017-04-28 20:31:09 +09:00
Dean Herbert
28375ed1fc Allow transfer of previously loaded background between WorkingBeatmaps 2017-04-28 15:03:07 +09:00
smoogipooo
c95a6fbd09 Use single line for GetUnicodePreference. 2017-04-28 14:14:14 +09:00
Dan Balasescu
658ff61e8a Merge branch 'master' into locale 2017-04-28 13:51:36 +09:00
EVAST9919
c27909d53c CI fixes 2017-04-28 05:02:25 +03:00
EVAST9919
eacf2045f0 Initial commit 2017-04-28 04:56:34 +03:00
Dean Herbert
94c259bd59 Remove most usages of DelayReset 
ButtonSystem requires some more work.
 2017-04-27 18:39:40 +09:00
Dean Herbert
59a3e23879 Ensure PlayerInputManager's initial time is transferred at load. 2017-04-27 17:38:00 +09:00
Huo Yaoyuan
ad92e6d732 Remove OsuConfig.Language too. 2017-04-27 12:42:56 +08:00
Huo Yaoyuan
061c3cacbd CI fixes. 2017-04-26 20:04:32 +08:00
Huo Yaoyuan
3706bc8741 Merge branch 'master' into locale 2017-04-26 19:56:34 +08:00
Huo Yaoyuan
4cb18361c1 Use localisation engine for unicode text. 2017-04-26 19:50:38 +08:00
Huo Yaoyuan
cf3e83ca62 Save ShowUnicode in framework config. 2017-04-26 19:48:46 +08:00
Dan Balasescu
a243729a54 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 20:43:56 +09:00
Dan Balasescu
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
Dan Balasescu
08b1d5beb9 Use const where it was inteded. 2017-04-26 20:15:34 +09:00
Dean Herbert
c5afb4b2a0 Merge remote-tracking branch 'upstream/master' into replay-playback-accuracy 2017-04-26 19:53:30 +09:00
Dan Balasescu
df5a95b675 Merge branch 'master' into fix-mouse-button-disable 2017-04-26 19:53:13 +09:00
Dean Herbert
e826f17eb0 Fix get-set mismatch. 2017-04-26 19:25:41 +09:00
Dean Herbert
49c02f5ad6 Merge branch 'master' into fix-drumroll-conversion 2017-04-26 19:16:40 +09:00
Dean Herbert
f48d497737 Fix disabling mouse buttons causing auto to stop working. 2017-04-26 18:56:20 +09:00
Dean Herbert
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
Dean Herbert
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
Dean Herbert
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
Dean Herbert
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
Dean Herbert
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
smoogipooo
d9dec9d444 Implement Taiko difficulty calculation. 2017-04-26 15:50:08 +09:00
Dan Balasescu
22be765323 Update HitObject.cs 2017-04-26 14:45:30 +09:00
smoogipooo
4c2985b6d1 Use CRLF instead of LF. 2017-04-26 14:40:40 +09:00
smoogipooo
28f7e0cdba Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings. 2017-04-26 14:12:21 +09:00
Dean Herbert
e003d9fc3c Add basic replay frame accurate "seeking". 
Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.
 2017-04-25 22:59:58 +09:00
Dean Herbert
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
Dean Herbert
eb5d334838 Add non-toggle support for showing seek bar in SongProgress. 2017-04-25 22:59:46 +09:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
630c556b80 Merge branch 'master' of https://github.com/ppy/osu into intro-improvements 2017-04-24 22:42:28 -05:00
Dan Balasescu
91b264da1a Merge branch 'master' into info-wedge-design-update 2017-04-25 08:14:59 +09:00
Dan Balasescu
b3e21f6f99 Merge branch 'master' into general-fixes 2017-04-25 08:05:03 +09:00
Dan Balasescu
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
Jorolf
a6ea6738e5 add some spaces after commas 2017-04-24 17:10:00 +02:00
Jorolf
7ef90e6597 Merge branch 'master' of git://github.com/ppy/osu into slider-stuff 2017-04-24 17:05:32 +02:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
2d6fa711d1 Remove unnecessary base.Update() in PlayerInputManager. 2017-04-24 20:22:21 +09:00
Dean Herbert
3c98170330 Use method group for MusicController fault. 2017-04-24 20:22:21 +09:00
Dean Herbert
9ecfb4e4bf Last CI fix. 2017-04-24 20:22:04 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design 
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
 2017-04-24 20:19:44 +09:00
Dean Herbert
d84f1f05e2 Add better commenting for ambiguous parameter 2017-04-24 20:16:53 +09:00
Dean Herbert
9670ea9a2a CI fixes 2017-04-24 20:16:41 +09:00
Dean Herbert
8b048a6706 Fix typo. 2017-04-24 19:33:48 +09:00
Dean Herbert
c55d406b44 Fix nullref possibility. 2017-04-24 19:25:35 +09:00
Dean Herbert
6aa6e5eef7 Store and restore the selected details tab at song select. 2017-04-24 19:25:27 +09:00
Dean Herbert
e1a2f1bc7a Add beatmap metrics lookup. 2017-04-24 19:17:11 +09:00
Dean Herbert
d6c5654924 Reduce paddings and lock in some fixed heights for BeatmapDetails. 2017-04-24 18:55:49 +09:00
Dean Herbert
4fa22146b8 Increase safety of score lookups when leaderboard isn't visible. 2017-04-24 18:48:28 +09:00
Dean Herbert
ee659e7307 Fix decimal display of beatmap details being too precise. 2017-04-24 18:34:27 +09:00
Dean Herbert
a475f1f237 Remove redundant qualifier. 2017-04-24 14:16:51 +09:00
Dean Herbert
ba2db75890 Merge branch 'master' into nodal-hit-sounds 2017-04-24 14:14:33 +09:00
Dean Herbert
239f19ad02 Fix incorrect line endings. 2017-04-24 14:10:44 +09:00
Dean Herbert
c48c10e248 Merge branch 'master' into intro-improvements 2017-04-24 13:05:18 +09:00
ColdVolcano
30b7a029dc Remove for real this time 2017-04-23 00:57:41 -05:00
ColdVolcano
6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
ColdVolcano
fe35d20def Remove not needed stuff (+typo fix) 2017-04-23 00:50:02 -05:00
ColdVolcano
4b69477531 Trim whitespace 2017-04-23 00:41:15 -05:00
ColdVolcano
094a0f9639 Move MenuMusic logic to MainMenu 2017-04-23 00:36:23 -05:00
ColdVolcano
1d254f4a56 Take MusicController back to life 2017-04-23 00:13:58 -05:00
Jorolf
60bb45358c remove more casts and usings 2017-04-22 18:36:37 +02:00
Jorolf
b151c71c0e remove casts 2017-04-22 18:36:36 +02:00
Jorolf
e53c4be356 I guess this works... 2017-04-22 18:36:36 +02:00
Jorolf
02249dcd67 add a function to OsuSliderBar to manually set the tooltip text 2017-04-22 18:34:57 +02:00
Jorolf
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
Dean Herbert
b7ac7297b4 Merge branch 'master' into clr-vscode-debugging 2017-04-22 23:30:49 +09:00
Dan Balasescu
6fb8676215 Merge branch 'master' into nodal-hit-sounds 2017-04-22 22:11:19 +09:00
smoogipooo
2af9bf1423 Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects. 2017-04-22 21:33:11 +09:00
smoogipooo
ec04ceaece Fix off-by-one on repeatCount. 2017-04-22 20:53:55 +09:00
smoogipooo
1bb0b96ddc Make IHasCurve not depend on a SliderCurve object. 2017-04-22 20:43:20 +09:00
smoogipooo
2d91400239 Fix nullref due to framework change. 2017-04-22 16:56:17 +09:00
Dean Herbert
96a5d7032d
Fix regression causing menu cursor to stick to screen edges. 2017-04-21 22:37:55 +09:00
Dean Herbert
caf3d311cd
Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
Dean Herbert
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
smoogipooo
d7477955ac CI fixes. 2017-04-21 20:42:13 +09:00
smoogipooo
5cdbb226f8 Remove CurvedHitObject to make RepeatSamples not tied to curve. 2017-04-21 20:40:11 +09:00
smoogipooo
b8f9a2be6e Whoops fix xmldoc. 2017-04-21 20:40:05 +09:00
smoogipooo
748f13501a Remove HeadSamples and TailSamples, combine into RepeatSamples. 2017-04-21 20:04:40 +09:00
smoogipooo
382e656e9f CI fixes. 2017-04-21 19:51:23 +09:00
Dan Balasescu
6c8bd4dfe4 More trimming. 2017-04-21 19:41:46 +09:00
smoogipooo
47f9b2d55b Trim whitespace. 2017-04-21 19:38:04 +09:00
smoogipooo
b8c10aa595 Improve xmldoc. 2017-04-21 19:37:16 +09:00
Dean Herbert
3345ba180f
Update with framework rename. 2017-04-21 19:26:32 +09:00
smoogipooo
cae4c7c6e5 Combine construction and assignment. 2017-04-21 19:12:16 +09:00
smoogipooo
a999c42d8a Split slider samples into head + tail + repeats + body (the original HitObject.Samples). 2017-04-21 18:49:49 +09:00
Dean Herbert
3f832731c9
Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
smoogipooo
a7afde02bf Oops, apparently normal hit sound should always be added. 2017-04-21 16:27:35 +09:00
Dean Herbert
5fdc9819cf
Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
smoogipooo
ca824de91c Implement RepeatSamples in IHasRepeats. 2017-04-21 16:18:34 +09:00
smoogipooo
b4a4597366 Transform legacy HitObjectParsers to give repeat slider sounds, instead of all sounds. 2017-04-21 16:18:11 +09:00
Dean Herbert
25a7d99a8e
Remove unused reference. 2017-04-21 16:11:24 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed. 
Tidies up ToolbarModeSelector a lot by using DI.
 2017-04-21 16:03:59 +09:00
Dean Herbert
4a3ae6937d
Improve the look of ScreenWhiteBox. 2017-04-21 15:41:22 +09:00
smoogipooo
83f1f9d7e5 Add ability to parse per-repeat sounds. 2017-04-21 14:38:46 +09:00
smoogipooo
bd7341c5a1 Restructure reading normal/add/volume members into class to make code a bit more readable/usable. 2017-04-21 14:36:28 +09:00
Dean Herbert
ef7bc0f92e
Update UI controls to understand DisabledChanged. 2017-04-21 14:02:04 +09:00
Dean Herbert
2d53ad4c0a
Remove xmldoc-only using usage. 2017-04-21 14:01:58 +09:00
Dean Herbert
d656090aab
Move tooltips below the cursor. 2017-04-21 14:01:31 +09:00
smoogipooo
ac9f0ccb48 Fix hit normals always being played, regardless of sound type. 2017-04-21 13:59:55 +09:00
Dean Herbert
6e3125e115 Merge pull request #656 from smoogipooo/taiko-fixes 
Taiko fixes
 2017-04-20 20:10:29 +09:00
Dean Herbert
3342a97b20
Remove using. 2017-04-20 19:52:32 +09:00
Dean Herbert
c7411c47d6
Update User API stuff. 2017-04-20 19:51:28 +09:00
smoogipooo
7df35e1197 Bind to method instead of exposing ScoreProcessor to HealthDisplay. 2017-04-20 19:45:15 +09:00
Dean Herbert
a174b7201e Merge branch 'master' into api-updates 2017-04-20 19:40:07 +09:00
smoogipooo
3acdc1dcfb Update palette colours. 2017-04-20 19:36:53 +09:00
Dean Herbert
008ca07b16
Update score to read statistics from server. 
Also brings some naming up-to-date.
 2017-04-20 18:54:35 +09:00
Dean Herbert
4e1942f998
Fix tooltips sticking after drag. 2017-04-20 18:17:12 +09:00
Dean Herbert
02e406860b
Merge remote-tracking branch 'upstream/master' into tooltips 
# Conflicts:
#	osu.Game/Graphics/UserInterface/OsuSliderBar.cs
 2017-04-20 18:02:38 +09:00
Dan Balasescu
37ef91e0f3 Merge branch 'master' into taiko-fixes 2017-04-20 18:02:30 +09:00
smoogipooo
f50e43fc4b CI fixes. 2017-04-20 18:02:09 +09:00
Dean Herbert
0de71ab24d
Add basic tooltip support to OsuSliderBar. 2017-04-20 17:57:58 +09:00
Dean Herbert
c87657707f
Add tooltip to sliderbars. Move interface. 2017-04-20 17:33:07 +09:00
smoogipooo
6e3018f36d Add a glow fade based on density of hits. 2017-04-20 17:11:58 +09:00
smoogipooo
e92e08f86d Make StandardHealthDisplay glow extrude beyond the end of the bar. 2017-04-20 17:11:31 +09:00
Dean Herbert
9cb789f426
Use 24 hour display for chat times. 2017-04-20 17:10:05 +09:00
Dean Herbert
ce5763ed97
Remove using. 2017-04-20 16:37:29 +09:00
Dean Herbert
9c8cd08927
Don't play sliderbar samples more than once when value has not changed. 2017-04-20 16:35:55 +09:00
Dean Herbert
9d975f202f
Make background slightly transparent. 2017-04-20 16:29:05 +09:00
Dean Herbert
18bbbdad4c
Reduce appear delay slightly. 2017-04-20 16:28:55 +09:00
Dean Herbert
d12a9a7675
Don't run AutoSize transforms when tooltip is already invisible. 2017-04-20 16:28:45 +09:00
Dean Herbert
a884ac215e
Position tooltip better; remove need for lastState. 2017-04-20 16:08:36 +09:00
Dean Herbert
00d8cacba8
Update visual apperance. 2017-04-20 16:05:25 +09:00
Dean Herbert
990c14fbe0
Keep tooltip's current target while the main button is pressed. 
Handles drag operations better.
 2017-04-20 15:51:30 +09:00
Dean Herbert
30c3c932b1
Remove redundancies. 2017-04-20 15:29:34 +09:00
smoogipooo
61090d918c Temporary for taiko lagging on auto replays due to inImportantSection. 
Note that this isn't a full "as intended" fix, because the full fix is quite big. I'll be saving it for a separate branch/pull-req.
 2017-04-20 15:26:42 +09:00
Dean Herbert
4ca27a5395
Merge branch 'master' into tooltips 2017-04-20 15:08:26 +09:00
Dean Herbert
b11315ca46
Remove unnecessary interfaces and simplify tooltip logic. 2017-04-20 14:34:29 +09:00
Dean Herbert
1707c2458e
Update exception name. 2017-04-20 12:11:03 +09:00
Dean Herbert
873599b359
Fix conversion regression. 2017-04-20 11:36:50 +09:00
Dean Herbert
2a422ca5fa
Remove ScoreStatistic. 2017-04-20 11:26:02 +09:00
Dean Herbert
a47870b376
Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
Dean Herbert
6cf026e5c1
Remove OsuScore and change the way statistics are stored (dynamic dictionary). 2017-04-20 11:03:11 +09:00
Dean Herbert
3e65cab9b7
Move replay creation logic to ScoreDatabase. 2017-04-20 10:25:07 +09:00
Dan Balasescu
66cb604081 Merge branch 'master' into score-statistics 2017-04-20 10:06:43 +09:00
Jorolf
ea67b41683 move tooltip outside of the cursor 2017-04-20 00:42:40 +02:00
Jorolf
e8aea3ccd2 Merge branch 'master' of git://github.com/ppy/osu into tooltips 2017-04-19 15:33:35 +02:00
Jorolf
d04893a43a ---changing--- 2017-04-19 15:33:24 +02:00
Dan Balasescu
dd3f9c1cdd Merge branch 'master' into results-screen 2017-04-19 21:58:40 +09:00
Dan Balasescu
7475b39dc1 Merge branch 'master' into chat-post-support 2017-04-19 21:29:07 +09:00
Jorolf
eda0e99179 Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips 2017-04-19 13:53:08 +02:00
Jorolf
4f9c5dd44d renaming and some changes in TestCaseTooltip 2017-04-19 13:52:17 +02:00
Jorolf
af9a45fd6c Merge branch 'master' into tooltips 2017-04-19 13:51:39 +02:00
Dean Herbert
015eacb3b8
Merge branch 'results-screen' into score-statistics 2017-04-19 20:51:23 +09:00
Dean Herbert
7fe2f6639d
Merge remote-tracking branch 'upstream/master' into results-screen 
# Conflicts:
#	osu.Game/Users/User.cs
 2017-04-19 20:51:05 +09:00
Jorolf
8e4288168a renaming and some changes in TestCaseTooltip 2017-04-19 13:47:00 +02:00
Dean Herbert
3e48a57e9a Merge branch 'master' into score-statistics 2017-04-19 20:36:14 +09:00
Dean Herbert
093abd6872
Add chat toggle button. 2017-04-19 19:54:03 +09:00
Dean Herbert
c7246fd2ac
Reorganise ChatOverlay to not suck. 2017-04-19 19:15:21 +09:00
Dean Herbert
dda3fb85ee
Add user colour support. 2017-04-19 19:07:38 +09:00
Dean Herbert
3129708ccb
Add chat sending support. 2017-04-19 18:46:52 +09:00
Dean Herbert
87f6dc9e5a
Change default channel to #lazer. 2017-04-19 18:46:50 +09:00
Dean Herbert
325af333b9
Update API responses for chat. 2017-04-19 18:46:48 +09:00
Dean Herbert
1f7ed72dc6
Update font/size. 2017-04-19 17:32:30 +09:00
Dean Herbert
3b95fbab7d
Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
Dean Herbert
662544e04f
Merge branch 'master' into results-screen 
# Conflicts:
#	osu.Game/Rulesets/Replays/Replay.cs
 2017-04-19 16:25:31 +09:00
Dean Herbert
afcd7d7fa0
Format accuracy better in LeaderboardScores. 2017-04-19 16:05:17 +09:00
Dean Herbert
2783f49267
Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed. 2017-04-19 16:05:14 +09:00
Dean Herbert
83fa143e17
Bring API request structure up-to-date. 2017-04-19 16:05:06 +09:00
Dean Herbert
2f53f2e248
Add license headers. 2017-04-18 22:35:21 +09:00
Dean Herbert
cef6a014d5
Add a simulated key-up delay to auto replays. 
Fixes key counter display looking odd.
 2017-04-18 22:31:52 +09:00
Dean Herbert
49f4981f1c
Fix CI issues. 2017-04-18 22:28:16 +09:00
Dean Herbert
a0d9c14526
Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
Dean Herbert
15d62a0c76
Add temporary ScoreRank assignment. 2017-04-18 22:22:14 +09:00
Dean Herbert
2bf560a371
Disable page three for now. 2017-04-18 22:22:14 +09:00
Dean Herbert
e8d55b5bb5
Add back button. 2017-04-18 22:22:14 +09:00
Dean Herbert
4a3fc710c4
Add temporary combo/accuracy display. 2017-04-18 22:22:14 +09:00
Dean Herbert
f1bd64a74d
Adjust colour metrics. 2017-04-18 22:22:14 +09:00
Dean Herbert
32df625d82
Adjust text size and padding. 2017-04-18 22:22:14 +09:00
Dean Herbert
28835bd5bd
Add back comma separator to score display. 2017-04-18 22:22:14 +09:00
Dean Herbert
782019e0c7
Make line gradient correct. 2017-04-18 22:22:14 +09:00
Dean Herbert
886ac1fb40
Add progress graph background and update ruleset references. 2017-04-18 22:22:14 +09:00
Dean Herbert
968d46a10f
whitespace. 2017-04-18 22:22:14 +09:00
Dean Herbert
49fc91cf37
Add an exit transition. 2017-04-18 22:22:14 +09:00
Dean Herbert
72fcc09a98
Add beatmap info and score date. 
Also adjusts design metrics.
 2017-04-18 22:22:14 +09:00
Dean Herbert
7d32cc85c8
Make leaderboard scores clickable. 2017-04-18 22:22:14 +09:00
Dean Herbert
d51b37cb44
Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
Dean Herbert
77dbbe6f34
Add a placeholder cover URL for users. 2017-04-18 22:22:14 +09:00
Dean Herbert
b0f1851e88
Adjust visuals slightly. 2017-04-18 20:52:57 +09:00
Dean Herbert
1071645dca
Flexible cube count (and thus graph height). 
This also scaled the graph to the height of the maximum value. And much tidying.
 2017-04-18 19:25:52 +09:00
Dean Herbert
3b21340e1b
Split SquareGraph out and make SongProgressGraph also able to take a list of Objects. 2017-04-18 18:40:02 +09:00
Dean Herbert
417a5ca713
A bit of renaming. 2017-04-18 18:29:24 +09:00
Dean Herbert
66865c50ad
Remove explicit RelativeSize setting. 2017-04-18 18:10:13 +09:00
Dean Herbert
784ca2300b
Add safety check for when no objects have been assigned. 2017-04-18 18:09:37 +09:00
Dean Herbert
5ba85818db
Combine push logic and adjust transitions a bit more. 2017-04-18 17:07:02 +09:00
Dean Herbert
ddff26d167
Show metadata when loading between retries. 
Also speeds up the display a bit.
 2017-04-18 17:00:58 +09:00
Dean Herbert
edd71c0560
Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
Dean Herbert
2ccb8b154f
Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
Dean Herbert
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
Dean Herbert
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
ocboogie
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
ocboogie
2bd89e922f Removed unneeded newPlayer 2017-04-17 23:48:21 -07:00
ocboogie
c0f4cbcba6 Added back PlayerLoader overlays 2017-04-17 23:36:11 -07:00
Dean Herbert
727086c0b2
Updates in-line with framework. 2017-04-18 15:34:53 +09:00
smoogipooo
7a6b062e72 Fix adding duplicate hitobjects in the case where a hit object doesn't need to be converted. 2017-04-18 14:48:18 +09:00
smoogipooo
cf404b4bcf We shouldn't be adding null hitobjects. 2017-04-18 14:46:56 +09:00
ocboogie
be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
Dan Balasescu
0dd97c433f Trim whitespace. 2017-04-18 14:34:39 +09:00
smoogipooo
27ddf4b475 Refactor beatmap converters. 2017-04-18 14:31:06 +09:00
ocboogie
5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00
ocboogie
aa466d0e84 PlayerLoader creates a new instance of the Player class on Restart 2017-04-17 21:32:38 -07:00
smoogipooo
ef5d50e7d8 mode -> ruleset. 2017-04-18 11:29:27 +09:00
smoogipooo
8844ff7ab7 CI fixes. 2017-04-18 11:20:39 +09:00
smoogipooo
d04353aed0 Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter. 2017-04-18 11:13:11 +09:00
smoogipooo
4a60e9299e Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:59:43 +09:00
Dean Herbert
8ef675d9b3
Add fallback to allow FilterCriteria to run without a ruleset being set. 2017-04-18 10:55:45 +09:00
Dean Herbert
5939ba9143
Fix ruleset not always being initialised correctly. 2017-04-18 10:55:33 +09:00
smoogipooo
5a78ce15a1 Fix CanConvert not returning correctly. 2017-04-18 10:23:49 +09:00
smoogipooo
d5c5b7eb6b Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion 2017-04-18 10:09:36 +09:00