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

1224 Commits

Author SHA1 Message Date
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
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
smoogipooo
72fa50f944 Make replay settings match design colours. 2017-05-30 17:02:04 +09:00
EVAST9919
08219ccb42 Applied suggested changes 2017-05-29 19:00:29 +03:00
Dan Balasescu
6918368afc Merge branch 'master' into ingame_options 2017-05-29 18:12:02 +09:00
Thomas Müller
a4903e62ba Merge branch 'master' into fix-nullrefs 2017-05-28 16:07:10 +02:00
Dean Herbert
d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
Dean Herbert
bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
EVAST9919
743dfcc130 More xmldoc and few Title text fixes 2017-05-28 00:56:11 +03:00
EVAST9919
b5a6d73104 Toogle visibility without ctrl pressed 2017-05-27 02:38:29 +03:00
EVAST9919
bedcf04043 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-27 02:25:03 +03:00