Dean Herbert
|
e47faf4e85
|
Add a dummy beatmap provider for use in BeatmapInfoWedge
|
2017-07-19 15:16:33 +09:00 |
|
Thomas Müller
|
4d8261fe0b
|
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
|
2017-07-18 15:16:02 +03:00 |
|
Dean Herbert
|
b5035ec245
|
Merge branch 'master' into songselect-preview-fix
|
2017-07-18 13:05:03 +09:00 |
|
Thomas Müller
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
Thomas Müller
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
Thomas Müller
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
Thomas Müller
|
a5e610a7ba
|
Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
|
2017-07-14 19:18:12 +03:00 |
|
Dean Herbert
|
ce204b8e7b
|
Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar
|
2017-07-14 06:23:07 +09:00 |
|
Dean Herbert
|
de46f3ab07
|
Remove all unnecessary parenthesis where object initialisers are used
Enforces at CI.
|
2017-07-13 15:11:33 +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 |
|
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 |
|
Thomas Müller
|
4045083dcd
|
Update sorting comparers in line with framework changes
|
2017-07-11 21:21:58 +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 |
|
Thomas Müller
|
22a987f6cc
|
Update test cases to new framework and fix old crashes
|
2017-07-07 15:05:55 +03:00 |
|
Dean Herbert
|
724e5aa99e
|
Merge master into better-input
|
2017-07-05 13:59:40 -07:00 |
|
Thomas Müller
|
bb15bc0467
|
Use ReceiveMouseInputAt whenever possible
|
2017-06-30 09:54:03 +03: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 |
|
Dean Herbert
|
480cdba023
|
Add OsuClickableContainer with generic sounds
|
2017-06-27 21:05:49 +09:00 |
|
EVAST9919
|
127c473f3b
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
|
2017-06-25 23:38:39 +03:00 |
|
Thomas Müller
|
1bca9ca0e9
|
Update framework with better children list
|
2017-06-24 12:56:35 +02:00 |
|
Thomas Müller
|
e3489928b7
|
Remove now obsolete InternalContains
|
2017-06-24 09:21:08 +02:00 |
|
Thomas Müller
|
f5829860a2
|
Get rid of AlwaysReceiveInput
|
2017-06-23 18:02:24 +02:00 |
|
EVAST9919
|
be94163d21
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random
|
2017-06-22 04:28:47 +03:00 |
|
paparony03
|
62dee59672
|
Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
|
2017-06-20 15:54:23 +10: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 |
|
Dean Herbert
|
3ca80eb149
|
Add readonly
|
2017-06-13 15:54:26 +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 |
|
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
|
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 |
|
Dean Herbert
|
8544b45443
|
Update in line with framework
|
2017-05-30 22:23:51 +09:00 |
|
Dean Herbert
|
d749fc516d
|
Update focus handling in line with framework changes
|
2017-05-28 20:08:46 +09:00 |
|
Dean Herbert
|
4ee11764b8
|
Merge branch 'master' into osu-direct
|
2017-05-24 12:16:34 +09:00 |
|
Dean Herbert
|
dee6a1e2be
|
Merge branch 'master' into songselect-fix
|
2017-05-24 09:45:34 +09:00 |
|
MrTheMake
|
24f64c8815
|
More formatting
|
2017-05-24 02:38:05 +02:00 |
|
MrTheMake
|
67774192dd
|
Formatting fixes
|
2017-05-24 02:30:32 +02:00 |
|
MrTheMake
|
0616256bd0
|
CI fix
|
2017-05-24 02:23:52 +02:00 |
|
MrTheMake
|
09adb23591
|
Fix scheduled task not being canceled
|
2017-05-24 02:22:30 +02:00 |
|
Dean Herbert
|
0634a3a5c5
|
Merge branch 'master' into osu-direct
|
2017-05-23 17:33:20 +09:00 |
|
smoogipooo
|
3cdfd2eef5
|
Split ControlPoint into different types.
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
|
2017-05-23 14:03:40 +09:00 |
|
MrTheMake
|
e9c2b51012
|
Random the difficulty too
|
2017-05-22 01:59:10 +02:00 |
|
MrTheMake
|
5ef7451dba
|
Improved LEFTand RIGHT key behaviour
|
2017-05-22 01:53:36 +02:00 |
|
MrTheMake
|
4056338203
|
Remove unnecessary track starting
|
2017-05-21 21:35:49 +02:00 |
|
MrTheMake
|
0539584578
|
CI fix
|
2017-05-21 21:33:54 +02:00 |
|
MrTheMake
|
b543b1f9fc
|
Remove unnecessary restart
|
2017-05-21 21:20:59 +02:00 |
|
MrTheMake
|
6219b8e6dd
|
Fixed an error with looping
|
2017-05-21 20:27:41 +02:00 |
|
MrTheMake
|
974e8d1f82
|
Fix pressing up always goes to the first beatmap group difficulty, not the last
|
2017-05-21 19:27:34 +02:00 |
|
MrTheMake
|
9b87f5d8db
|
Reformating
|
2017-05-21 18:16:54 +02:00 |
|
MrTheMake
|
6d7f70d0ea
|
Fix CI warnings
|
2017-05-21 18:00:31 +02:00 |
|
MrTheMake
|
34653eb8c0
|
Fixed null references
|
2017-05-21 17:20:20 +02:00 |
|
MrTheMake
|
7db45cb58f
|
Moved the whole looping assignments inside PlaySongSelect
|
2017-05-21 17:09:56 +02:00 |
|
MrTheMake
|
ec213efc49
|
Trimmed whitespaces
|
2017-05-21 16:13:20 +02:00 |
|
MrTheMake
|
cc35cc281c
|
Fixed null reference in case there are no beatmaps
|
2017-05-21 16:10:10 +02:00 |
|
MrTheMake
|
48f4879157
|
Use the track's implemented looping algorithm to loop tracks in the song select screen
|
2017-05-21 15:57:41 +02:00 |
|
MrTheMake
|
043d1ed20a
|
Updated preload condition to handle special case
|
2017-05-21 14:08:04 +02:00 |
|
MrTheMake
|
662ea0ec2d
|
Repeat a beatmap's track if it has ended
|
2017-05-21 14:00:40 +02:00 |
|
MrTheMake
|
1546bbc66b
|
Updated preload condition.
|
2017-05-21 13:04:04 +02:00 |
|
MrTheMake
|
44cad4e0ac
|
Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen.
|
2017-05-21 03:04:12 +02:00 |
|
MrTheMake
|
33ebc8fd49
|
Trimmed more whitespaces
|
2017-05-20 22:23:49 +02:00 |
|
MrTheMake
|
97aadad113
|
Trimmed spaces.
|
2017-05-20 22:16:05 +02:00 |
|
MrTheMake
|
f76abe2329
|
Disallow clicking through the song select footer.
|
2017-05-20 22:13:23 +02:00 |
|
MrTheMake
|
306feb177a
|
Fix null pointer reference
|
2017-05-20 20:18:29 +02:00 |
|
MrTheMake
|
031fddc995
|
Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set.
|
2017-05-20 19:53:18 +02:00 |
|
Dean Herbert
|
0b987be600
|
Merge branch 'master' into osu-direct
|
2017-05-20 16:17:59 +09:00 |
|
DrabWeb
|
e030573436
|
Add ReverseDepthFillFlowContainer to remove code duplication
|
2017-05-19 23:44:36 -03:00 |
|
Dean Herbert
|
5ae3a7143e
|
Fix audio seeking when entering play mode in certain cases
Resolves #794
|
2017-05-19 13:23:11 +09:00 |
|
Dean Herbert
|
7bb38e927b
|
Fix song select reverting to first difficulty of current group on entering
|
2017-05-17 17:33:20 +09:00 |
|
Dean Herbert
|
cab12ee55a
|
Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed
|
2017-05-17 17:33:16 +09:00 |
|
nyaamara
|
a3e93afb37
|
Merge pull request #3 from ppy/master
cool
|
2017-05-16 16:57:45 -04:00 |
|
nyaamara
|
b22c84287a
|
Fix typo.
|
2017-05-16 16:54:33 -04:00 |
|
Dean Herbert
|
efab186384
|
Update namespaces in line with framework
|
2017-05-16 12:50:30 +09:00 |
|
Dean Herbert
|
622b155fda
|
OsuConfig -> OsuSetting
|
2017-05-15 10:56:27 +09:00 |
|
Dean Herbert
|
eaaba11586
|
Change all instances of options to settings where applicable
|
2017-05-15 10:55:29 +09:00 |
|
Dean Herbert
|
e096dd8126
|
Merge branch 'master' into fix-beatmap-population
|
2017-05-12 20:30:06 +09:00 |
|
Dean Herbert
|
a9b3f74218
|
Fix ruleset not always getting populated in a WorkingBeatmap
|
2017-05-12 20:05:44 +09:00 |
|
Dean Herbert
|
d2e066ca35
|
Move SearchTextBox to better namespace
Is being used in multiple places now.
|
2017-05-12 19:57:06 +09: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 |
|
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 |
|
Dean Herbert
|
6074cb5979
|
Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
|
2017-05-02 10:45:55 +09:00 |
|