h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 15:17:28 +08:00
Code Issues Releases Wiki Activity
9,214 Commits 3 Branches 653 Tags 366 MiB
938c5feea4
Commit Graph

868 Commits

Author SHA1 Message Date
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
1fe273cbc0 Move GameplayCursor to osu! ruleset and make work with OsuActions 2017-08-10 18:37:41 +09:00
Jorolf
c877a5a8b7 update TestCase 2017-08-09 19:26:27 +02:00
Jorolf
8631c469fc add license header 2017-08-09 18:50:44 +02:00
Jorolf
7d7cfe5d92 Merge branch 'master' of git://github.com/ppy/osu into ranks-section 2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111 generalize the hover code 2017-08-08 23:11:46 +02:00
Dean Herbert
2ce30474ca Merge branch 'master' into spriteicon-invalidation-fix 2017-08-07 14:49:09 +09:00
smoogipooo
d0906d8232 Adjust xmldocs to conform to TransformableExtensions. 2017-08-07 14:20:56 +09:00
smoogipooo
2221797273 Add transform sequence support to IHasAccentColour. 2017-08-07 14:12:05 +09:00
smoogipooo
ce7d391f06 These method calls are impure. 2017-08-07 13:37:07 +09:00
smoogipooo
953cf5af58 Fix SpriteIcon invalidation causing game breakness. 2017-08-07 13:26:54 +09:00
Dean Herbert
8941c8658c Use nested containers for shadow 2017-08-07 09:50:04 +09:00
Dean Herbert
d7fede96ef Fix shadow on SpriteIcon being a bit off 2017-08-07 08:54:53 +09:00
Huo Yaoyuan
8843d97895 Remove depth setting in SectionsContainer and profile. 2017-08-05 18:01:10 +08:00
Huo Yaoyuan
62b3540fd6 Merge branch 'master' into fixes 2017-08-04 13:49:03 +08:00
Dean Herbert
a5a5c1a315 Remove debug code 2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4 Improve class xmldoc 2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd Add comment explaining why we use scale 2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e Derive from CompositeDrawable instead 
We need to expose EdgeEffect as it's used in places.
 2017-08-03 15:45:59 +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
Dean Herbert
256daeaf68 Rename variable 2017-08-02 11:56:29 +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
Huo Yaoyuan
df3f75b842 Merge branch 'master' into fixes 2017-07-31 17:51:34 +08:00
Dean Herbert
6a36fa7809 Make OsuButtons visually disable when not enabled 2017-07-28 12:58:03 +09:00
Dean Herbert
b64fe68233 Allow OsuColour.FromHex to support prefix #. 
Coincides with https://github.com/ppy/osu-web/pull/1373
 2017-07-27 18:03:35 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Huo Yaoyuan
e0b1057b87 Merge branch 'master' into fixes 2017-07-24 20:50:33 +08:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
598b3f051e Address CI concerns and update framework 2017-07-22 11:15:45 +02:00
Thomas Müller
0f2bcb2904 Update framework 2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Dean Herbert
451f92772a Merge branch 'master' into fixes 2017-07-20 19:46:50 +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
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
007b343854 Fix incorrect equality check when TimingPointAt returns a default T 2017-07-19 15:16:40 +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
Huo Yaoyuan
ef2770b718 Bypass commit in SearchTextBox regardless of Shift and Ctrl. 2017-07-18 17:40:34 +08:00
Huo Yaoyuan
a0c4fcdb4b Move xml doc to the right class. 2017-07-18 17:03:59 +08:00
Thomas Müller
7acff29bd3 Fix OsuTooltipContainer.PopIn not overriding PopOut transforms 2017-07-18 11:53:56 +03: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
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
6063219b72 Update framework 2017-07-16 13:59:26 +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
Thomas Müller
fd58c6e835 Nicer generic rolling counters 2017-07-14 19:14:07 +03:00
Huo Yaoyuan
26b36c08a3 Prefer ScrollTo in SectionsContainer. 2017-07-14 22:56:27 +08:00
Huo Yaoyuan
6cf36da389 Merge branch 'master' into profile 2017-07-14 22:52:19 +08:00
Thomas Müller
b5fbb26f8f Merge branch 'master' of https://github.com/ppy/osu into better-transforms 2017-07-14 16:46:18 +03:00
Thomas Müller
c73a1ae058 Use TransformTo in rolling counters 2017-07-14 16:46:00 +03:00
MrTheMake
d2c18026f2 Removed unnecessary variables 2017-07-14 12:45:24 +02:00
MrTheMake
00a622da1a Let disabled icon buttons be interactive again 2017-07-14 12:31:12 +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
Dan Balasescu
a6d917285a Merge branch 'master' into settings-improvements 2017-07-14 19:22:45 +10:00
Dean Herbert
b7612af20c Make comment different 2017-07-14 18:08:47 +09:00
Dean Herbert
b1d447bf71 Add missing access modifier 2017-07-14 07:05:39 +09:00
Dean Herbert
bfa6a9aa4e Add missing licence header 2017-07-14 06:43:33 +09:00
Dean Herbert
ce204b8e7b Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar 2017-07-14 06:23:07 +09:00
Dean Herbert
f4fd263671 Fix settings not offsetting scroll operations by fixed header content 2017-07-13 17:09:12 +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
b79e309c2f Don't lock scroll position of SectionsContainer header elements on negative scroll 
Feels better in all cases.
 2017-07-13 14:24:41 +09:00
