1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 17:32:55 +08:00
Commit Graph

1432 Commits

Author SHA1 Message Date
DrabWeb
b196b1d3c6 CI fixes, switch RoomInspector to use BeatmapSetCover. 2017-07-13 01:24:59 -03:00
DrabWeb
fea40ccc1a Share BeatmapSet cover sprite code. 2017-07-13 01:17:47 -03:00
DrabWeb
0624f578eb Update with online beatmap changes. 2017-07-13 01:06:46 -03:00
DrabWeb
dc5ec319a2 Merge https://github.com/ppy/osu into drawable-room-update 2017-07-13 01:00:32 -03:00
Dean Herbert
2c1f3de47a Rename 2X resources to be defaults 2017-07-13 10:27:39 +09:00
Dean Herbert
56c817e4b6 Merge branch 'master' into osu-direct-search 2017-07-13 10:16:27 +09:00
Dean Herbert
9d47dd9ff9 Add support for right mouse absolute scrolling (when enabled)
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
EVAST9919
0b1db1502d removed useless bool 2017-07-12 09:42:38 +03:00
EVAST9919
ab8fb2edab Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix 2017-07-12 09:31:56 +03:00
Dean Herbert
04e99d1369 Only apply disable rules when in a screen stack. 2017-07-12 13:40:17 +09:00
Dean Herbert
54f6befd67 Merge branch 'master' into fix-track-rotation 2017-07-12 13:18:16 +09:00
Dean Herbert
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Seth
b30721edbe Merge branch 'master' into drawable-room-update 2017-07-11 20:42:44 -03:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Dean Herbert
9bbcc0526d Disable beatmap changes in specified screens 2017-07-11 18:39:10 +09:00
DrabWeb
b448603d6c CI fixes. 2017-07-11 01:42:51 -03:00
Dean Herbert
a9c50786b2 Fix osu! logo on main menu ending up in the wrong place
Also switch to using BeginDelayedSequence where possible.
2017-07-11 13:27:45 +09:00
DrabWeb
c449491c04 Fix RoomInspector covers. 2017-07-11 01:18:16 -03:00
DrabWeb
84701846ec Merge https://github.com/ppy/osu into osu-direct-search 2017-07-11 00:26:49 -03:00
Thomas Müller
c4e378571b Update framework 2017-07-10 11:54:23 +03:00
Dean Herbert
0e0c32008b More changes 2017-07-10 15:40:40 +09:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
EVAST9919
33206fcf0e Use Hide instead of FadeTo(0) 2017-07-08 12:34:24 +03:00
EVAST9919
adb88a8d49 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix 2017-07-08 12:28:41 +03:00
Thomas Müller
178685292a Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode 2017-07-08 12:25:08 +03:00
Dean Herbert
3c425dd07f Fix CI issue 2017-07-08 18:06:59 +09:00
Thomas Müller
22a987f6cc Update test cases to new framework and fix old crashes 2017-07-07 15:05:55 +03:00
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Jai Sharma
6eaeba5a92 Merge branch 'master' into remove-dragbar 2017-07-06 20:14:08 +01:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Thomas Müller
2d7eefa6fe Update Cached usage according to framework 2017-07-02 13:00:02 +03:00
Dean Herbert
3a82d77e5b Add missing tab 2017-07-01 07:10:04 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
f3f3952ba5 More unused usings 2017-06-29 12:20:05 -07:00
Dean Herbert
6865f9b231 Remove unused parameters 2017-06-29 12:05:37 -07:00
Dean Herbert
1e50840a8e Fix unused usings 2017-06-29 12:04:04 -07:00
Dean Herbert
7469d0e3ba Merge remote-tracking branch 'upstream/master' into new-samples 2017-06-29 11:51:51 -07:00
Dean Herbert
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
Dean Herbert
28f0da606a Add OsuFocusedOverlayContainer with predefined sounds. 2017-06-28 10:18:12 -07:00
Thomas Müller
40225238d9 Set RelativeSizeAxes for updated FillMode behavior 2017-06-28 12:24:23 +03:00
DrabWeb
24283b9500 Remove animation from ModeTypeInfo layout (was causing visual issues). 2017-06-27 22:22:14 -03:00
Dean Herbert
480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +09:00
EVAST9919
2ad6d3fa77 Simplify property 2017-06-27 05:41:24 +03:00
EVAST9919
714d53f329 Hide "Unranked" text in ModDisplay if play is ranked 2017-06-27 05:17:21 +03:00
Dan Balasescu
803bb3c780 Cleanup. 2017-06-26 23:05:35 +09:00
Dean Herbert
cbf188c293 Add new main menu backgrounds 2017-06-26 19:10:13 +09:00
EVAST9919
127c473f3b Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-25 23:38:39 +03:00
Dean Herbert
df74a84b35 Merge branch 'master' into drawable-room-update 2017-06-25 15:55:36 +09:00
Dean Herbert
ec99d83f6d Merge branch 'master' into fix_logo_sound 2017-06-25 15:13:57 +09:00
Dean Herbert
7baa2b7421 Fix CI issues 2017-06-25 14:46:59 +09:00
DrabWeb
5e1cb14e62 Use Vertical instead of Top and Bottom. 2017-06-24 19:11:02 -03:00
DrabWeb
091d786d47 Split long MarginPadding onto multiple lines. 2017-06-24 18:37:28 -03:00
Thomas Müller
1bca9ca0e9 Update framework with better children list 2017-06-24 12:56:35 +02:00
DrabWeb
68915d79a6 Remove unused fields. 2017-06-24 06:03:40 -03:00
DrabWeb
9f417743b6 Cleanup. 2017-06-24 05:54:00 -03:00
DrabWeb
bcd82a02f4 Licenses. 2017-06-24 05:45:34 -03:00
DrabWeb
fe875957a7 Share ruleset and type displaying, fix tag team icon. 2017-06-24 05:43:52 -03:00
DrabWeb
35951ffc40 Line endings. 2017-06-24 05:23:31 -03:00
DrabWeb
05b5fe8ae7 Share host/participant info displaying. 2017-06-24 05:21:42 -03:00
Jai Sharma
a0262e32b1 CI Fixes 2017-06-24 09:15:53 +01:00
DrabWeb
0de55776c0 Update DrawableRoom design. 2017-06-24 05:05:48 -03:00
Jai Sharma
e073100498 Merge branch 'master' into remove-dragbar 2017-06-24 08:55:02 +01:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
EVAST9919
817d2c3da1 Fixed logo heartbeat playing even without beating 2017-06-23 23:57:57 +03:00
Jai Sharma
de50a1694f Merge branch 'master' into remove-dragbar 2017-06-23 19:26:47 +01:00
Jai Sharma
a327f49d68 Updating progressBar.EndTime is more thread safe 2017-06-23 18:24:46 +01:00
Thomas Müller
f5829860a2 Get rid of AlwaysReceiveInput 2017-06-23 18:02:24 +02:00
Dean Herbert
1a8f207db3 Code formatting 2017-06-23 22:19:41 +09:00
Dean Herbert
81de1bd5a7 Merge branch 'master' into multiplayer-room-inspector 2017-06-23 21:55:18 +09:00
Jai Sharma
73c004fb71 Removed DragBar from song progress 2017-06-22 17:42:29 +01:00
EVAST9919
be94163d21 Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-22 04:28:47 +03:00
ColdVolcano
c619de7f9b Rename const in all of the code 2017-06-21 18:55:44 -05:00
ColdVolcano
1978a4e8a6 Boost visualiser performance
Also fixes amplitudes being set wrongly if kiai was false.
2017-06-21 18:32:31 -05:00
Dean Herbert
d0d0f11857 Merge branch 'master' into heartbeat 2017-06-21 15:35:54 +09:00
smoogipooo
fc0e44b214 Update framework. 2017-06-21 11:28:27 +09:00
paparony03
c8720bc5d5 Oops 2017-06-20 16:00:09 +10:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
EVAST9919
a991cff908 OsuLogo beat sound 2017-06-19 17:37:00 +03:00
Dean Herbert
17cb043cb2 Visualiser 2017-06-19 18:41:35 +09:00
Dean Herbert
a1b9499480 More documentation and constants 2017-06-19 18:41:11 +09:00
Dean Herbert
8c063fe2b8 Simplify AccentColour property for now 2017-06-19 18:38:39 +09:00
Dean Herbert
e269bdbad7 Use additive colour; adjust constants a bit 2017-06-19 18:30:13 +09:00
Dean Herbert
359cb4c083 Add kiai support 2017-06-19 18:29:44 +09:00
ColdVolcano
77ca48c1bd CI Fixes 2017-06-18 23:52:42 -05:00
ColdVolcano
84aa17dea3 Attempt to fix possible loss of fraction 2017-06-18 23:08:27 -05:00
ColdVolcano
63aabc162b Fix TestCaseMenuButtonSystem not starting up 2017-06-18 22:34:45 -05:00
ColdVolcano
3764c1d799 Make bar length and visualizer count floats 2017-06-18 22:28:18 -05:00
ColdVolcano
cea8dc5602 Fix possible loss of fraction 2017-06-18 22:13:21 -05:00
ColdVolcano
d3662636d6 CI fixes 2017-06-18 22:01:07 -05:00
ColdVolcano
ccac2e9a75 Add a visualizer around the logo 2017-06-18 19:33:50 -05:00
MrTheMake
a399b18837 Removed debug line 2017-06-19 00:11:47 +02:00
MrTheMake
3b3cc59471 Fix NullReferenceException 2017-06-18 20:21:24 +02:00
MrTheMake
23d1c89a67 Fix not applying song select preview seek 2017-06-18 20:12:28 +02:00
Dean Herbert
ae79ba48be Merge branch 'master' into numpad-enter 2017-06-16 15:32:52 +09:00
MrTheMake
06089a74e3 Handle the numpad's Enter in cases where only the normal Enter was handled 2017-06-15 23:06:28 +02:00
EVAST9919
5117baae66 Make random works with panels too 2017-06-15 06:37:20 +03:00
Dan Balasescu
5a1edaa93c Merge branch 'master' into cancel-select-random 2017-06-14 14:11:45 +09:00
smoogipooo
99a93d98dc Merge remote-tracking branch 'origin/master' into fix-hacky-tabs 2017-06-13 19:46:01 +09:00
Dean Herbert
3ca80eb149 Add readonly 2017-06-13 15:54:26 +09:00
Dean Herbert
3efe8629d6 Fix hacky tabs 2017-06-12 18:39:22 +09:00
Dean Herbert
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
EVAST9919
e552c39444 change function to a property 2017-06-11 22:04:35 +03:00
EVAST9919
c3f4b1b3cb Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-11 21:56:55 +03:00
Dean Herbert
a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Dean Herbert
e3403c619c Merge branch 'better-invalidations' into update-framework 2017-06-08 19:46:19 +09:00
Dean Herbert
64682a741c Update framework 2017-06-08 17:05:25 +09:00
Tom94
5f7270ee4b Use new invalidation rules 2017-06-08 09:53:45 +02:00
John Neijzen
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
John Neijzen
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
John Neijzen
f9c466eee9 bit more readable 2017-06-07 20:12:16 +08:00
John Neijzen
23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
EVAST9919
78500eec21 Applied suggested changes 2017-06-05 12:24:28 +03:00
EVAST9919
6b9d5afc4b Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-05 11:51:45 +03:00
Dean Herbert
5568df1aee Remove StandardHUDOverlay
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.

