|
|
6ff2b73c30
|
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
|
2017-07-19 16:50:29 +02:00 |
|
|
|
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 |
|
|
|
ef2770b718
|
Bypass commit in SearchTextBox regardless of Shift and Ctrl.
|
2017-07-18 17:40:34 +08:00 |
|
|
|
a0c4fcdb4b
|
Move xml doc to the right class.
|
2017-07-18 17:03:59 +08:00 |
|
|
|
87bcd526f3
|
Get rid of raw AddDelay calls within osu.Game
|
2017-07-17 16:51:21 +03:00 |
|
|
|
19fb03e737
|
Try different formatting style
|
2017-07-16 18:28:20 +03:00 |
|
|
|
032e9df67b
|
ApplyDelay -> AddDelay
|
2017-07-16 17:47:29 +03:00 |
|
|
|
99221260c4
|
Replace several usages of BeginDelayedSequence with LINQ-style
|
2017-07-16 17:42:01 +03:00 |
|
|
|
71105bb9ee
|
Delay -> ApplyDelay; DelayReset -> ResetDelay
|
2017-07-16 14:06:46 +03:00 |
|
|
|
6063219b72
|
Update framework
|
2017-07-16 13:59:26 +03:00 |
|
|
|
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 |
|
|
|
fd58c6e835
|
Nicer generic rolling counters
|
2017-07-14 19:14:07 +03:00 |
|
|
|
c73a1ae058
|
Use TransformTo in rolling counters
|
2017-07-14 16:46:00 +03:00 |
|
|
|
d2c18026f2
|
Removed unnecessary variables
|
2017-07-14 12:45:24 +02:00 |
|
|
|
00a622da1a
|
Let disabled icon buttons be interactive again
|
2017-07-14 12:31:12 +02:00 |
|
|
|
c053733ea9
|
Updated to use ppy's implementation
|
2017-07-14 12:09:55 +02:00 |
|
|
|
8e0d59bfed
|
Updated to use ppy's implementation
|
2017-07-14 12:08:56 +02:00 |
|
|
|
c02a85bc4a
|
Formatting
|
2017-07-13 13:52:40 +09:00 |
|
|
|
3a4150c6c3
|
Merge remote-tracking branch 'upstream/master' into profile
# Conflicts:
# osu.Game/Graphics/Containers/SectionsContainer.cs
|
2017-07-13 13:44:21 +09:00 |
|
|
|
9d523ea012
|
Update framework
|
2017-07-12 11:06:13 +09:00 |
|
|
|
fd4a054921
|
Merge branch 'master' into profile
|
2017-07-11 09:16:32 +08:00 |
|
|
|
e8ce3e16b0
|
Address CI concern
|
2017-07-10 12:52:29 +03:00 |
|
|
|
0e2dc9388a
|
More changes in-line with framework changes.
|
2017-07-10 12:55:47 +09:00 |
|
|
|
6f2b49dea8
|
Merge branch 'master' into profile.
|
2017-07-10 10:36:23 +08:00 |
|
|
|
7952e7caa9
|
Fix typos
|
2017-07-10 03:22:08 +09:00 |
|
|
|
2c8b8c3f9c
|
Update loop logic in line with framework changes
|
2017-07-09 18:23:34 +09:00 |
|
|
|
724e5aa99e
|
Merge master into better-input
|
2017-07-05 13:59:40 -07:00 |
|
|
|
cadc191602
|
Merge branch 'master' into profile
|
2017-07-02 22:03:30 +08:00 |
|
|
|
bb15bc0467
|
Use ReceiveMouseInputAt whenever possible
|
2017-06-30 09:54:03 +03:00 |
|
|
|
5c02f1812f
|
Remove now unneeded Contains overrides
|
2017-06-30 09:53:52 +03:00 |
|
|
|
f3f3952ba5
|
More unused usings
|
2017-06-29 12:20:05 -07:00 |
|
|
|
6865f9b231
|
Remove unused parameters
|
2017-06-29 12:05:37 -07:00 |
|
|
|
1e50840a8e
|
Fix unused usings
|
2017-06-29 12:04:04 -07:00 |
|
|
|
ee96d39b93
|
Shuffle sound samples around and make more conformant
|
2017-06-28 10:19:04 -07:00 |
|
|
|
480cdba023
|
Add OsuClickableContainer with generic sounds
|
2017-06-27 21:05:49 +09:00 |
|
|
|
684d188752
|
Adjust transition duration slightly
|
2017-06-26 16:26:43 +09:00 |
|
|
|
3bb6005dc9
|
Merge remote-tracking branch 'upstream/master' into profile
|
2017-06-26 16:26:35 +09:00 |
|
|
|
7baa2b7421
|
Fix CI issues
|
2017-06-25 14:46:59 +09:00 |
|
|
|
d24f78ea24
|
Merge branch 'master' into profile
|
2017-06-25 10:29:14 +08:00 |
|
|
|
cc71c10488
|
Merge branch 'master' into musiccontroller-canbeatmapchange
|
2017-06-24 12:26:40 +02:00 |
|
|
|
e3489928b7
|
Remove now obsolete InternalContains
|
2017-06-24 09:21:08 +02:00 |
|
|
|
b90c9bcacf
|
Merge branch 'master' into profile
|
2017-06-23 22:51:31 +09:00 |
|
|
|
a0e7751cd1
|
Merge branch 'master' into fix-invalid-depth
|
2017-06-23 14:48:12 +09:00 |
|
|
|
5dc0b87ef5
|
Apply some fixes for my own comments
|
2017-06-23 14:02:19 +09:00 |
|
|
|
8b07565025
|
Added test case usability, namings and bug fixes
|
2017-06-21 16:33:26 +02:00 |
|
|
|
67292a5dcf
|
Brought ITransform in line with framework changes
|
2017-06-21 12:27:45 +02:00 |
|
|
|
8ffd7b313b
|
Merge branch 'master' into musiccontroller-canbeatmapchange
|
2017-06-21 12:23:38 +02:00 |
|
|
|
7a9d430a28
|
Applied suggested changes
|
2017-06-21 12:17:59 +02:00 |
|
|
|
89986e8e77
|
Fix namespaces
|
2017-06-21 17:03:47 +09:00 |
|
|
|
45d3c2cd52
|
Merge branch 'master' into profile
|
2017-06-21 16:40:17 +09:00 |
|
