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 |
|
Huo Yaoyuan
|
d5dc37ec62
|
Merge branch 'master' into profile
|
2017-06-11 23:41:08 +08:00 |
|
smoogipooo
|
0521d4b761
|
Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
# osu-framework
|
2017-06-10 17:26:16 +09:00 |
|
Huo Yaoyuan
|
3945d33adc
|
Make OsuTabControl.isEnumType static.
|
2017-06-09 19:04:29 +08:00 |
|
Huo Yaoyuan
|
798d8711b8
|
Refactor SectionsContainer to generic.
|
2017-06-09 16:24:19 +08:00 |
|