1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-20 01:32:56 +08:00
Commit Graph

948 Commits

Author SHA1 Message Date
smoogipoo
6d253fd33c Add a way to adjust the conversion process with mods 2018-01-03 19:06:20 +09:00
Dan Balasescu
262a7f7d19
Merge branch 'master' into large-texture-store 2018-01-03 13:56:39 +09:00
Dean Herbert
c0dd812a4c Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods 2018-01-02 15:33:08 +09:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Aergwyn
ccb69d16d9 move HitResult in Scoring namespace to replace HitCount 2017-12-30 21:23:18 +01:00
Dean Herbert
d9a80dae5d Male NoFail use an applicable interface 2017-12-31 04:10:29 +09:00
Dean Herbert
fea4e1ff68 Add a base interface for applicable mods 2017-12-31 04:09:51 +09:00
Dean Herbert
3f8f778004
Merge branch 'master' into standard-hd-support 2017-12-29 15:56:38 +09:00
Dean Herbert
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
Aergwyn
dbcf87267d Merge branch 'master' into standard-hd-support 2017-12-27 21:26:39 +01:00
smoogipoo
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
Aergwyn
4c2554595e implement hidden (mostly)
some things work and others don't, I dunno
2017-12-26 17:25:18 +01:00
Dean Herbert
cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit 2017-12-26 18:06:07 +09:00
Dan Balasescu
f7a54a203b
Merge branch 'master' into beatmap-import-prompt 2017-12-26 16:00:37 +09:00
smoogipoo
58c35b8ba5 Merge remote-tracking branch 'FreezyLemon/master' into fix-taiko-stronghit 2017-12-26 12:28:40 +09:00
Dean Herbert
3c8d30f8e6 Add a dialog offering to import beatmaps from stable 2017-12-26 00:52:11 +09:00
Aergwyn
bb4b5bebf9 fix supporter icon in profile missing its background
also it doesn't show up on profiles without supporter anymore
2017-12-25 15:30:42 +01:00
smoogipoo
d288d8a51f Remove SampleInfoList 2017-12-25 15:40:01 +09:00
Dan Balasescu
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder 2017-12-23 20:04:05 +09:00
Dean Herbert
5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
Dean Herbert
4d40004e97
Merge branch 'master' into beatmap-serialization 2017-12-22 22:45:00 +09:00
Dean Herbert
bdda1570d1 Move Placeholder classes to own files 2017-12-22 22:44:18 +09:00
Dean Herbert
82909f6585 RankChart -> RankGraph 2017-12-22 19:25:18 +09:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization 2017-12-22 07:38:05 +09:00
smoogipoo
e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
smoogipoo
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
Aergwyn
bfe986230d Merge branch 'master' into add-confirmation-dialog 2017-12-18 17:29:06 +01:00
Aergwyn
6ac33e3c00 made DeleteAll-button pink 2017-12-18 17:04:35 +01:00
Dean Herbert
a74ac278fe Merge remote-tracking branch 'upstream/master' into editor-selection-tool 2017-12-18 21:48:01 +09:00
smoogipoo
09c51df2bd Marker* -> Handle 2017-12-18 19:21:26 +09:00
smoogipoo
3999940538 DragSelector -> HitObjectSelectionBox 2017-12-18 19:17:26 +09:00
smoogipoo
918e7c9a4b MenuOverlay -> GameplayMenuOverlay 2017-12-18 16:40:50 +09:00
Dan Balasescu
35b6114d01
Merge branch 'master' into editor-selection-tool 2017-12-18 13:57:32 +09:00
Aergwyn
2e196661bb Merge branch 'master' into add-confirmation-dialog 2017-12-15 18:11:13 +01:00
smoogipoo
66b19b6c97 Expose selected objects from SelectionLayer 2017-12-15 14:48:24 +09:00
Dean Herbert
b9298325a3 Rename weird config setting 2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb More clean-ups and event bindings 2017-12-15 14:36:51 +09:00
Dean Herbert
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
smoogipoo
2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
smoogipoo
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
Dean Herbert
5a6ac73fff
Fix broken tools making broken changes 2017-12-11 15:05:19 +09:00
Dean Herbert
7d8fb12332 DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
98ce856de1 Use more sensible names for classes and methods
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
Dean Herbert
d02e1ae896 Update RulesetInfo and add migration 2017-12-10 12:15:55 +09:00
Aergwyn
c97646bea6 added confirmation dialog for Delete ALL beatmaps 2017-12-08 14:27:07 +01:00
FreezyLemon
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
smoogipoo
5341e79102 Remove SelectionDragger for now 2017-12-08 17:51:15 +09:00
smoogipoo
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00