RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,846 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

7846 Commits

Author SHA1 Message Date
smoogipoo 074a1db4a1 Implement scrolling and better zoom 2017-10-10 12:45:27 +09:00
TocoToucan cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03:00
TocoToucan ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00
TocoToucan 41a90c8b11 Add missing eager loading 2017-10-09 23:28:28 +03:00
EVAST9919 d1f02538cb Add tooltip to username in the profile overlay 2017-10-09 21:12:04 +03:00
Dean Herbert d5892cf54e Add a bool to specify whether judgements should be visible for certain DrawableHitObjects 2017-10-09 20:17:05 +09:00
Huo Yaoyuan 994959fd77 Merge branch 'master' into spm-counter 2017-10-09 19:05:30 +08:00
Dean Herbert 26215b4488 Create an abstract base class for drawable catch objects 2017-10-09 19:42:55 +09:00
smoogipoo 29c2a29798 Fix trimming too early in OsuLegacyDecoder crashing storyboards 2017-10-09 18:47:12 +09: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
Dean Herbert 222d0c8694 Fix visual regressions in MedalOverlay 2017-10-09 17:52:48 +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
TocoToucan 5d27c66efa Use one DbContext with configured CommandTimeout for all stores 2017-10-08 18:18:28 +03:00
Dan Balasescu b1a2da58bc Merge pull request #1339 from sunghwan2789/decoder-improve 
Trim end of line
 2017-10-08 19:07:04 +09:00
Bang Sunghwan bd9f2db477 Trim line 2017-10-08 17:30:21 +09:00
Bang Sunghwan 6c5c734ff1 Trim end of line 
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
 2017-10-08 09:42:09 +09:00
Huo Yaoyuan 09093013a7 Move spm calculation into counter. 2017-10-07 15:58:53 +08:00
Huo Yaoyuan a876ab9b90 Move spm counter to a seperated control. 2017-10-07 15:31:42 +08:00
Jorolf f3ca6cc387 remove redundant stuff 2017-10-06 22:02:33 +02:00
Jorolf de2181b8f5 Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-10-06 21:02:48 +02:00
Jorolf 5a8b8dacbb move stuff thats duplicated in PreviewButton and DirectPanel to PlayButton 2017-10-06 21:02:00 +02:00
Dean Herbert 3b6596b609 Merge branch 'master' into spm-counter 2017-10-07 01:10:57 +08:00
Dean Herbert c22e1520a0 Merge pull request #1337 from smoogipoo/editor-screens 
Initial implementation of editor screens
 2017-10-07 01:09:04 +08: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 3557737a18 Update framework 2017-10-06 23:20:56 +08:00
Dean Herbert 55267abe67 Merge branch 'master' into editor-screens 2017-10-06 23:19:16 +08:00
Huo Yaoyuan 404c4917dc Use single queue for spinning record. 2017-10-06 20:42:24 +08:00
Dean Herbert 54a98a74bc Merge branch 'master' into spm-counter 2017-10-06 16:03:02 +08:00
Dean Herbert 79fcfda10a Merge pull request #1279 from EVAST9919/break_overlay_take_three 
Initial implementation of the Break Overlay
 2017-10-06 13:09:31 +08: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
Huo Yaoyuan 29f9c8143d Use RotationAbsolute to calculate spm. 2017-10-05 20:08:45 +08:00
Huo Yaoyuan ee8746b848 Fade in spm texts. 2017-10-05 20:07:33 +08:00
Huo Yaoyuan 24187cc53a Move spm text out of scaled parts. 2017-10-05 19:55:20 +08:00
Huo Yaoyuan 0da66cfc7c Merge branch 'master' into spm-counter 2017-10-05 19:29:50 +08:00
Huo Yaoyuan 134e1299bb Update spm value when spinner not active. 2017-10-05 19:23:58 +08:00
smoogipoo 7926757898 Remove unneeded parens 2017-10-05 14:33:49 +09:00
smoogipoo 0a9d23b4ba Update with framework changes (removal of WaveformDisplay) 2017-10-05 14:33:39 +09:00
EVAST9919 2bc8fe027b Extend the testcase to test short breaks 2017-10-05 06:17:48 +03:00