1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 07:22:55 +08:00
Commit Graph

1585 Commits

Author SHA1 Message Date
Damnae
c8cdf6787e Better property name. 2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830 Unbind events affecting the background after gameplay has ended. 2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6 Integrate storyboards with gameplay. 2017-09-15 09:16:56 +02:00
Damnae
010a6ec252 Fix player loading. 2017-09-15 09:06:27 +02:00
EVAST9919
e7c9ad245e Fix icons in main button system jumps on one side for a long time 2017-09-15 09:24:31 +03:00
Dean Herbert
b72921b30e Ensure an OnlineBeatmapID is present before attempting API requests 2017-09-15 12:44:48 +09:00
Dean Herbert
6ea22cc6c7 Add missing return to PlayerLoader
was being a bit too eager previously
2017-09-15 08:15:23 +09:00
Dean Herbert
396a56ddf4 Remove global OsuContextMenuContainer 2017-09-14 15:41:32 +09:00
Dean Herbert
d330b39db4 Remove max 2017-09-14 13:47:25 +09:00
Dean Herbert
4f09f30b7a Fix incorrect exception 2017-09-14 13:13:54 +09:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
Dean Herbert
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
smoogipooo
2e0218f388 Move AllObjectsJudged into ScoreProcessor as AllJudged
Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.
2017-09-12 22:01:08 +09:00
Shane Woolcock
262aea8b6b Fix osu! logo triangles going super fast when the track is paused 2017-09-11 19:16:44 +09:30
smoogipooo
58c875bdca Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 15:02:12 +09:00
Dean Herbert
adba5b5ba6 Merge branch 'master' into beatmap-details-rewrite 2017-09-11 12:30:32 +09:00
Dean Herbert
eedfbdc0e8 Add nullref check in KeyCounterCollection's Add method 2017-09-11 11:41:09 +09:00
smoogipooo
cde22865b9 Merge remote-tracking branch 'origin/master' into blending-equations
# Conflicts:
#	osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
6d33e39c5e Merge branch 'master' into beatmap-details-rewrite 2017-09-10 11:26:00 +09:00
DrabWeb
d95940ed5e CI fixes. 2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e Update visual test. 2017-09-08 14:15:28 -03:00
DrabWeb
55e8bdfb05 CI fixes. 2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c Cleanup, remove unneeded files. 2017-09-07 15:21:18 -03:00
DrabWeb
2153865de5 Adjust fail on missing logic to match original. 2017-09-07 15:09:50 -03:00
DrabWeb
fd2700a5b4 Fix .00 being displayed for star difficulty when the value is 0. 2017-09-07 15:01:31 -03:00
DrabWeb
5e685ff5b1 Rewrite BeatmapDetails to be more modular for future code sharing. 2017-09-07 14:53:53 -03:00
MrTheMake
a7f874e5b6 Merge branch 'master' into leaderboard-scores 2017-09-07 18:25:33 +02:00
Dean Herbert
b9bec6a983 CI fixes 2017-09-07 23:06:35 +09:00
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6 Changes in line with framework 2017-09-07 20:36:32 +09:00
smoogipooo
06fac913bf Re-implement EditorMenuBar. 2017-09-06 21:14:29 +09:00
smoogipooo
df79d8918d Merge branch 'master' into menu-bar 2017-09-06 18:26:18 +09:00
smoogipooo
5508fa0fd9 Merge remote-tracking branch 'origin/master' into new-menus 2017-09-05 19:14:42 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
543a71efcc Fix ObjectDisposal exceptions due to lingering event binds 2017-09-04 08:21:07 +09:00
Dean Herbert
dd26c80837 Delete -> Hide 2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328 Merge branch 'master' into song-select-context-menus 2017-09-04 07:56:31 +09:00
Dean Herbert
3ede685ee9 Fix crash on random selection from a previously null selection 2017-09-01 18:44:51 +09:00
Dean Herbert
3d61cde266 Correctly delay loading of PlaySongSelect-specific components 2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00 Don't allow selection of a hidden beatmap 2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54 Add hiding support for beatmap difficulties 2017-09-01 17:57:12 +09:00
Dean Herbert
3b4b4b669b Add framework for deleting difficulties 2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc Use BeatmapSetInfo instead of WorkingBeatmap 2017-08-30 20:53:33 +09:00
Dean Herbert
07da29ea1c Add context menu to beatmap set header 2017-08-30 20:41:41 +09:00
Dan Balasescu
cabf671811 Merge branch 'master' into menu-bar 2017-08-30 12:31:12 +09:00
Huo Yaoyuan
4aa5ce8b41 Always load background and info wedge when no beatmap available. 2017-08-28 17:53:57 +08:00
smoogipooo
b17d9ac06e Move EditorMenuBar into the Edit namespace, and fix a minor styling issue. 2017-08-28 17:55:50 +09:00
Dean Herbert
189988236b Move PlayerInputManager logic inside RulesetInputManager 2017-08-24 15:23:17 +09:00
Dean Herbert
c5a20e3372 Remove permitNulls 2017-08-22 18:28:32 +09:00
Dean Herbert
803cbddfe2 Ensure score's user is set directly from API
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
Dean Herbert
09dd0cabd6 Move beatmap/ruleset change restrictions to OsuGame
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Dean Herbert
16e96888ab Update KeyCounterCollection to support action-based buttons 2017-08-21 12:39:22 +09:00
MrTheMake
6d401b5f21 Merge branch 'master' into leaderboard-scores 2017-08-19 00:00:40 +02:00
Shane Woolcock
4901ac9e35 Add some comments explaining why the Track is being forcefully added to the TrackManager 2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5 Merge branch 'master' into fix-track-not-resetting 2017-08-18 17:24:22 +09:00
Dan Balasescu
cc6a5824f0 Merge branch 'master' into fix-ruleset-changing 2017-08-18 13:40:52 +09:00
Dean Herbert
7e21ddb5eb Remove usage of HideOnEscape 2017-08-16 22:56:32 +09:00
Dean Herbert
2c7f0629ef Merge remote-tracking branch 'upstream/master' into is-alive 2017-08-16 12:11:32 +09:00
MrTheMake
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
97ac8e1a64 Update usages of IsAlive/IsLoaded in line with framework changes 2017-08-15 13:57:48 +09:00
Dean Herbert
70f148f0b4 Fix icons on skip button 2017-08-15 09:30:46 +09:00
MrTheMake
920710e7d0 Assign a score's beatmap and cleanup to the Score class 2017-08-14 13:30:54 +02:00
Dean Herbert
9e1ffa27dc Fix leaderboard icons not displaying correctly 2017-08-14 12:52:20 +09:00
MrTheMake
6b1184e8af General formatting 2017-08-14 00:27:54 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3 Fix nullref in the leaderboard's test case 2017-08-13 18:00:53 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
Dean Herbert
94b8d1de8b Merge branch 'master' into fix-ruleset-changing 2017-08-13 11:14:41 +09:00
Dean Herbert
fe2911f165 Fix some formatting issues 2017-08-13 10:36:57 +09:00
Shane Woolcock
096e574401 Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter) 2017-08-12 19:52:09 +09:30
Shane Woolcock
e48c5898bd Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed. 2017-08-11 17:26:30 +09:30
Dean Herbert
48d4ed55e9 Move a lot of code to framework 2017-08-11 16:11:46 +09:00
Dean Herbert
723e27353c HitRenderer -> RulesetContainer 2017-08-09 13:28:29 +09:00
Dean Herbert
b88f37de45 Add custom actions for Catch
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Dean Herbert
e75f438c29 Add difficulty application mods
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e Implement NoFail mod 2017-08-07 08:54:54 +09:00
Dean Herbert
e8021c2b92 Move line inside if 2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4 Use removeAutoModOnResume as a field. 2017-08-04 15:34:11 +08:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e Provide Autoplay mod in Ruleset. 2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b Pass input state in OnSelected. 2017-08-04 00:09:41 +08:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
c8b5c1b8a5 Merge branch 'master' into scroll_to_selected 2017-08-01 11:06:32 +09:00
EVAST9919
700c7753c3 Applied suggestions 2017-07-31 14:20:12 +03:00
EVAST9919
1ce4966644 Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected 2017-07-31 14:08:15 +03:00
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
Dean Herbert
57d45b180c Merge remote-tracking branch 'upstream/master' into import-from-stable 2017-07-31 17:31:10 +09:00
EVAST9919
62365090ad Removed useless variable 2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567 Fix hard crash when pressing random if no beatmaps avaliable 2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be Added "scroll to" container 2017-07-29 17:33:20 +03:00
EVAST9919
8458622c4d Add ScrollToSelected method 2017-07-29 16:03:17 +03:00
Dean Herbert
e691dd12c5 Fix potential sequen of execution issues in BeatmapCarousel 2017-07-28 15:05:08 +09:00
Dean Herbert
f705589bf2 Rename NotificationManager to NotificationOverlay 2017-07-28 15:03:42 +09:00
Dean Herbert
6f4efbeda6 Merge remote-tracking branch 'upstream/master' into database-tidy 2017-07-27 17:41:29 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00