RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,181 Commits 3 Branches 650 Tags 352 MiB
Commit Graph

927 Commits

Author SHA1 Message Date
Huo Yaoyuan 69270814d5 CI fixes. 2017-06-16 16:54:05 +08:00
Huo Yaoyuan af4ddf8fbd Merge branch 'master' into profile. 2017-06-16 16:32:54 +08:00
Huo Yaoyuan 43569d69a7 Update transforms. 2017-06-16 16:13:23 +08:00
smoogipooo ea87aca032 We no longer need to pass in the control point. 2017-06-16 13:12:36 +09:00
smoogipooo 874db28478 CI fixes. 2017-06-16 13:09:06 +09:00
smoogipooo c8a1933874 Implement proper expiry in test case. 2017-06-16 13:06:44 +09:00
smoogipooo 5bac0919f0 Remove gross autoSizingAxes and life time. 2017-06-16 13:00:08 +09:00
Huo Yaoyuan 53bd22cf9c Update usage design. 2017-06-15 20:06:17 +08:00
Huo Yaoyuan 13d9f3b9bb Move namespace and setup for DI. 2017-06-15 17:53:12 +08:00
Dan Balasescu 6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
Dean Herbert f07a31b2ca Make hitobjects a bit more visual 2017-06-15 15:17:05 +09:00
Dean Herbert 6679575c13 Add current time labels 2017-06-15 15:06:38 +09:00
Dean Herbert 021019648e Add labels to playfield area 2017-06-15 14:40:30 +09:00
Dean Herbert 149eaa64de Use a relative width definition 2017-06-15 14:36:41 +09:00
Dean Herbert cfb7e4f61a Tidy up testcase a bit 2017-06-15 14:16:47 +09:00
Huo Yaoyuan b37c3f8ce1 Some CI fixes. 2017-06-15 07:58:20 +08:00
Huo Yaoyuan f7a451ed82 Update test case. 2017-06-15 02:38:51 +08:00
Huo Yaoyuan 9ceb4930e9 Merge branch 'master' into profile 2017-06-13 15:23:12 +08:00
Dean Herbert 178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
Dean Herbert 679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +09:00
Dean Herbert 41d4aee4f5 Update nuget packages 
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
 2017-06-13 11:50:46 +09:00
EVAST9919 41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
EVAST9919 1711258038 Context Menu 2017-06-12 12:56:07 +03:00
smoogipooo 95db62c385 Remove unused using. 2017-06-12 17:32:28 +09:00
smoogipooo 56244e0134 Add small test case to demonstrate usage. 2017-06-12 17:31:24 +09:00
smoogipooo 921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
smoogipooo 4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
smoogipooo d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
Huo Yaoyuan 283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
smoogipooo cd435f7ec6 Merge remote-tracking branch 'origin/master' into timingchange-rework 
# Conflicts:
#	osu-framework
#	osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
 2017-06-09 03:37:55 +09:00
