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

385 Commits

Author SHA1 Message Date
Lucas A d5d31282e5 Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes 2019-05-05 20:55:42 +02:00
Lucas A 5d4aa5a12e Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus 2019-05-02 20:51:19 +02:00
Lucas A 7e42068a14 Merge remote-tracking branch 'upstream/master' into user-status-wiring 2019-04-28 19:48:35 +02:00
Dean Herbert d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo 0bd35ab7bb Turn on warnings, resolve issues 2019-04-25 17:36:17 +09:00
David Zhao 6502e26d09 Add draw size invalidation to ZoomableScrollContainer 2019-04-19 16:21:15 +09:00
Lucas A da5d6cb1d4 Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap 2019-04-12 22:54:35 +02:00
smoogipoo 772bef91fa Merge remote-tracking branch 'Joehuu/master' into drawnode-composability 
# Conflicts:
#	osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
 2019-04-08 23:01:12 +09:00
Dean Herbert f1952c0816 Update font awesome usage 2019-04-02 19:55:24 +09:00
smoogipoo a56e29347f Adjust namespaces 2019-04-02 14:51:28 +09:00
Dean Herbert de80fc0eac Update icon usage to match framework changes 2019-03-27 19:29:27 +09:00
Dean Herbert baea7230bc Rename RulesetContainer to DrawableRuleset 2019-03-19 23:47:31 +09:00
Dean Herbert 5487b011d6 Fix some inspections rider isn't able to deal with automatically 2019-03-02 14:34:56 +09:00
Dean Herbert d10ad3c8a7 Fix warnings 2019-02-28 18:59:05 +09:00
Dean Herbert 5b53cf0961
Merge branch 'master' into hide-desktop-only-elements 2019-02-28 18:50:16 +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
Shane Woolcock ce17e37c74 Conditionally add some UI elements only on desktop 
Prevents crashes from trying to access features that are not applicable to mobile.
 2019-02-28 13:10:53 +09:00
Dean Herbert 367bc53a06 Revert some more instances of 'e' variable names 2019-02-22 20:15:25 +09:00
Dean Herbert 3015d40f8f
Merge branch 'master' into osu-fontusage 2019-02-22 18:09:23 +09:00
Dean Herbert 3fe4b8fd1c Update variable names 
Also cleans up some weird code
 2019-02-22 17:51:39 +09:00
smoogipoo d8c55bc729 Adjust namespaces 2019-02-21 19:05:52 +09:00
smoogipoo bca347427f Update with framework bindable changes 2019-02-21 18:56:34 +09:00
smoogipoo 4db5531e4b Replace copy-constructor/method with extension method 2019-02-20 19:32:30 +09:00
smoogipoo 0693ab8e7d Merge remote-tracking branch 'origin/master' into osu-fontusage 
# Conflicts:
#	osu.Game/Screens/Multi/Components/BeatmapTitle.cs
 2019-02-20 15:04:08 +09:00
smoogipoo a2aa3ec5cb Adjust sprite texts in-line with framework changes 2019-02-20 15:03:20 +09:00
Dean Herbert ca5c8d37d1 Use leased bindables 2019-02-01 16:44:06 +09:00
smoogipoo 91302ea0bc Merge remote-tracking branch 'origin/master' into iscreen 
# Conflicts:
#	osu.Game/Screens/Multi/Match/MatchSubScreen.cs
#	osu.Game/Screens/Multi/Multiplayer.cs
#	osu.Game/Screens/Multi/MultiplayerSubScreen.cs
#	osu.Game/Screens/OsuScreen.cs
#	osu.Game/osu.Game.csproj
#	osu.sln
 2019-01-29 21:21:36 +09:00
smoogipoo 7b1c1f3728 Move toolbar showing and overlay activation to OsuGame 
Now exposed through IOsuScreen.
 2019-01-28 15:42:06 +09:00
smoogipoo 8ea7ec6445 Convert everything to use IScreen 2019-01-24 19:47:44 +09:00
Dean Herbert 8617aaa2a7 Update licence header (and remove year) 2019-01-24 17:43:03 +09:00
Unknown 6eff79913b remove blank lines 2019-01-11 10:34:56 +01:00
smoogipoo 8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Roman Kapustin 4b5fc85875 Use Find instead of FirstOrDefault 2019-01-05 19:35:33 +03:00
smoogipoo bc3fcb87b7 Use input events rather than scene graph traversals 2018-11-30 15:47:55 +09:00
Dan Balasescu e83f6707bf
Merge branch 'master' into editor-keyboard-seek 2018-11-30 15:17:06 +09:00
Dean Herbert ab621bd873 Toggle pause in editor with spacebar 2018-11-30 14:58:09 +09:00
Dean Herbert 0ee5a5bdb4 Add support for keyboard seeking in the editor 2018-11-30 14:57:25 +09:00
smoogipoo f9f300b215 Fix drag breaking if scrolling while dragging 2018-11-26 16:08:56 +09:00
smoogipoo 56032a4522 Merge branch 'mania-selection-movement' into inter-column-movements 
# Conflicts:
#	osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
#	osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
 2018-11-26 11:45:48 +09:00
Dan Balasescu b446a73c0c
Add brackets 
Co-Authored-By: peppy <pe@ppy.sh>
 2018-11-23 10:06:06 +09:00
Dean Herbert 10047e6815 Adjust tick-based wheel control to be more correct 2018-11-22 20:13:40 +09:00
Dean Herbert a48c26d999 Fix precision scroll events being handled incorrectly by editor 2018-11-22 19:40:44 +09:00
smoogipoo f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
smoogipoo 55edeb095d SelectionBox -> SelectionHandler 2018-11-19 16:58:11 +09:00
smoogipoo 4cbda97b1e Move positional adjustment to SelectionBox 2018-11-16 17:12:24 +09:00
smoogipoo df7515b66f Pass all selected hitobjects to the selection blueprints 2018-11-15 21:01:09 +09:00
smoogipoo c963fc7cd2 Reduce chaining 2018-11-14 18:34:13 +09:00
smoogipoo 6d43baf4bf Make show/hide only invoked once each 2018-11-13 13:12:11 +09:00