1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 22:52:57 +08:00
Commit Graph

5641 Commits

Author SHA1 Message Date
DrabWeb
ca6a9b1b71 Inline cover 2017-05-24 04:21:34 -03:00
Dean Herbert
d0e280dbef Merge pull request #805 from DrabWeb/osu-direct
osu!direct (basic logic and layout)
2017-05-24 16:02:29 +09:00
DrabWeb
a7914dc1e8 Convert transition_duration to const 2017-05-24 04:00:39 -03:00
Dan Balasescu
56fc15ca9b Merge branch 'master' into taiko-visual-update 2017-05-24 15:51:26 +09:00
DrabWeb
7c6540b008 Cleanup status transition code 2017-05-24 03:49:06 -03:00
smoogipooo
7afa1766e1 Make HitExplosion circular again, keep it masked to the stage. 2017-05-24 15:48:47 +09:00
smoogipooo
56fe97a147 Make kiai hit explosions slightly more prominent. 2017-05-24 15:48:27 +09:00
smoogipooo
c29f4b2ee8 Fix weird glow + add small pre-beat transition. 2017-05-24 15:40:34 +09:00
Dean Herbert
45a964cebe Merge branch 'master' into osu-direct 2017-05-24 15:33:53 +09:00
smoogipooo
445b469e47 Use ligher hue instead of white. 2017-05-24 15:22:46 +09:00
DrabWeb
a25c504965 CI fixes 2017-05-24 03:08:48 -03:00
smoogipooo
4224143136 Add faint kiai explosion on the hit marker. 2017-05-24 14:56:07 +09:00
DrabWeb
72c9959215 resultCounts -> ResultAmounts 2017-05-24 02:40:34 -03:00
DrabWeb
ba2627d4e2 Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-24 02:40:00 -03:00
DrabWeb
e59c1879a2 Remove tabs 2017-05-24 02:38:55 -03:00
DrabWeb
4490596f5f Keep one object per file 2017-05-24 02:37:27 -03:00
smoogipooo
c25f995506 Merge remote-tracking branch 'origin/master' into taiko-visual-update 2017-05-24 14:21:16 +09:00
DrabWeb
b08668b6d9 Remove @ from to-be-localized strings 2017-05-24 02:19:45 -03:00
Dan Balasescu
6248f2ffd9 Merge pull request #843 from peppy/logo-beat-adjustments
Logo beat sync adjustments
2017-05-24 14:17:35 +09:00
Dean Herbert
5e01940770 Compare with private field 2017-05-24 13:43:10 +09:00
Dean Herbert
15ee2b802e Hide direct overlay when requested 2017-05-24 13:41:07 +09:00
Dean Herbert
03f9a86366 Add missing readonly 2017-05-24 13:29:12 +09:00
Dean Herbert
16d9a677d0 Add a low-end cutoff for scale adjust 2017-05-24 13:08:59 +09:00
Dean Herbert
a9d1e54c27 Adjust triangle movement based on amplitude 2017-05-24 13:08:54 +09:00
DrabWeb
2be1b00a76 Hide status bar when Status is null 2017-05-24 00:45:56 -03:00
DrabWeb
247d8e9b21 Replace "Connected as _" in login form with a UserPanel 2017-05-24 00:23:48 -03:00
Dean Herbert
4ee11764b8 Merge branch 'master' into osu-direct 2017-05-24 12:16:34 +09:00
Dean Herbert
03c745abc3 Merge pull request #841 from smoogipooo/controlpoint-rework
Fix negative beatIndex NewBeats not being correctly fired
2017-05-24 12:14:17 +09:00
Dean Herbert
c4916426f5 Merge branch 'master' into controlpoint-rework 2017-05-24 12:00:22 +09:00
Dean Herbert
5efe693e79 Merge pull request #833 from peppy/logo-beat
Animate osu! logo with playing beatmap
2017-05-24 11:56:22 +09:00
Dean Herbert
53f489b447 Remove using 2017-05-24 11:50:12 +09:00
Dean Herbert
b1bd88ae71 Merge branch 'master' into logo-beat 2017-05-24 11:41:02 +09:00
Dean Herbert
3af7f89a95 Merge pull request #812 from ColdVolcano/menu-flashes
Menu flashes
2017-05-24 11:40:53 +09:00
Dan Balasescu
90d54a6cfe Merge branch 'master' into logo-beat 2017-05-24 10:36:30 +09:00
Dean Herbert
87a2cc2004 Merge branch 'master' into menu-flashes 2017-05-24 10:10:29 +09:00
ColdVolcano
207d6e4ac3 Update to new syntax of OnNewBeat 2017-05-23 20:01:20 -05:00
ColdVolcano
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
Dean Herbert
a22e11df03 Merge pull request #842 from MrTheMake/songselect-fix
Fix song select scheduled beatmap change task not being canceled
2017-05-24 09:59:09 +09:00
Dean Herbert
dee6a1e2be Merge branch 'master' into songselect-fix 2017-05-24 09:45:34 +09:00
MrTheMake
24f64c8815 More formatting 2017-05-24 02:38:05 +02:00
MrTheMake
67774192dd Formatting fixes 2017-05-24 02:30:32 +02:00
MrTheMake
0616256bd0 CI fix 2017-05-24 02:23:52 +02:00
MrTheMake
09adb23591 Fix scheduled task not being canceled 2017-05-24 02:22:30 +02:00
DrabWeb
be1ae2bd8e Remove ??, value can never be null 2017-05-23 15:08:02 -03:00
Dean Herbert
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
smoogipooo
0a385055dc Remove Func<T>'d-ness. 2017-05-24 02:53:08 +09:00
DrabWeb
7a4b476121 Tab character 2017-05-23 14:46:23 -03:00
DrabWeb
aa9a636c3c Indentation 2017-05-23 14:42:57 -03:00
DrabWeb
7b9eacc213 CI fixes 2017-05-23 14:41:30 -03:00
DrabWeb
fbbcc80a3e Merge branch 'osu-direct' of https://github.com/DrabWeb/osu into osu-direct 2017-05-23 14:34:58 -03:00