1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 21:27:23 +08:00
Commit Graph

7112 Commits

Author SHA1 Message Date
Dean Herbert
ceead888b5 Merge branch 'master' into fix-spinner-ignoring-actions 2017-08-16 17:00:53 +09:00
Shane Woolcock
9448e2f192 Remove unnecessary OnMouseDown/Up from SpinnerDisc 2017-08-16 17:25:48 +09:30
Dean Herbert
89987229de Merge remote-tracking branch 'origin/is-alive' into key-config-settings 2017-08-16 15:49:43 +09:00
Dean Herbert
7d00365154 Update framework 2017-08-16 13:24:40 +09:00
Dean Herbert
a5007fc64f Fix some remaining usage of local InputManager instances 2017-08-16 13:07:18 +09:00
Dean Herbert
6ee4716ec5 Update framework 2017-08-16 12:39:18 +09:00
Dean Herbert
2c7f0629ef Merge remote-tracking branch 'upstream/master' into is-alive 2017-08-16 12:11:32 +09:00
Dean Herbert
c221472d6e Code tidy-ups 2017-08-16 01:19:21 +09:00
Dean Herbert
72eb082f91 Use .Equals 2017-08-16 01:14:37 +09:00
Dean Herbert
9c75df884f Add initial implementation of KeyConfiguration overlay 2017-08-16 00:17:33 +09:00
Dean Herbert
2bd0981738 Improve default key binding logic
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00
Dean Herbert
3bee36f6a2 Add index to Action column
Is used for default assignment
2017-08-15 23:59:06 +09:00
Dan Balasescu
5d07711cd4 Merge pull request #1111 from peppy/fix-skip-icons
Fix skip button icons not displaying correctly
2017-08-15 23:03:16 +09:00
MrTheMake
105048500a Made modString private and moved the beatmap assignment inside GetScoresRequest 2017-08-15 15:30:53 +02:00
MrTheMake
2c287e1348 CI and comment fix 2017-08-15 12:27:51 +02:00
MrTheMake
21ced32297 Formatted and commented the GetAllMods() function 2017-08-15 12:03:43 +02:00
Dean Herbert
143ff695ef Remove unused using statements 2017-08-15 17:44:04 +09:00
Shane Woolcock
9e5deb63d1 Fix spinner not handling left/right action bindings 2017-08-15 16:42:26 +09:30
Dean Herbert
6ded194c53 Remove all usage of DI to retrieve InputManager
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
a74ebdfe56 Update framework 2017-08-15 14:30:25 +09:00
Dean Herbert
97ac8e1a64 Update usages of IsAlive/IsLoaded in line with framework changes 2017-08-15 13:57:48 +09:00
Dean Herbert
70f148f0b4 Fix icons on skip button 2017-08-15 09:30:46 +09:00
MrTheMake
e908a3675e Formatted the GetAllMods() function 2017-08-14 18:24:54 +02:00
Dean Herbert
4da76cd98e Initial key configuration UI implementation 2017-08-14 22:31:35 +09:00
Dean Herbert
46bfa4db29 Load defaults, pass around live IEnumerable, add PK for updating 2017-08-14 22:31:23 +09:00
MrTheMake
5ed717ef86 Shortened GetAllMods() using LINQ 2017-08-14 15:16:22 +02:00
MrTheMake
920710e7d0 Assign a score's beatmap and cleanup to the Score class 2017-08-14 13:30:54 +02:00
Dean Herbert
7c9d6c9c83 Initial refactoring of key binding logic 2017-08-14 20:19:25 +09:00
Dean Herbert
dccefe1c0e Make the settings sidebar optional
Also removes an unnecessary secondary list of SidebarButtons by using generic containers.
2017-08-14 14:40:48 +09:00
naoey
381c709639 Fix selectorTab Depth if it's wonky when new tabs are added. 2017-08-14 10:11:34 +05:30
naoey
8dbbc623c7 Add next tab selection logic in game, make IsRemovable public.
- Don't clear DrawableChannel when unjoined
2017-08-14 10:11:30 +05:30
naoey
3b6ffadcc7 Renaming to match framework changes.
- IsClosable -> IsRemovable
- EasingTypes -> Easing
- Also remove all messages on a channel being un-joined
2017-08-14 10:11:25 +05:30
naoey
2ae3ce8b91 Add ability to close chat tabs. 2017-08-14 10:11:14 +05:30
Dean Herbert
66fa84a451 Make settings more modular 2017-08-14 13:09:59 +09:00
Dan Balasescu
384b8c0600 Merge pull request #1108 from peppy/fix-leaderboard-icons
Fix leaderboard icons not displaying correctly
2017-08-14 13:05:22 +09:00
Dean Herbert
c57c106b9d Merge branch 'master' into fix-leaderboard-icons 2017-08-14 12:54:54 +09:00
Dean Herbert
9e1ffa27dc Fix leaderboard icons not displaying correctly 2017-08-14 12:52:20 +09:00
Dan Balasescu
371917838f Merge pull request #1098 from MillhioreF/MillhioreF/fix_stable_import_errors
Fix or clarify various errors when importing from stable
2017-08-14 12:51:39 +09:00
Dan Balasescu
bdf064e6ee Merge branch 'master' into MillhioreF/fix_stable_import_errors 2017-08-14 12:40:35 +09:00
MrTheMake
718eefa362 Fixed wrong test case accuracy format 2017-08-14 01:16:19 +02:00
MrTheMake
6b1184e8af General formatting 2017-08-14 00:27:54 +02:00
MrTheMake
e54f659916 Suggested changes 2017-08-13 22:37:39 +02:00
MrTheMake
2f89fc432b Removed unused function 2017-08-13 20:28:30 +02:00
MrTheMake
81289db33b CI fix, fixed nullref and removed abstraction of GetAutoplayMod 2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7 Suggested changes 2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3 Fix nullref in the leaderboard's test case 2017-08-13 18:00:53 +02:00
MrTheMake
997d0c9053 CI fix 2017-08-13 17:45:46 +02:00
MrTheMake
4c2d7bf343 Parse the mods of a leaderboard's score 2017-08-13 17:41:13 +02:00
MillhioreF
e216bfcf10 Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way) 2017-08-13 00:40:05 -05:00
Shane Woolcock
d19c8f56be Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire 2017-08-13 15:03:01 +09:30