We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00
Dean Herbert
2712f49545 Remove bad 2017-06-05 17:06:47 +09:00
Dean Herbert
958cd9f8d8 Don't display in-game
Nothing does anything yet, so we can't display this. Make it functional before adding to game project.
2017-06-05 16:52:09 +09:00
Dean Herbert
af6f8bbd89 Fix namespaces and class names 2017-06-05 16:47:42 +09:00
Dean Herbert
c3c56820fa Fix lots of small issues 2017-06-05 16:43:23 +09:00
Dean Herbert
0cb1df35e9 Merge remote-tracking branch 'upstream/master' into ingame_options 2017-06-05 14:53:37 +09:00
EVAST9919
a42c67ee97 Cancel beatmap random selection 2017-06-01 20:54:42 +03:00
Patrick Andersson
94294e4b45 Changed default selection type and added suggestions from PR feedback 2017-06-01 08:54:48 +02:00
Patrick Andersson
a3945bb11d Added suggestions by code inspector 2017-05-31 22:04:29 +02:00
Patrick Andersson
9592e9778b Trim whitespace 2017-05-31 20:31:05 +02:00
Patrick Andersson
1dd85b5986 Add alternative for random beatmap selection
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
2017-05-31 20:11:26 +02:00
EVAST9919
8cde50a88a Merge branch 'master' of https://github.com/ppy/osu into ingame_options 2017-05-31 08:23:06 +03:00
Dan Balasescu
d90006b229 Merge branch 'master' into update-framework 2017-05-31 13:01:17 +09:00
Dean Herbert
40312080f7 Merge branch 'master' into playsongselect-exit-fix 2017-05-31 11:14:41 +09:00
Dean Herbert
61fb5d6ac8 Add issue URL to comment 2017-05-31 11:04:18 +09:00
Dean Herbert
b61452024a Add comment 2017-05-31 11:02:26 +09:00
DrabWeb
e708cdf41a Level Range -> Range Range, don't use empty object initializers 2017-05-30 22:34:02 -03:00
DrabWeb
a483422b44 CI fixes 2017-05-30 22:23:00 -03:00
DrabWeb
7ba32f2021 Cleanup 2017-05-30 22:11:45 -03:00
DrabWeb
185a4c4d2e Unused usings 2017-05-30 22:00:27 -03:00
DrabWeb
9e01074852 Add GameType and DrawableGameType 2017-05-30 21:41:20 -03:00
DrabWeb
d331aa3b30 Fix random layout animations when loaded 2017-05-30 20:02:05 -03:00
DrabWeb
b97691100f Add ruleset_height to remove magic numbers 2017-05-30 19:53:06 -03:00
DrabWeb
5d6534031e Proper cover loading 2017-05-30 19:35:37 -03:00
DrabWeb
774d37a058 Add transition_duration, remove testing DifficultyIcon 2017-05-30 19:13:05 -03:00
Dean Herbert
8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
EVAST9919
4b624ced36 CI fixes 2017-05-30 12:31:56 +03:00
EVAST9919
e737ded382 Applied suggested changes 2017-05-30 12:23:53 +03:00
smoogipooo
7416952eb3 Fix usings. 2017-05-30 17:36:42 +09:00
DrabWeb
3aa1f35127 Basic layout 2017-05-30 05:12:11 -03:00
smoogipooo
72fa50f944 Make replay settings match design colours. 2017-05-30 17:02:04 +09:00