1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 01:37:52 +08:00
Commit Graph

4176 Commits

Author SHA1 Message Date
WebFreak001
063b606a12 Fix readonly warning 2017-05-03 18:48:17 +02:00
WebFreak001
008ff9d2f9 InputResample CursorTrail 2017-05-03 18:33:42 +02:00
Dean Herbert
f5981b1ab9 Merge pull request #699 from peppy/options-implementation
Confine mouse mode and more
2017-05-03 22:02:58 +09:00
Dean Herbert
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
Dean Herbert
c39b314ac2 Update framework. 2017-05-03 21:29:42 +09:00
Dean Herbert
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
Dean Herbert
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
Dean Herbert
8da5686007 Merge pull request #703 from smoogipooo/taiko-fixes
Fix taiko auto replay generation not working.
2017-05-03 11:30:02 +09:00
smoogipooo
4d27e0abb6 Oops i didn't save the solution. 2017-05-03 11:25:54 +09:00
smoogipooo
60c2e2a90a Fix taiko auto replay generation not working. 2017-05-03 11:22:09 +09:00
Dean Herbert
c8e5f8bd95 Merge pull request #696 from smoogipooo/custom-drawings-flags
Custom drawings flags
2017-05-03 09:41:01 +09:00
Dean Herbert
8825277656 Merge branch 'master' into custom-drawings-flags 2017-05-03 09:36:51 +09:00
Dean Herbert
a036b059e8 Use provided parameters to avoid a second lookup. 2017-05-02 21:40:06 +09:00
Dean Herbert
691742b828 Remove most options which have not yet been implemented. 2017-05-02 19:40:30 +09:00
Dean Herbert
f9de733128 Formatting. 2017-05-02 18:53:33 +09:00
Dean Herbert
d4045ee2c0 We only have one release stream, so let's unlock it. 2017-05-02 18:40:30 +09:00
Dean Herbert
57c2dd1f49 Fix options dropdown labels never being displayed. 2017-05-02 18:35:23 +09:00
Dan Balasescu
087f22e7ca Merge pull request #698 from peppy/music-controller-fixes
Music controller fixes
2017-05-02 18:04:53 +09:00
smoogipooo
8e88d86639 Fix naming confusion. 2017-05-02 18:00:37 +09:00
smoogipooo
f1f7a26dbd Fix incorrect inheritance. 2017-05-02 17:58:59 +09:00
Dean Herbert
a993790a66 Ensure all searchable terms are non-null non-empty. 2017-05-02 17:54:07 +09:00
Dean Herbert
1b0f353af3 Add support for framework-level mouse confining. 2017-05-02 17:45:42 +09:00
Dean Herbert
bef15fe637 Improve organisation of some options and config code. 2017-05-02 17:45:22 +09:00
smoogipooo
9ca8295149 Oops. 2017-05-02 17:09:16 +09:00
Dean Herbert
116e92a542 Remove silly platform specific logic. 2017-05-02 17:00:30 +09:00
smoogipooo
40d2fee1dc Split up adding of local store from the ctor. 2017-05-02 16:55:04 +09:00
smoogipooo
e2620e2840 Make Team not inherit Country. 2017-05-02 16:54:43 +09:00
Dean Herbert
46ae8bc86b Use value because we need to. 2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10 Base the music controller transform direction on relative indices in playlist. 2017-05-02 16:40:29 +09:00
smoogipooo
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
smoogipooo
9eaf6b3ccb Merge branch 'master' into custom-drawings-flags
# Conflicts:
#	osu-framework
2017-05-02 16:29:54 +09:00
Dean Herbert
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
Dean Herbert
57e63b9934 Merge pull request #697 from peppy/general-fixes
Update framework with new DI changes.
2017-05-02 15:41:29 +09:00
Dean Herbert
d06b3c898f Update framework with new DI changes. 2017-05-02 15:32:47 +09:00
smoogipooo
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
smoogipooo
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dan Balasescu
3604c3562a Merge pull request #694 from peppy/general-fixes
Set a sane default transform direction.
2017-05-02 11:51:19 +09:00
Dean Herbert
50909eaa39 Update framework (upstream testcase fix). 2017-05-02 11:44:37 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work.
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
Dean Herbert
b07af21202 Update framework. 2017-05-02 10:03:21 +09:00
Dan Balasescu
8caba36230 Merge branch 'master' into general-fixes 2017-05-02 09:50:35 +09:00
Dean Herbert
668566e73c Merge pull request #695 from ColdVolcano/intro-improvements
Fix startup crash caused by MenuMusic binding
2017-05-02 09:49:33 +09:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
b52781db73 Update README.md 2017-05-01 22:00:36 +09:00
Dean Herbert
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert
703ce259a9 Merge pull request #687 from DrabWeb/playlist
Playlist
2017-05-01 20:01:30 +09:00
Dean Herbert
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
Dean Herbert
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00