Dean Herbert
c02a85bc4a Formatting 2017-07-13 13:52:40 +09:00
Dean Herbert
3a4150c6c3 Merge remote-tracking branch 'upstream/master' into profile 
# Conflicts:
#	osu.Game/Graphics/Containers/SectionsContainer.cs
 2017-07-13 13:44:21 +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
Dean Herbert
c8c1dcae28 Fix incorrect filename 2017-07-12 12:55:40 +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
Huo Yaoyuan
fd4a054921 Merge branch 'master' into profile 2017-07-11 09:16:32 +08:00
Thomas Müller
e8ce3e16b0 Address CI concern 2017-07-10 12:52:29 +03:00
Thomas Müller
d9b362489b Fix incorrect TimeUntilNextBeat and add TimeSinceLastBeat 2017-07-10 12:07:38 +03:00
Dean Herbert
0e2dc9388a More changes in-line with framework changes. 2017-07-10 12:55:47 +09:00
Huo Yaoyuan
6f2b49dea8 Merge branch 'master' into profile. 2017-07-10 10:36:23 +08:00
Dean Herbert
7952e7caa9 Fix typos 2017-07-10 03:22:08 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +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
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Thomas Müller
d68f17b697 Use tooltip and context menu containers as newly required 2017-07-06 15:15:12 +03:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Huo Yaoyuan
cadc191602 Merge branch 'master' into profile 2017-07-02 22:03:30 +08:00
Dean Herbert
043c7756f7 public -> protected 2017-07-01 07:09:26 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Thomas Müller
5c02f1812f Remove now unneeded Contains overrides 2017-06-30 09:53:52 +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
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
Dean Herbert
480cdba023 Add OsuClickableContainer with generic sounds 2017-06-27 21:05:49 +09:00
Dean Herbert
684d188752 Adjust transition duration slightly 2017-06-26 16:26:43 +09:00
Dean Herbert
3bb6005dc9 Merge remote-tracking branch 'upstream/master' into profile 2017-06-26 16:26:35 +09:00
Dean Herbert
7baa2b7421 Fix CI issues 2017-06-25 14:46:59 +09:00
Huo Yaoyuan
d24f78ea24 Merge branch 'master' into profile 2017-06-25 10:29:14 +08:00
Huo Yaoyuan
a187e50889 Unify usages of field and property. 2017-06-25 10:07:54 +08:00
Huo Yaoyuan
18295a9b97 Handle scrolling in SectionsContainer. 2017-06-25 10:06:54 +08:00
MrTheMake
cc71c10488 Merge branch 'master' into musiccontroller-canbeatmapchange 2017-06-24 12:26:40 +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
Dean Herbert
b90c9bcacf Merge branch 'master' into profile 2017-06-23 22:51:31 +09:00
Dean Herbert
a0e7751cd1 Merge branch 'master' into fix-invalid-depth 2017-06-23 14:48:12 +09:00
Dean Herbert
5dc0b87ef5 Apply some fixes for my own comments 2017-06-23 14:02:19 +09:00
MrTheMake
8b07565025 Added test case usability, namings and bug fixes 2017-06-21 16:33:26 +02:00
MrTheMake
67292a5dcf Brought ITransform in line with framework changes 2017-06-21 12:27:45 +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
Dean Herbert
89986e8e77 Fix namespaces 2017-06-21 17:03:47 +09:00
Dean Herbert
45d3c2cd52 Merge branch 'master' into profile 2017-06-21 16:40:17 +09:00
smoogipooo
b191d96aab CI fixes. 2017-06-21 11:35:19 +09:00
smoogipooo
fc0e44b214 Update framework. 2017-06-21 11:28:27 +09:00
MrTheMake
2db0466722 Readded color flash and simplify logic 2017-06-21 02:47:11 +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
paparony03
62dee59672 Shapes namespace 
Depends on https://github.com/ppy/osu-framework/pull/837
 2017-06-20 15:54:23 +10:00