smoogipooo 8de6bdf340 Rewrite mania to use the new timing section stuff. 2017-06-09 02:43:48 +09:00
smoogipooo 55f238f6a9 Remove IHasTimeSpan, add rename to TimingSection. 2017-06-08 23:40:24 +09:00
John Neijzen 2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
John Neijzen 4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
John Neijzen 431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
DrabWeb 8006fab3c7 Merge https://github.com/ppy/osu into osu-direct-search 2017-06-07 09:56:13 -03:00
smoogipooo 1932b58663 g -> gravity + one more xmldoc. 2017-06-07 19:21:31 +09:00
smoogipooo 1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
smoogipooo 6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
Dean Herbert a07f6801da Merge remote-tracking branch 'upstream/master' into timingchange-rework 2017-06-07 18:39:27 +09:00
Dean Herbert 1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
Dean Herbert 5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
smoogipooo e3d10fc4d3 Update with more framework changes. 2017-06-06 15:52:35 +09:00
Huo Yaoyuan 7d4c5999f6 Add description in test case. 2017-06-05 21:20:04 +08:00
Huo Yaoyuan 8fa076b5d7 Merge branch 'master' into userpage 2017-06-05 21:14:46 +08:00
Huo Yaoyuan 428b44f7d9 UserPage -> Profile. 2017-06-05 21:07:57 +08:00
Huo Yaoyuan 1b8ef3bbbd Add test case for UserPage. 2017-06-05 21:05:01 +08:00
smoogipooo 4307242bb6 Update with framework changes. 2017-06-05 20:06:46 +09:00
Dean Herbert bf971f6613 Merge branch 'master' into social-browser 2017-06-05 19:16:28 +09:00
Dean Herbert af6f8bbd89 Fix namespaces and class names 2017-06-05 16:47:42 +09:00
Dean Herbert 0cb1df35e9 Merge remote-tracking branch 'upstream/master' into ingame_options 2017-06-05 14:53:37 +09:00
smoogipooo a3299809fe Merge remote-tracking branch 'origin/master' into timingchange-rework 
# Conflicts:
#	osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
 2017-06-05 10:19:53 +09:00
