Dean Herbert
|
af61a524b5
|
Merge pull request #2034 from smoogipoo/restore-ruleset-tests
Restore nunit ruleset + waveform test cases
|
2018-02-15 00:12:39 +09:00 |
|
Dan Balasescu
|
c5b71d2cb7
|
Remove unused using
|
2018-02-14 23:15:34 +09:00 |
|
Dan Balasescu
|
9f7736fab3
|
Merge branch 'master' into restore-ruleset-tests
|
2018-02-14 22:48:29 +09:00 |
|
Dean Herbert
|
22192c4569
|
Merge pull request #2066 from ppy/osu/update-framework
Update framework with GameThread fixes
|
2018-02-14 17:55:14 +09:00 |
|
smoogipoo
|
115484741d
|
Capture -> Select
|
2018-02-14 17:54:43 +09:00 |
|
smoogipoo
|
a9d14eadac
|
Add clearSelection method
|
2018-02-14 17:53:04 +09:00 |
|
smoogipoo
|
20de3c421a
|
Update framework
|
2018-02-14 17:43:45 +09:00 |
|
smoogipoo
|
27c6f4ee83
|
Update framework
|
2018-02-14 14:41:06 +09:00 |
|
smoogipoo
|
344da5965c
|
Add a CaptureBox that encloses hitobjects from the drag selection
|
2018-02-14 14:38:37 +09:00 |
|
smoogipoo
|
fcbeb97a54
|
Merge remote-tracking branch 'origin/master' into editor-hitobject-movement
|
2018-02-14 14:08:36 +09:00 |
|
Dan Balasescu
|
44c9d14142
|
Merge pull request #2064 from peppy/drag-lenience
Fix drag handling in line with framework changes
|
2018-02-13 22:19:20 +09:00 |
|
smoogipoo
|
bf6c93e77e
|
Update framework
|
2018-02-13 21:50:46 +09:00 |
|
smoogipoo
|
bfb21d3d69
|
Merge remote-tracking branch 'origin/master' into drag-lenience
|
2018-02-13 21:39:28 +09:00 |
|
Dean Herbert
|
32d45ccdb4
|
Merge pull request #2044 from UselessToucan/PlayerResumeHotfix
Fix pressing escape quickly unexpectedly exiting gameplay
|
2018-02-13 20:51:19 +09:00 |
|
Dean Herbert
|
30581d03d2
|
Merge branch 'master' into PlayerResumeHotfix
|
2018-02-13 20:34:22 +09:00 |
|
Dean Herbert
|
d8224809e6
|
Merge pull request #2049 from sunghwan2789/default-approachrate
Fix ApproachRate not inheriting OverallDifficulty when it is undefined
|
2018-02-13 20:34:02 +09:00 |
|
Dean Herbert
|
86acc84988
|
Apply formatting
|
2018-02-13 20:23:51 +09:00 |
|
Dean Herbert
|
5ecb77fda7
|
Merge remote-tracking branch 'upstream/master' into default-approachrate
|
2018-02-13 20:23:01 +09:00 |
|
Dean Herbert
|
6f29cd35af
|
Merge branch 'master' into PlayerResumeHotfix
|
2018-02-13 20:21:45 +09:00 |
|
Dean Herbert
|
f4ddc0717b
|
Fix incorrect PlaylistItem drag handling
|
2018-02-13 20:08:59 +09:00 |
|
Dean Herbert
|
e2d11af4ef
|
Fix incorrect MusicController drag handling
|
2018-02-13 20:08:59 +09:00 |
|
Dean Herbert
|
58f20c3723
|
Merge branch 'master' into editor-hitobject-movement
|
2018-02-13 18:56:16 +09:00 |
|
Dan Balasescu
|
110cd02e20
|
Merge pull request #2054 from peppy/beatmap-import-simplification
Improvments to EF context handling and BeatmapManager
|
2018-02-13 18:51:51 +09:00 |
|
Dan Balasescu
|
8e9deb53fa
|
Merge branch 'master' into beatmap-import-simplification
|
2018-02-13 18:38:45 +09:00 |
|
Dan Balasescu
|
7bf5b837bc
|
Merge pull request #2057 from Aergwyn/fade-slider-ticks
Fade slider ticks with hidden mod
|
2018-02-13 18:14:43 +09:00 |
|
Dan Balasescu
|
2870b15c3f
|
Merge branch 'master' into fade-slider-ticks
|
2018-02-13 17:43:07 +09:00 |
|
Dean Herbert
|
179a151653
|
Merge branch 'master' into beatmap-import-simplification
|
2018-02-13 16:54:52 +09:00 |
|
Dean Herbert
|
5e9d0aaf5a
|
Merge pull request #2060 from ppy/osu/context-menu-delete-confirmation
Add confirmation dialog to Delete in beatmap context menu
|
2018-02-13 15:54:36 +09:00 |
|
Dean Herbert
|
8c42225646
|
Fix outdated xmldoc
|
2018-02-13 15:08:51 +09:00 |
|
Dean Herbert
|
50cdb03cd9
|
Don't dispose read contexts
|
2018-02-13 15:08:45 +09:00 |
|
Dean Herbert
|
ab34123ba8
|
Remove unnecessary class variable
|
2018-02-13 15:05:19 +09:00 |
|
Shane Woolcock
|
d603d032d5
|
Inlined delete beatmap dialog
|
2018-02-13 16:26:05 +10:30 |
|
Dean Herbert
|
3561326306
|
Remove fixed issue
|
2018-02-13 14:54:46 +09:00 |
|
Dean Herbert
|
e8e093d6f2
|
Fix incorrect xmldoc
|
2018-02-13 14:54:01 +09:00 |
|
Shane Woolcock
|
8d313486b3
|
Add a confirmation dialog to the Delete option in the beatmap context menu
|
2018-02-13 00:40:34 +10:30 |
|
Dean Herbert
|
a738664167
|
Add interface for database context factory
|
2018-02-12 23:10:05 +09:00 |
|
Dean Herbert
|
64cda9fd0f
|
Remove incorrect assert assumption
|
2018-02-12 22:16:09 +09:00 |
|
Dean Herbert
|
8b37fde15b
|
Only write when writes occur
Also add finaliser logic for safety. Also better threading. Also more cleanup.
|
2018-02-12 19:57:21 +09:00 |
|
smoogipoo
|
87baa6febd
|
Merge remote-tracking branch 'origin/master' into editor-pattern-adjustments
|
2018-02-12 19:08:13 +09:00 |
|
smoogipoo
|
bfedd1cee0
|
Remove nested container
|
2018-02-12 19:01:50 +09:00 |
|
smoogipoo
|
c3212d36ef
|
Remove handles for now (will be re-implemented)
|
2018-02-12 18:36:16 +09:00 |
|
smoogipoo
|
e10bb2db05
|
Unify SelectionLayer and HitObjectCapturer, rename SelectionBox
|
2018-02-12 18:35:01 +09:00 |
|
smoogipoo
|
20c0dee17d
|
Remove SelectionInfo
|
2018-02-12 18:22:52 +09:00 |
|
smoogipoo
|
ee168f9a77
|
Split out drag selection box from post-capture box
Cleans up a lot of code, removes handles for now.
|
2018-02-12 18:20:05 +09:00 |
|
Dean Herbert
|
edc3638175
|
DatabaseWriteUsage
|
2018-02-12 17:55:11 +09:00 |
|
smoogipoo
|
1adbe3585c
|
HitObjectSelectionBox -> SelectionDragger
|
2018-02-12 16:03:59 +09:00 |
|
smoogipoo
|
cfb2b3f1e8
|
Rework SelctionLayer to support click-selections
|
2018-02-12 16:02:42 +09:00 |
|
Dean Herbert
|
cc948d688f
|
Fix unrelated spacing issue
|
2018-02-12 15:39:13 +09:00 |
|
Dean Herbert
|
9ed05543d7
|
Fix post-test conditionals from being inverse of what we want to test
|
2018-02-12 15:39:00 +09:00 |
|
Dean Herbert
|
e54de0c267
|
Remove sqlite-net migration
Anyone that may have benefited from this already has.
|
2018-02-12 15:25:09 +09:00 |
|