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

2028 Commits

Author SHA1 Message Date
Dan Balasescu
a2e45293d6
Merge branch 'master' into fix-result-screen 2017-11-20 18:18:08 +09:00
Brayzure
da30d76f9b Implement Score Processor Mod Interface
- Add a delegate whenever we want to register an additional fail condition
2017-11-20 02:15:29 -05:00
EVAST9919
ecc2877be6 Fix possible null and adjust timeline width 2017-11-20 09:29:26 +03:00
EVAST9919
9fe7ebc0ce Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-20 09:18:22 +03:00
Aergwyn
0b5614e4ee fix result screen not showing name of mapper 2017-11-18 22:12:15 +01:00
Dean Herbert
9325730f5d Fix leaderboard fadeout causing constant flow changes
Also cleans up logic significantly.
2017-11-19 00:53:59 +09:00
Dean Herbert
60778593c3 Make pressing space twice at main menu a bit smoother 2017-11-18 22:24:51 +09:00
Dean Herbert
b835f1b708
Merge branch 'master' into fix-main-menu-osu-logo 2017-11-18 21:53:04 +09:00
Brayzure
de4d8eb196 Implement Sudden Death and Perfect
- Two additional fail conditions
2017-11-18 01:28:09 -05:00
EVAST9919
4ee3a89c12 Remove using 2017-11-18 08:35:00 +03:00
EVAST9919
34d8f94f99 Add track timer 2017-11-18 08:24:09 +03:00
Dean Herbert
c2d1de34fc Fix logo not always returning to the correct state when rapidly changing menus
Fixes #1005 for real
2017-11-18 11:19:15 +09:00
EVAST9919
a741d6cea7 Fix incorrect score indexes in leaderboard 2017-11-18 04:46:02 +03:00
Dean Herbert
322dd1bd05 Rename variables to make more sense 2017-11-18 10:35:17 +09:00
Dean Herbert
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
Dean Herbert
c2b6e958f7 Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo 2017-11-18 10:28:00 +09:00
EVAST9919
58e7263108 CI fixes 2017-11-18 03:09:09 +03:00
EVAST9919
0b8fed4e5a Remove useless Dimention params 2017-11-18 01:51:23 +03:00
EVAST9919
7492ab6495 Use GridContainer to place the bottom bar objects 2017-11-18 01:48:50 +03:00
EVAST9919
0cad5a5ca3 Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed 2017-11-18 01:15:50 +03:00
EVAST9919
07e0aba01c Remove using 2017-11-17 14:10:13 +03:00
EVAST9919
1680c0905f Fix track tempo could be less than 1 on exiting the editor 2017-11-17 14:02:07 +03:00
EVAST9919
cc04d5bc61 Add all the objects to the PlaybackContainer 2017-11-17 13:35:41 +03:00
EVAST9919
d62da4334e Add and place all the bottom bar objects 2017-11-17 12:26:13 +03:00
Dean Herbert
8bd59ff0b3 Fix osu! logo occasionally being in the wrong state on entering the main menu 2017-11-17 17:40:10 +09:00
Dean Herbert
6c40cf08cc Optimise leaderboard display
Adds async loading support and cleans up the code quite a bit in the process.
2017-11-16 23:22:25 +09:00
Dean Herbert
62358c0b53
Merge branch 'master' into beatmap_scores 2017-11-16 00:45:17 +09:00
Dean Herbert
f912744acc Fix sizing of ModIcon 2017-11-16 00:15:27 +09:00
Dean Herbert
8011048540 Fix hard crash when clicking play button with no map selected
Resolves #1507.
2017-11-15 20:03:18 +09:00
Dean Herbert
eaf1a60fe1
Merge branch 'master' into beatmap_scores 2017-11-15 17:58:07 +09:00
EVAST9919
ea2fa5fa00 Fix wrong ratings calculations 2017-11-15 09:48:40 +03:00
EVAST9919
8688afecde Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-14 20:13:07 +03:00
smoogipoo
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
smoogipoo
cd8d7af9db Clean up a few warnings in preparation for net-standard 2017-11-14 13:06:25 +09:00
EVAST9919
d157e6baf1 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-13 16:02:44 +03:00
Dean Herbert
a2cb9d4086 Fix audio not playing during player loading
Regression due to changed audio initialisation logic.
2017-11-13 19:43:00 +09:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
Dean Herbert
ee3a5b38f4
Merge branch 'master' into performance-improvements 2017-11-13 13:50:57 +09:00
EVAST9919
51adea2a60 Convert text to a local variable 2017-11-13 05:58:19 +03:00
EVAST9919
89e9f84753 Add padding to the text container 2017-11-13 05:52:05 +03:00
EVAST9919
ec75837965 Replay speed setting visual improvements 2017-11-13 05:04:21 +03:00
Dean Herbert
11077546d1 Load logo async 2017-11-13 09:50:37 +09:00
EVAST9919
072e5db6ef Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores 2017-11-11 07:16:26 +03:00
Dean Herbert
7d4e1b6f22 Don't require a local storage variable for restoring playback speed 2017-11-11 13:03:46 +09:00
Dean Herbert
3142832693 Add precision to playback speed 2017-11-11 13:00:29 +09:00
EVAST9919
5bf756c3c6 Add DrawableTopScore 2017-11-11 06:54:52 +03:00
Dean Herbert
3d1d66d886
Merge branch 'master' into replay_speed 2017-11-11 10:41:38 +09:00
EVAST9919
4b21c83f35 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-11-10 17:24:26 +03:00
smoogipoo
5816d25358 Merge remote-tracking branch 'origin/master' into replay-rewinding 2017-11-10 22:19:17 +09:00
Dan Balasescu
89fd92c15b
Merge branch 'master' into menu-select-transition-improvements 2017-11-10 21:03:24 +09:00
Dean Herbert
49731f4c05 Remove unused parmeter 2017-11-10 19:32:09 +09:00
Dean Herbert
bd2de89918 Why weren't these fixed previously 2017-11-10 19:26:25 +09:00
Dean Herbert
4a5a293376 Merge branch 'master' into replay-rewinding 2017-11-10 19:08:13 +09:00
Dean Herbert
bc54d4dd4f Ensure we wait for audio track reset before proceeding with player execution 2017-11-10 18:32:15 +09:00
Dean Herbert
9e82fc21ac Improve transition when exiting song select
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
5eb94f7e68 Fix loader pushing children screens before it is displayed itself 2017-11-09 23:29:56 +09:00
Dean Herbert
724540ceaa Fix toolbar not appearing at main menu 2017-11-09 20:38:34 +09:00
Dean Herbert
598e1652dc Adjust timings 2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df Hide triangles during outro 2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2 2017-11-09 17:48:42 +09:00
Dean Herbert
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
Dean Herbert
e2005c4431 Add comment explaining necessity of AlwaysPresent for now 2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28 Adjust animation to designer-san's liking 2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1 Merge branch 'single-osu-logo' into intro-v2 2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
Dean Herbert
a8bacd1ed4 Remove unnecessary private method /shrug 2017-11-08 14:46:47 +09:00
Dean Herbert
7ad498cb29 Remove unused puzzle pieces 2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759 Add intro in to actual game 2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164 Add a test case which starts the game 2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10 Simplify restart process and defaults initialisation 2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7 Simplify more 2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291 Fix text alignment 2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269 Simplify more 2017-11-08 12:10:32 +09:00
Dean Herbert
89426e1c11 Simplify lines 2017-11-08 12:07:52 +09:00
Dean Herbert
7dcdf78608 Make bars and circles better 2017-11-08 12:06:22 +09:00
Dean Herbert
a72e798b85 bar -> line 2017-11-08 11:21:50 +09:00
Dean Herbert
97b238d084 Simplify intro sequence a bit more 2017-11-08 11:20:21 +09:00
Dean Herbert
552a361a24 Merge remote-tracking branch 'upstream/master' into intro-v2 2017-11-08 11:08:42 +09:00
Dean Herbert
5af2cc29f5
Merge branch 'master' into song_select_delete 2017-11-07 16:42:40 +09:00
smoogipoo
2fbd490626 Make RemainingTimeCounter into a Counter 2017-11-06 14:58:05 +09:00
EVAST9919
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
smoogipoo
3b189c1ffe Fix BreakOverlay not properly working with rewinding
In various ways:
* It wouldn't show up if rewound after the break was complete.
* The time would increase backwards if rewind happened during a break.
* Etc.
* Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.
2017-11-03 21:20:36 +09:00
Dean Herbert
3adcfa8c38 Many fixes 2017-11-03 17:54:35 +09:00
Dean Herbert
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
Dean Herbert
6a206c616b Update in line with framework changes 2017-11-03 14:34:12 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
9b2d41f4eb Fix quick retry looking bad 2017-11-02 21:52:01 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
15197b9a76 Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 16:57:59 +09:00
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete 2017-10-30 21:07:02 +09:00
EVAST9919
a7bcae4869 Add startup value for the slider 2017-10-26 15:18:06 +03:00
EVAST9919
08637253df Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-26 15:04:44 +03:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Dean Herbert
5001e9f264 Fix Hide/Restore/Delete etc. 2017-10-25 22:08:34 +09:00
Dean Herbert
26d8b67f25 Merge branch 'master' into config-slider-keyboardstep 2017-10-24 08:14:56 +09:00
Dean Herbert
dc9c474033 Move all TestCases to Testing project
This allows tests to successfully retrieve rulesets, as they are referenced.
2017-10-23 19:32:02 +09:00
Shane Woolcock
ea2934d92c Add KeyboardStep values for configuration options 2017-10-23 16:06:08 +10:30
Dean Herbert
f69fa0cf1f Fix selection after hiding all difficulties in a set 2017-10-20 11:16:56 +09:00
Dean Herbert
5d5ea5fb2e Fix all remaining db structure issues 2017-10-19 14:05:11 +09:00
Dean Herbert
a85de09c0f Fix beatmap carousel interactions with deletion when not yet displayed 2017-10-18 18:36:35 +09:00
Dean Herbert
2f3319552d Merge remote-tracking branch 'upstream/master' into EfCore 2017-10-18 11:43:37 +09:00
EVAST9919
bae91d7de7 Simplify gradient usage in Letterbox Overlay 2017-10-18 05:06:17 +03:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
Huo Yaoyuan
c2836a8393 Use format string for double instead of Math.Round. 2017-10-16 12:59:59 +09:00
Huo Yaoyuan
9b3676c562 Use format string for double instead of Math.Round. 2017-10-15 16:44:15 +08:00
EVAST9919
e3ce641ea0 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-15 00:15:25 +03:00
EVAST9919
f4428980a6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-15 00:10:15 +03:00
EVAST9919
24ca7a5119 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-15 00:09:50 +03:00
smoogipoo
9924f518b7 Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/BeatmapMetadata.cs
#	osu.Game/osu.Game.csproj
#	osu.Game/packages.config
2017-10-14 16:36:37 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
smoogipoo
b83d7cd4df Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs
#	osu.Game/Beatmaps/BeatmapInfo.cs
#	osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs
2017-10-14 12:38:59 +09:00
Dean Herbert
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
EVAST9919
6711331f66 Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-14 05:18:03 +03:00
EVAST9919
7a72f2e3f5 Make sure we restore the clock rate on exiting 2017-10-14 05:15:18 +03:00
EVAST9919
bdcc70e0bb Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-14 05:06:36 +03:00
EVAST9919
502940ddf3 Fix deleting last visible beatmap doesn't trigger selecting null beatmap 2017-10-14 05:05:38 +03:00
EVAST9919
583f8358b6 Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete 2017-10-14 04:32:12 +03:00
Dean Herbert
c0d64bf409 Use Gray instead of FromHex for grays 2017-10-12 22:19:29 +09:00
Dean Herbert
37fc69b9f7 Set a default zoom level that isn't the whole track 2017-10-12 22:19:02 +09:00
Dean Herbert
37b88d834e Adjust padding slightly 2017-10-12 22:10:37 +09:00
smoogipoo
ab62390336 Make TimelineButtons combined take up the full height of the timeline 2017-10-12 18:32:39 +09:00
smoogipoo
a6901c0a27 Change TimelineButton icon colour to white when hovered 2017-10-12 18:17:36 +09:00
smoogipoo
5ccfc1918e Hook up more bindables for hitobjects/hitsounds 2017-10-12 17:51:01 +09:00
smoogipoo
db672becbc Implement waveform checkbox 2017-10-12 17:50:51 +09:00
smoogipoo
3c35a7a6ae graph -> waveform 2017-10-12 17:37:40 +09:00
smoogipoo
4586877239 Implement magnification buttons 2017-10-12 17:31:21 +09:00
smoogipoo
de8f9325a3 Implement TimelineButton and use for the magnification buttons 2017-10-12 16:10:33 +09:00
smoogipoo
2844764e3c Hit Objects/Hit Sounds -> Hitobjects/Hitsounds 2017-10-12 15:37:45 +09:00
smoogipoo
e12fa49436 Integrate timeline into Compose 2017-10-12 15:37:00 +09:00
smoogipoo
6fbf52c3eb Remove unused usings 2017-10-12 15:32:18 +09:00
EVAST9919
7cff413ab0 Fix wrong beatmap selection in song-select menu on deleting selected beatmap 2017-10-11 20:25:12 +03:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
EVAST9919
28a594179f CI fixes 2017-10-10 21:03:35 +03:00
EVAST9919
15160f5116 Simplify the code by using more delayed sequences 2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4 Final adjustments 2017-10-10 20:20:49 +03:00
EVAST9919
a58e828f54 Timing adjustments 2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0 Use constants instead of magic numbers 2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98 No need to put a lot of stuff inside the big circular container 2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9 Rings timing adjustment 2017-10-10 15:02:43 +03:00
smoogipoo
1cf8c0284a Re-namespace a few classes 2017-10-10 15:22:39 +09:00
smoogipoo
166194e6b6 Further logic simplification 2017-10-10 15:09:26 +09:00
EVAST9919
9cad0ce2e9 Group transforms using delayed sequence
And some timing adjustments
2017-10-10 07:07:09 +03:00
smoogipoo
074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
EVAST9919
6fb8755a95 Use less masking for the ring 2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7 Remove ring's background field and adjust some timings 2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48 Change Ring type, use RelativeSizeAxes for Background/Foreground 2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01 CI fixes 2017-10-10 01:36:40 +03:00
EVAST9919
0baceaaf0d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-10 00:56:54 +03:00
smoogipoo
cb58a1371e Merge branch 'editor-waveform' into editor-waveform-timeline
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-10-09 18:10:52 +09:00
smoogipoo
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df Update in-line with framework 2017-10-09 17:18:11 +09:00
TocoToucan
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
EVAST9919
402531d04c Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 20:37:59 +03:00
smoogipoo
10abaa866b Put screens below the top and bottom bars of the editor 2017-10-07 01:56:11 +09:00
smoogipoo
c0b394811f Make compose mode the default
Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.
2017-10-07 01:46:54 +09:00
smoogipoo
d432ab7510 Reorder screen tab control items 2017-10-07 01:44:20 +09:00
smoogipoo
38ae9d905e Fix bindable binding to make the editor load a screen by default again 2017-10-07 01:42:45 +09:00
smoogipoo
837d1ba12e Remove rounded corners on the editor menu bar 2017-10-07 01:38:13 +09:00
smoogipoo
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
smoogipoo
a154ee3a89 Add File -> Exit to editor menu 2017-10-07 00:51:30 +09:00
smoogipoo
fc99860f4e Remove EditorMenuBarItem 2017-10-07 00:51:20 +09:00
Dean Herbert
19c663da11 Remove scale effect on editor screen switches 2017-10-06 23:41:49 +08:00
Dean Herbert
55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
EVAST9919
0ec7d2dcf6 Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-06 15:56:08 +03:00
EVAST9919
95ac4e9265 Remove useless using 2017-10-06 04:57:46 +03:00
EVAST9919
96fcc095eb Apply suggested shrinking bar changes 2017-10-06 04:49:16 +03:00
TocoToucan
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
EVAST9919
f8830e1b7c Animation adjustments 2017-10-05 21:37:37 +03:00
smoogipoo
0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
EVAST9919
5caca1d328 Don't use '#' in RankDisplay for now 2017-10-05 05:27:52 +03:00
EVAST9919
cb0dbc6d9e Fix shrinking bar lingering on the screen for too long 2017-10-05 05:23:18 +03:00
EVAST9919
cc99678a96 Remove useless usings 2017-10-05 05:09:23 +03:00
Dean Herbert
20bf0502ab Use scheduling rather than raw transform delays 2017-10-05 10:03:48 +08:00
EVAST9919
22a59d753b Make all the overlays IStateful 2017-10-05 04:38:13 +03:00
EVAST9919
cafacf20ff Add all the needed objects 2017-10-05 02:50:13 +03:00
EVAST9919
6fa45aafc6 Basic logic 2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
smoogipoo
dcd5cc6753 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 22:00:44 +09:00
smoogipoo
8427bb44d1 Implement basic layout for the compose screen ScrollableTimeline 2017-10-04 22:00:42 +09:00
smoogipoo
ea45452993 Allow resolution > 1 2017-10-04 21:57:46 +09:00
smoogipoo
1377f73b46 Multiply resolution before clamping 2017-10-04 21:57:29 +09:00
smoogipoo
8bc20a2545 Merge branch 'editor-waveform' into editor-waveform-timeline 2017-10-04 19:49:23 +09:00
smoogipoo
8a52fdc8fa Use a bindable for the current screen in EditorMenuBar
Replaces the current Action.
2017-10-04 19:37:17 +09:00
smoogipoo
34eede0d04 Re-namespace EditorScreenMode 2017-10-04 19:36:55 +09:00
smoogipoo
e2824d4732 Reduce harshness of scale for now
Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...
2017-10-04 19:26:26 +09:00
smoogipoo
357a467337 Implement design mode 2017-10-04 19:24:19 +09:00
smoogipoo
5ca4a2d2c8 Add some nullchecks to WaveformDisplay 2017-10-04 19:09:39 +09:00
smoogipoo
81960c7b48 CI fixes 2017-10-04 19:03:02 +09:00
smoogipoo
80e984f72d Update in-line with framework 2017-10-04 18:55:38 +09:00
smoogipoo
01c839eda7 Move WaveformDisplay into separate class and add some commenting 2017-10-04 17:51:28 +09:00
smoogipoo
cf44868bcd Give EditorScreen a Beatmap 2017-10-04 15:02:11 +09:00
EVAST9919
1c132938df Allow visibility can be toggled only if replay is loaded 2017-10-03 20:26:53 +03:00
EVAST9919
feb0b1852f Remove the dangerous function 2017-10-03 20:05:50 +03:00
EVAST9919
b94c78e993 Hide/Show Replay settings on pressing Ctrl+H 2017-10-02 19:33:58 +03:00
EVAST9919
4a298098c5 CI fixes 2017-10-02 18:19:55 +03:00
EVAST9919
c34cc07fda Remove default bindable from the config manager 2017-10-02 18:09:00 +03:00
EVAST9919
b6ed977e1e Fix hard crash and fix breaks have been initialized twice 2017-10-02 09:04:03 +03:00
EVAST9919
7052462863 Update inline with framework 2017-10-02 08:51:00 +03:00
EVAST9919
c2f487aa3e Add Rank as a property to the Score Processor 2017-10-02 05:56:38 +03:00
EVAST9919
5ce2723719 Don't use linq query 2017-10-02 05:12:56 +03:00
EVAST9919
6d97da8b19 Add replay speed adjustment 2017-10-02 04:42:38 +03:00
smoogipoo
7211dd2015 Remove unnecessary usings 2017-10-02 10:11:43 +09:00
smoogipoo
69b61a62a5 Implement base Compose screen 2017-10-02 10:09:21 +09:00
smoogipoo
af4c6276e4 Adjust transforms of EditorScreen 2017-10-02 10:09:10 +09:00
smoogipoo
91cede79c2 Mask the editor screens 2017-10-02 10:07:34 +09:00
smoogipoo
6018b4e5e4 Make EditorScreen a Container 2017-10-02 09:34:51 +09:00
smoogipoo
2a310f02bc modeContainer -> screenContainer 2017-10-02 09:27:27 +09:00
smoogipoo
c2d63eb0bd Add EditorScreen + screen changing functionality 2017-10-02 09:26:52 +09:00
smoogipoo
221902f4fe Restructure Editor construction 2017-10-02 09:26:16 +09:00
smoogipoo
7b1ef53f36 Expose a mode change event from EditorMenuBar 2017-10-02 09:24:25 +09:00
smoogipoo
8ed23a60e9 Remove items from the editor menu bar 2017-10-02 09:10:40 +09:00
EVAST9919
ac6c323f93 Clear all tasks and transforms when resetting Breaks 2017-10-02 00:44:57 +03:00
EVAST9919
b62f2437ac Don't allow counter became 0 2017-10-01 23:38:11 +03:00
EVAST9919
2f852d705e Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-01 23:10:49 +03:00
smoogipoo
21c6a63fa1 Use using for Description 2017-09-29 20:03:09 +09:00
smoogipoo
7b4348254c Don't use new 2017-09-29 20:02:55 +09:00
Dean Herbert
eed358a2c1 Merge branch 'master' into editor-screen-selection 2017-09-29 18:24:46 +08:00
smoogipoo
775e8bada5 Make the background bottom corners look nice with the new hover functionality 2017-09-29 15:13:38 +09:00
smoogipoo
b2eab1f435 Set the hover background colour as dictated by flyte 2017-09-29 15:09:56 +09:00
smoogipoo
6bb5210c7c Remove the parentSizedBox 2017-09-29 15:09:28 +09:00
EVAST9919
e7632b6e6f Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-28 14:44:31 +03:00
Dean Herbert
4eaf6b4b94 Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll 2017-09-28 00:14:04 +08:00
smoogipoo
95364d0173 No more box background 2017-09-27 22:15:11 +09:00
smoogipoo
ba8bf6cbd5 Add ScreenSelectionTabControl to EditorMenuBar 2017-09-27 22:01:53 +09:00
smoogipoo
545c375199 Update design of EditorMenuBar to match flyte's design more closely 2017-09-27 22:01:03 +09:00
Dean Herbert
e64860ad45 Fix test case not working as expected 2017-09-27 12:46:34 +08:00
Dean Herbert
faad3fc7d3 Arbitrarily move colour assignment 2017-09-27 12:40:32 +08:00
Dean Herbert
d5ed218488 Fix timeline sizes being updated potentially before the track has a length 2017-09-27 11:07:43 +08:00
Dean Herbert
7ad21d9a6d Simplify marker part construction 2017-09-27 11:07:23 +08:00
Dean Herbert
eae29820c0 Fix marker being cleared each beatmap change 2017-09-27 11:07:17 +08:00
Dean Herbert
708632bca8 Remove second unnecessary colour set 2017-09-27 10:06:36 +08:00
EVAST9919
c696f74578 Fix broken testcase and apply suggested changes 2017-09-27 01:10:48 +03:00
EVAST9919
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
Dean Herbert
7c70d3d2cb Merge branch 'master' into storyboard_integration 2017-09-26 20:19:26 +08:00
smoogipoo
10dbd68c1e Simplify null check 2017-09-26 20:11:45 +09:00
smoogipoo
c578509a20 Bind to the screen Beatmap instead of the game-wide Beatmap 2017-09-26 17:58:40 +09:00
smoogipoo
3937ebdc3d Add missing license headers 2017-09-26 15:58:30 +09:00
Dan Balasescu
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
smoogipoo
10e5fe40b2 A bit of cleanup 2017-09-26 15:51:45 +09:00
smoogipoo
5953c1084e Re-namespace SummaryTimeline 2017-09-26 15:45:27 +09:00
smoogipoo
85cb541fef Implement MarkerPart for the marker 2017-09-26 15:45:08 +09:00
smoogipoo
a1f88a17b1 Re-namespace and split out timeline parts from the SummaryTimeline 2017-09-26 15:44:40 +09:00
Dean Herbert
f129902ee0 Avoid nullrefs when data is not present 2017-09-25 23:35:02 +08:00