h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-16 18:27:31 +08:00
Code Issues Releases Wiki Activity
8,583 Commits 3 Branches 657 Tags 371 MiB
de7c571be3
Commit Graph

193 Commits

Author SHA1 Message Date
smoogipoo
de7c571be3 Merge remote-tracking branch 'origin/master' into netstandard 2017-11-22 19:46:17 +09:00
Dean Herbert
553a7947d7 Remove AsyncLoadWrapper dependence in MusicController 2017-11-21 12:42:28 +09:00
smoogipoo
aac41d2de6 Disable resharper inspections on case-by-case basis 2017-11-20 18:55:48 +09:00
smoogipoo
9cb9151811 Move origin + anchor outside of ctor 2017-10-10 16:00:11 +09:00
Dean Herbert
8d919e42c9 Fix nullref when loading MusicController VisualTest after Player VisualTest 2017-09-11 11:18:53 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
67b3cbce2f Fix beatmap background being disposed too early 
Causes weird transitions on the music controller
 2017-08-25 13:04:32 +09:00
Dean Herbert
36629f5207 Make ProgressBar usable in more places than just MusicController 2017-08-24 18:51:34 +09:00
MrTheMake
4d8e5898fd Updates according to the framework and formatting 2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa Merge branch 'master' into musiccontroller-canbeatmapchange 2017-08-01 11:54:05 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +02: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
4b4b03756a Don't use dodgy OnLoaded "event" 2017-07-18 15:37:58 +09:00
Dean Herbert
82217be988 Fix dodgy event clearing 
Also use local ariables where possible.
 2017-07-18 15:24:52 +09:00
Dean Herbert
c5d23daa6b Merge remote-tracking branch 'upstream/master' into remove-dragbar 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-07-18 13:44:23 +09: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
MrTheMake
c0fd4a765e Removed unused variable 2017-07-14 12:46:07 +02:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
a95339dc1d Removed the reopening of the playlist overlay 2017-07-14 12:37:56 +02:00
MrTheMake
c053733ea9 Updated to use ppy's implementation 2017-07-14 12:09:55 +02:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02:00
Dean Herbert
773ef26ce3 Make MusicController support disabled beatmap bindable 2017-07-11 18:38:49 +09:00
Dean Herbert
311c2aec1c Fix next track not automatically playing when music controller is not visible 2017-07-11 17:53:36 +09: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
Jai Sharma
6eaeba5a92 Merge branch 'master' into remove-dragbar 2017-07-06 20:14:08 +01: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
MrTheMake
0e1b49dff9 Applied suggested changes 2017-06-25 20:56:22 +02:00
Jai Sharma
e16b646014 Add readonly to fill 2017-06-24 09:14:55 +01:00
Jai Sharma
a327f49d68 Updating progressBar.EndTime is more thread safe 2017-06-23 18:24:46 +01:00
Jai Sharma
62aae899fa Fixed non-assigned MaxValue 2017-06-22 19:03:31 +01:00
Jai Sharma
73c004fb71 Removed DragBar from song progress 2017-06-22 17:42:29 +01:00
Jai Sharma
ce2242a979 Removed dragbar from MusicController 2017-06-22 16:32:50 +01:00
MrTheMake
3b2df5fa0f Renaming and smaller optimizations 2017-06-21 16:46:30 +02:00
MrTheMake
8b07565025 Added test case usability, namings and bug fixes 2017-06-21 16:33:26 +02:00
Marco Stephan
8ffd7b313b Merge branch 'master' into musiccontroller-canbeatmapchange 2017-06-21 12:23:38 +02:00
MrTheMake
7a9d430a28 Applied suggested changes 2017-06-21 12:17:59 +02:00
MrTheMake
70096b6c86 Bug fixes 2017-06-21 01:28:43 +02:00
MrTheMake
edd7fd585c Disable beatmap changing buttons when entering a screen that disallows changing the beatmap 2017-06-21 00:51:32 +02:00
MrTheMake
354f516779 Moved load condition and simplify list selection 2017-06-20 15:19:59 +02:00
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
MrTheMake
1b95991e40 Extended condition 2017-06-19 19:05:09 +02:00
MrTheMake
b4437329cc Removed redundant variable 2017-06-19 18:34:56 +02:00
MrTheMake
667e6a2d6b Applied suggested changes 2017-06-19 18:06:39 +02:00
MrTheMake
8bee06943b Removed ununsed variables 2017-06-19 16:33:08 +02:00
MrTheMake
cb8b3cb8fb CI fix 2017-06-19 16:31:45 +02:00
MrTheMake
73f2709a2d Move logic into PlaylistOverlay 2017-06-19 16:30:58 +02:00
MrTheMake
9cc5dc6c2b Only disallow changing the current track, not pausing or seeking it 2017-06-19 15:03:07 +02:00