h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 22:27:25 +08:00
Code Issues Releases Wiki Activity
6,822 Commits 3 Branches 653 Tags 367 MiB
e83a554ffc
Commit Graph

76 Commits

Author SHA1 Message Date
smoogipooo
e83a554ffc Update CollectionsDropdown in line with framework 2017-08-25 15:58:09 +09:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager 
Uses GetContainingInputManager instead, as per framework changes.
 2017-08-15 14:30:50 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon 
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
 2017-08-03 14:36:21 +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
a55586f2ad FIx potential sequence of execution issues in PlaylistOverlay 2017-07-28 15:04:58 +09:00
Dean Herbert
e448f79154 Fix deleted beatmaps not correctly being removed from the playlist 2017-07-28 12:58:35 +09:00
Dean Herbert
5f53426a9a *Database -> *Store 
Welcome back BeatmapManager
 2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore 
Hide database functionality at a lower level in preparation from eventually making it private.
 2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
750d96be8f Merge branch 'master' into playlist-beatmaplist-sync 2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0 No need to dispose/unbind the delegates 2017-07-24 13:10:51 +08:00
Ben Pig Chu
76edcb4a67 Update playlist when adding or removing beatmap set 2017-07-23 14:21:10 +08:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-21 11:15:26 +02:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive 
Also immediately disposes WorkingBeatmaps on ValueChanged.
 2017-07-20 16:45:44 +09:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms 
# Conflicts:
#	osu-framework
 2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30 Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange 2017-07-19 16:50:29 +02:00
Dean Herbert
59416584c1 Don't show theme song in playlist 2017-07-19 15:16:35 +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
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
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
MrTheMake
8e0d59bfed Updated to use ppy's implementation 2017-07-14 12:08:56 +02: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
Marco Stephan
8ffd7b313b Merge branch 'master' into musiccontroller-canbeatmapchange 2017-06-21 12:23:38 +02:00
Dean Herbert
45d3c2cd52 Merge branch 'master' into profile 2017-06-21 16:40:17 +09: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
03c13620c8 Filter the playlist overlay's beatmap list 2017-06-20 02:12:05 +02:00
MrTheMake
b9cf0e47ee CI fix 2017-06-19 18:12:26 +02:00
MrTheMake
667e6a2d6b Applied suggested changes 2017-06-19 18:06:39 +02:00
MrTheMake
aec46a57c8 Restart the current track when pressing PREVIOUS or NEXT rather than doing nothing 2017-06-19 17:33:58 +02:00
MrTheMake
15a1dd14a6 CanChangeBeatmap -> CanBeatmapChange 2017-06-19 16:45:21 +02:00
MrTheMake
73f2709a2d Move logic into PlaylistOverlay 2017-06-19 16:30:58 +02:00
Huo Yaoyuan
fcd137ced2 Add OsuTextFlowContainer. 2017-06-13 00:51:06 +08:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
Dean Herbert
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
EVAST9919
8cde50a88a Merge branch 'master' of https://github.com/ppy/osu into ingame_options 2017-05-31 08:23:06 +03:00
Dean Herbert
8544b45443 Update in line with framework 2017-05-30 22:23:51 +09:00
Dan Balasescu
6918368afc Merge branch 'master' into ingame_options 2017-05-29 18:12:02 +09:00
Dean Herbert
d749fc516d Update focus handling in line with framework changes 2017-05-28 20:08:46 +09:00
EVAST9919
8c1437c51a Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-21 13:44:52 +03:00
DrabWeb
7485a78128 Update framework 2017-05-20 03:14:22 -03:00