Dan Balasescu
|
4b7a053544
|
Merge branch 'master' into update-placement-more-often
|
2020-02-13 18:43:27 +09:00 |
|
Dean Herbert
|
d6263adb7b
|
Merge pull request #7806 from peppy/timeline-zoom-button-repeat
Add mouse down repeat support to timeline zoom buttons
|
2020-02-13 18:35:11 +09:00 |
|
Dean Herbert
|
24e7c3e11b
|
Merge pull request #7811 from smoogipoo/mod-expansion-types
Improve extensibility of mod display expansion
|
2020-02-13 18:34:46 +09:00 |
|
smoogipoo
|
d4f14e552a
|
Improve extensibility of mod display expansion
|
2020-02-13 18:05:53 +09:00 |
|
Dan Balasescu
|
c384e3cfc2
|
Merge branch 'master' into timeline-zoom-button-repeat
|
2020-02-13 18:04:36 +09:00 |
|
Dan Balasescu
|
d80e9550fb
|
Merge branch 'master' into timeline-zoom-button-repeat
|
2020-02-13 17:38:45 +09:00 |
|
Dan Balasescu
|
5a90e6f9b5
|
Merge branch 'master' into fix-blueprint-outside-container
|
2020-02-13 17:32:49 +09:00 |
|
Dean Herbert
|
03bf10f9a2
|
Remove unused using statement
|
2020-02-13 11:15:00 +09:00 |
|
Dean Herbert
|
487dd47c9e
|
Add mouse down repeat support to timeline zoom buttons
|
2020-02-13 11:14:09 +09:00 |
|
Dean Herbert
|
e34a24a063
|
Update placement blueprint more often for better display
|
2020-02-13 10:45:16 +09:00 |
|
Dean Herbert
|
2b6f99d404
|
Standardise placement blueprint creation and destruction
|
2020-02-13 10:12:56 +09:00 |
|
Dean Herbert
|
b65e839bd2
|
Simplify blueprints by removing visible state
|
2020-02-13 10:00:09 +09:00 |
|
Dean Herbert
|
0fe41fd50a
|
Fix blueprint showing even when mouse outside of container
|
2020-02-13 09:03:48 +09:00 |
|
Dan Balasescu
|
866b6bb058
|
Merge branch 'master' into fix-song-select-weirdness
|
2020-02-12 15:01:15 +09:00 |
|
Dean Herbert
|
2a67246b21
|
Ensure game is at main menu before performing exit on screen
|
2020-02-11 22:37:38 +09:00 |
|
Dean Herbert
|
8186f72507
|
Remove unused using
|
2020-02-10 17:12:45 +09:00 |
|
Dean Herbert
|
66fb72cd8a
|
Fix song select not showing active beatmap if it is filtered by local criteria
|
2020-02-10 16:59:54 +09:00 |
|
Dan Balasescu
|
bb15153f30
|
Merge branch 'master' into placement-display-in-timeline
|
2020-02-10 14:29:01 +09:00 |
|
Dan Balasescu
|
28cf5c7a59
|
Add accessor
|
2020-02-10 14:28:43 +09:00 |
|
Dean Herbert
|
84d9e3eda7
|
Merge branch 'master' into fix-accuracy-format
|
2020-02-08 11:37:03 +09:00 |
|
Dean Herbert
|
801e39a543
|
Improve xmldoc for PlacementObject
|
2020-02-08 11:35:27 +09:00 |
|
Bartłomiej Dach
|
9bfd3a1a63
|
Make PercentageBreakInfoLine use FormatAccuracy
|
2020-02-08 00:11:19 +01:00 |
|
TheWildTree
|
2770fb71b2
|
Use SortedStatistics where needed
|
2020-02-07 21:12:21 +01:00 |
|
Dean Herbert
|
91203c2b12
|
Merge branch 'master' into placement-display-in-timeline
|
2020-02-08 01:50:24 +09:00 |
|
Dan Balasescu
|
4ad20ccd8b
|
Merge pull request #7754 from peppy/screen-under-timeline
Make editor screens display below timeline
|
2020-02-08 00:47:20 +09:00 |
|
Dan Balasescu
|
e4c7b9ebc1
|
Merge branch 'master' into screen-under-timeline
|
2020-02-08 00:05:45 +09:00 |
|
Dan Balasescu
|
7c715937ca
|
Merge branch 'master' into skin-animation-frame-rate
|
2020-02-07 23:52:45 +09:00 |
|
Dean Herbert
|
2082948f9a
|
Make editor screens display below timeline
|
2020-02-07 18:23:59 +09:00 |
|
Dean Herbert
|
56a091674b
|
Add placement display to timeline
|
2020-02-07 18:04:10 +09:00 |
|
Dean Herbert
|
e08437c5dc
|
Track placement object in EditorBeatmap
|
2020-02-07 18:03:14 +09:00 |
|
Dean Herbert
|
e31d69c749
|
Add commit status to EndPlacement; call BeginPlacement on initial movement
|
2020-02-07 18:02:48 +09:00 |
|
Dean Herbert
|
b7996f91fc
|
Update the windows platform offset to match stable
|
2020-02-07 17:51:38 +09:00 |
|
Dean Herbert
|
7460018cd3
|
Move combo colours to GlobalSkinColours
|
2020-02-07 14:58:07 +09:00 |
|
Dan Balasescu
|
edf20e2c3e
|
Merge branch 'master' into lounge-ruleset-filtering
|
2020-02-06 15:35:26 +09:00 |
|
Dan Balasescu
|
8d12d820f1
|
Merge pull request #7734 from peppy/editor-slider-repeat
Add the ability to extend hold notes (spinners / sliders etc.) via timeline
|
2020-02-06 15:35:16 +09:00 |
|
Dan Balasescu
|
108de6ac56
|
Merge branch 'master' into editor-slider-repeat
|
2020-02-06 14:48:45 +09:00 |
|
smoogipoo
|
6ae0efa40d
|
Fix adjustment not working when dragged before object
|
2020-02-06 14:47:43 +09:00 |
|
smoogipoo
|
c138e3907e
|
Move methods below ctor
|
2020-02-06 14:35:45 +09:00 |
|
Dean Herbert
|
fd71a53717
|
Fix test regression
|
2020-02-06 14:28:09 +09:00 |
|
Dean Herbert
|
a84386ba01
|
Merge branch 'simplify-mp-subscreen-disables' into lounge-ruleset-filtering
|
2020-02-06 14:22:52 +09:00 |
|
Dean Herbert
|
81cadb7875
|
Simplify the way multiple subscreens handle their disable states via a custom stack
|
2020-02-06 14:22:01 +09:00 |
|
Dean Herbert
|
114fd967c1
|
Revert "Remove leasing at a Multiplayer screen level"
This reverts commit 304a071e39 .
|
2020-02-06 13:47:34 +09:00 |
|
Dean Herbert
|
d00b61de99
|
Merge branch 'master' into lounge-ruleset-filtering
|
2020-02-06 13:38:27 +09:00 |
|
Dean Herbert
|
e548a4b8dd
|
Fix missing bind causing regression in filter
|
2020-02-06 13:36:49 +09:00 |
|
Dean Herbert
|
94b6564b98
|
Merge branch 'master' into editor-slider-repeat
|
2020-02-06 13:16:39 +09:00 |
|
Dean Herbert
|
75eb9ca040
|
Merge pull request #7739 from peppy/fix-rooms-test-scene
Fix rooms test scene not displaying anything
|
2020-02-06 13:12:10 +09:00 |
|
Dean Herbert
|
061b8c389f
|
Fix null search string causing an exception
|
2020-02-06 13:03:04 +09:00 |
|
Dean Herbert
|
1dc7fc4a33
|
Fix case where playlist is empty
|
2020-02-06 13:01:48 +09:00 |
|
Dan Balasescu
|
38bf14a06c
|
Merge branch 'master' into editor-beatmap-component
|
2020-02-06 12:25:33 +09:00 |
|
Dean Herbert
|
a79d6ff27a
|
Change transition to better handle mass filter cases
|
2020-02-06 12:17:20 +09:00 |
|