smoogipooo
1d5c5a0a4d Fix an invalid depth operation. 2017-06-19 07:50:26 +09:00
Huo Yaoyuan
af4ddf8fbd Merge branch 'master' into profile. 2017-06-16 16:32:54 +08:00
Dean Herbert
f2cac17188 Merge branch 'master' into timingchange-rework 2017-06-16 17:04:43 +09:00
Huo Yaoyuan
fa98cfa9e5 Handle max==min in LineGraph. 2017-06-16 14:48:14 +08: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
Huo Yaoyuan
3ec5d774df Child control fixes. 2017-06-15 22:42:15 +08:00
Dan Balasescu
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
Huo Yaoyuan
1d85578bf5 Fix license header. 2017-06-15 07:29:32 +08:00
Huo Yaoyuan
ce67a28609 Merge branch 'master' into profile. 2017-06-15 02:31:51 +08:00
Huo Yaoyuan
78669a5941 Hover for rank history. 2017-06-15 02:17:48 +08:00
Huo Yaoyuan
3b64dfe0fd Update transform using masking. 2017-06-15 00:46:39 +08:00
Huo Yaoyuan
443e24716c Handle relative size at LineGraph level. 2017-06-14 22:00:22 +08:00
Huo Yaoyuan
190de76d9a Add LineGraph. 2017-06-14 20:37:07 +08:00
smoogipooo
99a93d98dc Merge remote-tracking branch 'origin/master' into fix-hacky-tabs 2017-06-13 19:46:01 +09:00
Huo Yaoyuan
9ceb4930e9 Merge branch 'master' into profile 2017-06-13 15:23:12 +08:00
Dean Herbert
19236dcd1e Merge branch 'improved-loading-animation' into nuget-update 2017-06-13 15:50:21 +09:00
Dean Herbert
700d6f9d38 Adjust appearance slightly 2017-06-13 15:27:47 +09:00
Dean Herbert
679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +09:00
Huo Yaoyuan
755d2737d0 Improve OsuTextFlowContainer with framework. 2017-06-13 02:58:10 +08:00
Huo Yaoyuan
c75e2909ee Expose AddTextAwesome for OsuTextFlowContainer. 2017-06-13 00:58:32 +08:00
Huo Yaoyuan
fcd137ced2 Add OsuTextFlowContainer. 2017-06-13 00:51:06 +08:00
EVAST9919
9f8c66b8c6 Forgot to add dropdown-like animation 2017-06-12 13:39:45 +03:00
EVAST9919
41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
EVAST9919
1711258038 Context Menu 2017-06-12 12:56:07 +03: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
Huo Yaoyuan
e311ac612c Merge branch 'master' into profile 2017-06-12 14:40:42 +08:00
Huo Yaoyuan
915f61a8f7 Rename to scrollContentContainer. 2017-06-12 14:39:49 +08:00
smoogipooo
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework 
# Conflicts:
#	osu-framework
 2017-06-12 13:09:02 +09:00
smoogipooo
157e0e569a Remove unused file. 2017-06-12 12:57:34 +09:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00