Thomas Müller 0afb188cde Remove unused using 2017-06-03 20:05:51 +02:00
Thomas Müller 04925594ca Merge branch 'master' into separate-skip 2017-06-03 17:45:57 +02:00
Thomas Müller d498a4a022 Trim whitespace 2017-06-03 17:45:44 +02:00
Thomas Müller 8cd2f509ef Move skip button into its own test, because it is no longer two-layered 2017-06-03 17:33:24 +02:00
Thomas Müller 3daae480d2 Remove TestCaseTooltip 2017-06-03 17:28:34 +02:00
Jorolf a43890ffb4 update osu to use the framework's TooltipContainer 2017-06-03 14:50:35 +02:00
smoogipooo 7022c8d496 Move timing change stuff to osu.Game project. 2017-06-02 20:17:44 +09:00
smoogipooo 1d3f5d8649 CI fixes. 2017-06-02 18:19:21 +09:00
smoogipooo 264bf17bc2 Significantly reduce test case time. 2017-06-02 18:11:06 +09:00
smoogipooo a96c259a8e Fix up test case. 2017-06-02 18:07:45 +09:00
smoogipooo 1da5d508fa aaaaa 2017-06-02 11:35:51 +09:00
DrabWeb 212b2c1142 Initial layout and animation 2017-06-01 04:45:46 -03:00
smoogipooo d30706f640 Move drawable timing changes to Timing/Drawables. 2017-06-01 15:13:52 +09:00
smoogipooo f612914e87 Initial rewrite of timing changes to allow them to be more extensible. 2017-06-01 14:26:21 +09:00
DrabWeb c9403c5200 Incorrect test data spelling 2017-05-31 21:32:50 -03:00
DrabWeb e708cdf41a Level Range -> Range Range, don't use empty object initializers 2017-05-30 22:34:02 -03:00
DrabWeb ecece2bc29 "Use" object initializers in visual test 2017-05-30 22:28:15 -03:00
DrabWeb 9e01074852 Add GameType and DrawableGameType 2017-05-30 21:41:20 -03:00
DrabWeb 5d6534031e Proper cover loading 2017-05-30 19:35:37 -03:00
EVAST9919 e737ded382 Applied suggested changes 2017-05-30 12:23:53 +03:00
smoogipooo 7416952eb3 Fix usings. 2017-05-30 17:36:42 +09:00
DrabWeb 3aa1f35127 Basic layout 2017-05-30 05:12:11 -03:00
smoogipooo 72fa50f944 Make replay settings match design colours. 2017-05-30 17:02:04 +09:00
EVAST9919 08219ccb42 Applied suggested changes 2017-05-29 19:00:29 +03:00
Dean Herbert 5e4558cc54 Merge branch 'master' into social-browser 2017-05-29 18:35:22 +09:00
Dan Balasescu 6918368afc Merge branch 'master' into ingame_options 2017-05-29 18:12:02 +09:00
Dean Herbert 4a0c8fb5dd Merge branch 'master' into breadcrumbs 2017-05-29 15:59:37 +09:00
smoogipooo 27d6cb6275 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-29 10:57:49 +09:00
Seth 0e087994a1 Merge branch 'master' into social-browser 2017-05-28 15:11:00 -03:00
Dean Herbert 20c7a5e931 Merge branch 'master' into user-panel-test-data 2017-05-28 23:19:16 +09:00
Dean Herbert bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
DrabWeb 8745948a01 Basic searching in osu!direct, move BeatmapSetOnlineInfo covers into their own class 2017-05-28 02:26:25 -03:00
DrabWeb ab32e962ca Make BeatmapOnlineInfo and BeatmapSetOnlineInfo separate classes, -OnlineWorkingBeatmap 2017-05-28 00:37:55 -03:00
EVAST9919 743dfcc130 More xmldoc and few Title text fixes 2017-05-28 00:56:11 +03:00
DrabWeb e7087f22ea Change UserPanel test case data to use always available covers 2017-05-27 17:27:11 -03:00
DrabWeb 7bdbd3713a More reliable test data 2017-05-27 17:23:14 -03:00
EVAST9919 bedcf04043 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-27 02:25:03 +03:00
DrabWeb cbe36259c3 Add BreadcrumbControl 2017-05-26 07:49:45 -03:00
smoogipooo 24ff599901 Merge remote-tracking branch 'origin/master' into mania-holdnote-input 2017-05-26 19:01:10 +09:00
DrabWeb fc67582c3f Cleanup 2017-05-26 02:16:56 -03:00
DrabWeb e19a4f5e6f Add displaying users 2017-05-26 02:00:38 -03:00
DrabWeb 8fca0fddb3 Abstract DirectOverlay layout into base class for Social and osu!direct - BrowseOverlay, initial layout of social browser 2017-05-26 00:54:03 -03:00
Dan Balasescu 40e63a0870 Merge branch 'master' into mania-holdnote-input 2017-05-24 22:17:13 +09:00
smoogipooo 946cd4bfa3 General cleanup + more xmldocs. 2017-05-24 21:57:38 +09:00
smoogipooo 4ef18ff135 Test case improvements. 2017-05-24 20:54:01 +09:00
smoogipooo dcf879687d Implement basic hold note + tick input. 2017-05-24 20:45:01 +09:00
Seth 3094a8267f Merge branch 'master' into drawable-multiplayer-room 2017-05-24 04:39:57 -03:00
Dean Herbert 3134f92051 Merge branch 'master' into user-panel 2017-05-24 16:32:09 +09:00
DrabWeb a25c504965 CI fixes 2017-05-24 03:08:48 -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 4490596f5f Keep one object per file 2017-05-24 02:37:27 -03: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
DrabWeb 4f17a4fe91 Make result counts scroll with the panels 2017-05-23 14:34:34 -03:00
smoogipooo 76fe4af9a6 Fix visual test failing. 2017-05-23 18:06:31 +09:00
smoogipooo 836bf930a0 More cleanups. 2017-05-23 15:29:38 +09:00
smoogipooo 002a0e99a2 Use SortedList + BinarySearch to find control points at time values. 2017-05-23 15:20:32 +09:00
smoogipooo 3cdfd2eef5 Split ControlPoint into different types. 
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/Column.cs
 2017-05-23 14:03:40 +09:00
