1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 08:42:56 +08:00
Commit Graph

12086 Commits

Author SHA1 Message Date
smoogipoo
fbc50d6030 Merge master into editor-clock 2018-04-12 13:35:53 +09:00
Dan Balasescu
9e2494c57b
Merge branch 'master' into high-level-xmldoc 2018-04-12 12:59:37 +09:00
DrabWeb
0bede52381 Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places. 2018-04-11 16:22:27 -03:00
TocoToucan
d7812ab12e CursorOverrideContainer.ShowMenuCursor 2018-04-11 21:22:52 +03:00
TocoToucan
6a8f568f66 BeatmapContainer -> beatmapContainer 2018-04-11 16:32:58 +03:00
Dean Herbert
9793137bfa Add back app.manifest
Resolves #2380
2018-04-11 22:32:38 +09:00
TocoToucan
6cdfaffcf7 PaginatedBeatmapContainer.BeganPlayingPreview 2018-04-11 16:19:21 +03:00
Thomas Müller
62968bb4c7
Merge pull request #2379 from peppy/fix-crash-regression
Fix regression causing hard crash
2018-04-11 13:08:32 +02:00
Dean Herbert
903dd7a015 Fix regression causing hard crash
Regressed in #2373. My bad.
2018-04-11 19:24:19 +09:00
aQaTL
90beff83f6
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
aQaTL
38277bff35
Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
Dean Herbert
9e5e2c8863
Merge pull request #2373 from smoogipoo/fix-crossthread-imports
Fix all possible cases of crossthread import data races
2018-04-10 23:05:22 +09:00
naoey
d851446aca
Remove redundant anchor and use Show/Hide instead of FadeIn/Out. 2018-04-10 19:15:37 +05:30
Joseph Madamba
767ecb4422 Fix rank status 2018-04-10 00:11:53 -07:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id 2018-04-10 16:05:32 +09:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor 2018-04-09 21:41:54 +03:00
aQaTL
dbee936748
Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
smoogipoo
cea3e1c7f5 Remove now unnecessary approachcircle proxy disables
Prereqs:
- [ ] ppy/osu-framework#1505
2018-04-09 18:44:50 +09:00
tgi74000
82d9504cbf Changed relative position to [0, 1] 2018-04-09 09:02:32 +02:00
smoogipoo
b97c4e8b44 Fix all possible cases of crossthread import data races 2018-04-09 12:45:44 +09:00
smoogipoo
7e78b2e54e Remove TestCaseGamefield
Unused. Unneeded. We already have TestCaseAllPlayers and individual tests in all rulesets. Eventually we probably also want osu.Game.Tests to not reference ruleset projects anyway.
2018-04-09 11:37:03 +09:00
tgi74000
b40af0848f White space 2018-04-08 15:52:40 +02:00
tgi74000
58dbc63c6e Add HardRock position mangling for CatchTheBeat 2018-04-08 15:24:34 +02:00
Dean Herbert
421e9e0641 Add xmldoc to some high-level classes to explain their separation 2018-04-08 12:58:34 +09:00
TocoToucan
640be621ac Handle multiple song previews playing in different beatmap categories on profile 2018-04-07 13:29:46 +03:00
Dean Herbert
81981acc68
Merge pull request #2354 from peppy/manual-input-test-case
Create ManualInputManagerTestCase
2018-04-06 20:52:07 +09:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case 2018-04-06 20:42:08 +09:00
Dean Herbert
596b63f7df
Merge pull request #2353 from peppy/dynamic-assembly-update
Update AssemblyInfo in line with framework changes
2018-04-06 20:41:51 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update 2018-04-06 20:16:13 +09:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case 2018-04-06 20:07:07 +09:00
Dean Herbert
b91f538d5d
Merge pull request #2329 from smoogipoo/selectionlayer-rewrite
Rewrite editor selections to better handle selection and movement logic
2018-04-06 20:06:49 +09:00
smoogipoo
c80c1071e8 Update framework 2018-04-06 19:54:19 +09:00
Dean Herbert
ae2dce254a Rename TestCase 2018-04-06 19:53:34 +09:00
Dean Herbert
cd48cb1887 Add comment 2018-04-06 19:53:23 +09:00
smoogipoo
070e68f235 Give the test case clock an accurate IsRunning value 2018-04-06 19:14:04 +09:00
smoogipoo
e59124962c Remove re-instantiation of clock in EditorClockTestCase 2018-04-06 18:38:44 +09:00
Endrik
8ef5855e84
Fix typo 2018-04-06 12:38:17 +03:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect 2018-04-06 12:37:16 +03:00
smoogipoo
b238130fe4 DI beat divisors to test cases with editor clocks 2018-04-06 18:23:22 +09:00
smoogipoo
9e8490735f Fix Compose not binding to the editor's beat divisor 2018-04-06 18:22:24 +09:00
smoogipoo
248be8e35f HitObjectComposer no longer needs a beat divisor 2018-04-06 18:21:45 +09:00
smoogipoo
fdb3227fd7 Fix + cleanup testcases 2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4 Give editor a custom clock to handle seeking 2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383 Create ManualInputManagerTestCase
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
acbdbcc3df Update AssemblyInfo in line with framework changes 2018-04-06 13:17:26 +09:00
Dean Herbert
714326b606 Fix TestCase not working with dynamic compilation 2018-04-06 13:16:27 +09:00
Dean Herbert
5426432e46 Fix drag select crashing 2018-04-06 11:47:21 +09:00
Dean Herbert
32e8d93596 Fix selection changing when clicking overlapping hitobjects 2018-04-06 11:22:36 +09:00
Dean Herbert
24b9a8c983 Allow HitObjectMasks to handle drag events directly 2018-04-06 10:29:34 +09:00
Dean Herbert
b87a92dbf8
Merge branch 'master' into selectionlayer-rewrite 2018-04-05 21:09:04 +09:00