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

52 Commits

Author SHA1 Message Date
Dean Herbert 666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
Dean Herbert a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
smoogipoo d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert 612db31c38 Apply newline additions 2019-04-01 12:16:32 +09:00
Dean Herbert 2f5668f4e7 Fix remaining framework changes 2019-03-29 00:29:14 +09:00
Dean Herbert 0788a7e9f1
Merge branch 'master' into more-inspections 2019-02-28 14:32:57 +09:00
Dean Herbert 42be7857d1 Use expression body for property get/set where possible 2019-02-28 13:58:19 +09:00
Dean Herbert 26d53d06a9 Fix remaining issues 2019-02-28 13:31:40 +09:00
smoogipoo d61dfe888e Fix venera fonts not being correctly specified 2019-02-22 19:42:09 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
ekrctb b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb 50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb 99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo 28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
Dean Herbert 0f37758314 Update framework 2018-07-21 16:21:53 +09:00
ekrctb 55e0cd770d Use BypassAutoSizeAxes 2018-07-11 11:24:43 +09:00
Dean Herbert e5001b84bd Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter 2018-07-05 21:04:19 +09:00
Dean Herbert 6a80a21078 Tidy up escape handling 2018-06-29 21:06:38 +09:00
ekrctb 1ed6a672f2 Update volme control 
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
 2018-06-27 18:43:29 +09:00
smoogipoo 8a81fba1ea Other input states need to be considered for wheel bindings 2018-06-26 20:34:22 +09:00
Dean Herbert 563cb46b4a Update framework and other nuget dependencies 2018-06-26 12:10:56 +09:00
Dean Herbert 64eda27547 Update framework 2018-06-03 03:05:53 +09:00
Dean Herbert addb864d10 Allow help text to wrap 2018-05-14 19:56:03 +09:00
Dean Herbert ede4d6dd11
Merge branch 'master' into mapping-del 2018-05-14 10:58:58 +09:00
Dean Herbert a162453e9b Merge remote-tracking branch 'upstream/master' into joystick 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
 2018-05-13 00:11:17 +09:00
Dean Herbert 3de3bb31f8 Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del 2018-04-25 18:10:28 +09:00
aQaTL 1dc8986c22
Switched back to switch 2018-04-18 15:06:03 +02:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
aQaTL 90beff83f6
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width 2018-04-11 08:07:26 +02:00
aQaTL 38277bff35
Changed mapping of deleting key binding to shift+delete 2018-04-10 18:00:22 +02:00
aQaTL dbee936748
Allow mapping delete key via alt+delete key combination 2018-04-09 18:48:47 +02:00
smoogipoo c39fb9a200 Update with framework changes 2018-04-03 20:10:26 +09:00
smoogipoo e9ec544bf6 Implement joystick keybindings 2018-04-03 02:04:40 +09:00
Huo Yaoyuan b842f682eb Use Linq.Append and Prepend. 2018-04-02 12:06:34 +08:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
Dean Herbert 4f6263ef86 Make many internal classes and methods public 
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
 2017-11-21 12:06:16 +09:00
MrTheMake 1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
MrTheMake 89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert 70154d1036 Update usage of FadeEdgeEffect 
Improves the visual appearance of DirectPanels' shadows too.
 2017-08-25 14:58:19 +09:00
Dean Herbert c99ed6fd44 Add reset button 
Also fixes a regression causing multiple rows to be displayed for a single action
 2017-08-23 19:26:49 +09:00
smoogipooo a6266850d6 Make KeyBindingRow take a non-action enum. 2017-08-23 12:46:28 +09:00
Dean Herbert 97acff535d Tidy up conditionals 2017-08-22 18:21:00 +09:00
Dean Herbert ff8ad30127 Add support for binding mousewheel actions 2017-08-22 14:44:34 +09:00
Dean Herbert d6249e7a63 Add support for binding mouse buttons to actions 2017-08-18 20:01:41 +09:00
Thomas Müller 4ef1be3080 More localised key binding hover colour logic 2017-08-17 08:43:45 +09:00
Dean Herbert e64f455ff7 Escape to cancel, again 2017-08-16 23:01:10 +09:00
Dean Herbert 5ebec53970 Integrate key binding config with main settings 2017-08-16 22:56:32 +09:00