DrabWeb 9798117d53 Move RoomStatus to a class instead of enum 2017-05-22 21:13:57 -03:00
DrabWeb 25b457e994 Proper Bindable usage 2017-05-22 13:05:18 -03:00
DrabWeb 65df2d2b70 MultiplayerRoomStatus -> RoomStatus 2017-05-22 12:46:41 -03:00
DrabWeb 2c16d9c3a7 CurrentBeatmap -> Beatmap 2017-05-22 12:45:40 -03:00
DrabWeb 03f6cded84 MultiplayerRoom -> Room 2017-05-22 12:44:58 -03:00
DrabWeb 62ca76bc41 Unused using 2017-05-22 03:42:32 -03:00
DrabWeb 8a364c6068 CI fixes 2017-05-22 03:37:36 -03:00
DrabWeb aa40f88258 Add UserStatusOffline 2017-05-22 03:32:02 -03:00
DrabWeb a73cf92994 Add second UserPanel to visual test, center cover sprite 2017-05-22 03:27:08 -03:00
DrabWeb 7ce3b73ecd Added UserPanel and UserStatus 2017-05-22 03:11:42 -03:00
EVAST9919 d717ccf85e Settings -> ReplaySettings 2017-05-22 09:07:08 +03:00
DrabWeb 87cdf5aac6 CI fixes 2017-05-22 01:29:39 -03:00
DrabWeb 82fdf1a918 Bindables, avatars, more cleanup 2017-05-22 01:01:55 -03:00
DrabWeb e5ee7096f8 Initial cleanup 2017-05-22 00:07:15 -03:00
DrabWeb c4e6870c12 Merge https://github.com/ppy/osu into roompanel 2017-05-21 22:37:00 -03:00
DrabWeb bc980b60ac Add files to project, update with framework changes 2017-05-21 22:36:46 -03:00
EVAST9919 0615f104f0 SettingsContainer -> SettingsDropdownContainer 2017-05-21 18:22:27 +03:00
Dean Herbert 0b987be600 Merge branch 'master' into osu-direct 2017-05-20 16:17:59 +09:00
DrabWeb c981a4a511 Formatting 2017-05-19 19:50:45 -03:00
DrabWeb e1c4c36122 +BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds 2017-05-19 15:43:18 -03:00
EVAST9919 9f803de9d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 19:49:48 +03:00
Dean Herbert 561b517dec Merge branch 'master' into skip-redesign 2017-05-20 00:42:04 +09:00
EVAST9919 f96fe1c97d Extended testcase 2017-05-19 17:28:01 +03:00
EVAST9919 6f0e1fccdb moved autosize to ctor and whitespace fix 2017-05-19 16:08:33 +03:00
EVAST9919 4d0d27aa88 Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-19 15:25:48 +03:00
Dean Herbert da31d129ee Merge branch 'master' into mania-beatmap-conversion 2017-05-19 18:18:59 +09:00
Dean Herbert a7d16ac213 Move skip logic to inside SkipButton 2017-05-19 18:18:21 +09:00
smoogipooo 67cf64062a Add flag to determine whether the beatmap requested for conversion is for the current ruleset. 2017-05-19 16:02:40 +09:00
EVAST9919 bbe0abbe04 removed forgotten file 2017-05-19 06:48:31 +03:00
DrabWeb a5fa7e1a7d Result counts displaying 2017-05-18 17:43:39 -03:00
DrabWeb c2880676db Added displaying sets 2017-05-18 16:15:49 -03:00
EVAST9919 f2af31aceb Naming fixes 2017-05-18 20:21:58 +03:00
EVAST9919 a1b90ee70e Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 18:26:38 +03:00
Dean Herbert f112546085 Don't load a mode when opening TestCaseHitObjects 2017-05-18 19:42:20 +09:00
EVAST9919 83a89ce22d options -> settings 2017-05-18 11:39:22 +03:00
EVAST9919 35bc3a42aa Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options 2017-05-18 06:36:15 +03:00
smoogipooo eebd5a910e Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion 2017-05-18 11:59:31 +09:00
EVAST9919 a21343da23 CI fixes 2017-05-17 17:14:09 +03:00
Dean Herbert 41c252760d Move all pause logic into PauseContainer 2017-05-17 21:57:01 +09:00