h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 18:32:54 +08:00
Code Issues Releases Wiki Activity
23,106 Commits 3 Branches 661 Tags 356 MiB
d089e47a56
Commit Graph

449 Commits

Author SHA1 Message Date
smoogipoo
51c16867d5 Remove type conversion from LoungeTab to RoomAvailability 2018-12-03 17:50:39 +09:00
smoogipoo
dea387c31e Fix post-merge issues 2018-11-26 16:29:56 +09:00
smoogipoo
dcf740e5d3 Merge remote-tracking branch 'origin/master' into multiplayer-room-settings 2018-11-26 16:27:22 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +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
DrabWeb
c72281d0f2 Change local bindings instead of room bindings. 2018-08-24 19:27:16 -03:00
DrabWeb
90e178821a Limit max participants field to only numbers. 2018-08-24 19:19:16 -03:00
DrabWeb
c5f0b27544 Speedup transition. 2018-08-24 19:11:52 -03:00
DrabWeb
e65bb5b54b Remove unused usings, remove unused icon variable. 2018-08-14 12:34:05 -03:00
DrabWeb
7d8c0aca72 Order usings, use inline out variable declaration. 2018-08-14 12:25:35 -03:00
DrabWeb
3d0b1b6009 Cleanup. 2018-08-14 12:08:00 -03:00
DrabWeb
ea523baa4a Add hover animations to GameTypePicker and RoomAvailabilityPicker. 2018-08-14 11:54:35 -03:00
DrabWeb
c66578ba5b Allow tabbing between text fields. 2018-08-14 11:36:46 -03:00
DrabWeb
af31845c83 Fix naming conflicts in RoomSettingsOverlay. 2018-08-14 11:31:20 -03:00
DrabWeb
52b157d072 Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-08-14 11:16:25 -03:00
Dean Herbert
da8fc0ee5d ToLower -> ToLowerInvariant 2018-07-25 07:37:05 +02:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
DrabWeb
6b240280d0 Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-07-07 01:10:27 -03:00
Dean Herbert
2a42418dbf Tidy up ReadyButton 2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8 Change required child to use same structure as other use cases 2018-06-21 10:12:12 +09:00
Dean Herbert
96100a2200 Remove schedule logic (seems unnecessary) 2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa Simplify and synchronise multiplayer screen transitions 2018-06-20 17:25:22 +09:00
Dean Herbert
f0c72438a3 Group ValueChanged attachment with bindings 2018-06-20 17:06:02 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match 2018-06-19 17:18:33 +09:00
DrabWeb
fb96b30555 Cleanup. 2018-06-07 00:51:27 -03:00
DrabWeb
f13f71b1e9 Move GameTypePicker label to RoomSettingsOverlay. 2018-06-07 00:39:16 -03:00
DrabWeb
5c0e40df29 Apply on commit. 2018-06-07 00:25:16 -03:00
DrabWeb
ed97d35ef7 Test steps. 2018-06-06 23:30:17 -03:00
DrabWeb
4aff2ba2af Move settings to subfolder. 2018-06-06 06:25:34 -03:00
DrabWeb
915a4535d0 Remove label option from SettingsTextBox. 2018-06-06 06:22:16 -03:00
DrabWeb
766e0d1e17 AvailabilityPickerItem -> RoomAvailabilityPickerItem 2018-06-06 05:41:46 -03:00
DrabWeb
d6e3dc10e9 Fix RoomSettingsOverlay not being updated when the rooms values are. 2018-06-06 05:38:43 -03:00
DrabWeb
a81fc9eb5d Fix field containers padding being wrong. 2018-06-06 05:20:03 -03:00
DrabWeb
fe73dbd58c Update ApplyButton design. 2018-06-06 04:32:04 -03:00
DrabWeb
a982a4ce37 Integrate RoomSettingsOverlay into Match. 2018-06-06 04:27:53 -03:00
DrabWeb
24ba8261a1 Add applying to RoomSettingsOverlay. 2018-06-06 02:38:09 -03:00
DrabWeb
4328223996 Add AvailabilityPicker. 2018-06-06 02:25:08 -03:00
DrabWeb
33e86cb81e Add GameTypePicker. 2018-06-06 02:06:33 -03:00
DrabWeb
4045ab3669 Add SettingsTextBox. 2018-06-06 01:29:36 -03:00
DrabWeb
2c86293f37 Add sections and apply button. 2018-06-06 00:53:24 -03:00
DrabWeb
8c97999de9 Add empty RoomSettingsOverlay. 2018-06-06 00:29:52 -03:00
DrabWeb
b8e403f38a Merge https://github.com/ppy/osu into multiplayer-room-settings 2018-06-06 00:19:23 -03:00
Dean Herbert
eb135b2e85
Merge branch 'master' into participant-count-default 2018-06-03 03:05:17 +09:00
DrabWeb
da8b1f996f Override Type in Match. 2018-06-01 17:16:35 -03:00
DrabWeb
5073057420 Cleanup. 2018-06-01 16:34:03 -03:00
DrabWeb
97b473ef30 Expose tabs and hide beatmap select button in Header. 2018-06-01 16:23:11 -03:00
DrabWeb
cc32adf51f Move max text updating into updateMax. 2018-06-01 14:28:24 -03:00
DrabWeb
59762c0393 Change Room.Participants to an IEnumerable. 2018-06-01 06:15:23 -03:00
DrabWeb
8dd36ee1a9 Default Max to null in ParticipantCount. 2018-06-01 06:08:57 -03:00
DrabWeb
9989517ff0 Merge https://github.com/ppy/osu into multiplayer-match 2018-06-01 04:01:14 -03:00
Dean Herbert
b9c601074d Formatting fixes 2018-06-01 15:45:09 +09:00
Dean Herbert
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation 2018-06-01 15:31:19 +09:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover 2018-05-31 17:33:31 +09:00
DrabWeb
ff93a54a64 Default Type to Title, use ToLower for the screen type title. 2018-05-30 23:16:54 -03:00
DrabWeb
7b8211e6db Add MultiplayerScreen.Type 2018-05-29 04:23:29 -03:00
DrabWeb
9a7e5a3e2c Update TestCaseMatch. 2018-05-29 04:16:19 -03:00
DrabWeb
7edb82eb85 Add TestCaseMatchParticipants. 2018-05-29 03:53:30 -03:00
DrabWeb
b4b4a8a157 Add TestCaseMatchInfo. 2018-05-29 03:24:38 -03:00
DrabWeb
94b54a0520 Adjust design of ReadyButton. 2018-05-29 03:03:51 -03:00
DrabWeb
3915cb7f2f Add Match Participants, change Room.Users to IEnumerable. 2018-05-29 02:42:52 -03:00
DrabWeb
77ff0640c2 Add a gradient over the cover in Header. 2018-05-29 01:53:45 -03:00
DrabWeb
c8ce34b6d4 Add Match Info. 2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4 Add match screen header. 2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d Add empty Match screen. 2018-05-29 01:16:39 -03:00
DrabWeb
d090323c00 Add ParticipantCount to share with the Match screen. 2018-05-29 00:51:56 -03:00
DrabWeb
852d7ef48d Use ?: expression instead of if/else. 2018-05-29 00:07:33 -03:00
DrabWeb
7beac3a712 Cleanup DrawableRoom. 2018-05-28 23:56:00 -03:00
DrabWeb
dcc39d96e2 BeatmapModeInfo -> BeatmapTypeInfo. 2018-05-28 23:45:59 -03:00
DrabWeb
bd9af745dd Cleanup. 
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
 2018-05-28 23:41:50 -03:00
DrabWeb
8b8d10349e Move RoomInspector info panel content to BeatmapModeInfo to share with Match. 
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
 2018-05-28 23:41:42 -03:00
DrabWeb
8b36e1dad0 Add BeatmapTitle to encapsulate multiplayer beatmap title display logic. 
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
 2018-05-28 23:41:07 -03:00
DrabWeb
bdfb5752cd Update existing drawables to use UpdateableBeatmapSetCover. 2018-05-28 19:31:20 -03:00
Dean Herbert
ed7c860802 Adjust transitions of DrawableRoom 2018-05-28 13:30:29 +09:00
Dean Herbert
02c37ebc1f Move screen titles to OsuScreen 2018-05-28 13:30:24 +09:00
Dean Herbert
0ca6d73f0e Add a delay before the osu! logo appears when exiting multiplayer 2018-05-28 13:30:17 +09:00
Dean Herbert
95315e46f0 Make drawable rooms fade in when first displayed 
Stops filtered rooms from briefly displaying.
 2018-05-27 14:12:20 +09:00
DrabWeb
349b0a3322 Remove empty ctor. 2018-05-22 01:46:08 -03:00
DrabWeb
3cc5bb516e Remove unused Match ctor param. 2018-05-22 01:39:25 -03:00
DrabWeb
662559d3c9 More test steps. 2018-05-22 01:22:23 -03:00
DrabWeb
6aac4269e6 Add filtering. 2018-05-22 00:33:41 -03:00
DrabWeb
f7a4a4eeef Add Lounge FilterControl. 2018-05-22 00:24:39 -03:00
DrabWeb
cae09492c3 Basic Lounge functionality. 2018-05-22 00:07:04 -03:00
DrabWeb
1210368e29 Add MultiplayerScreen base class. 2018-05-21 23:00:02 -03:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements 2018-05-21 11:09:12 +09:00
Dean Herbert
aaca7e92b4 Avoid excessive property lookups 2018-05-21 03:56:59 +09:00
DrabWeb
9cd0ec366e Cleanup. 2018-05-19 02:51:51 -03:00
DrabWeb
136c57b824 Don't set size in ctor. 2018-05-19 02:27:33 -03:00
DrabWeb
ad878003f7 Add null room support to RoomInspector. 2018-05-19 02:23:09 -03:00
DrabWeb
4b2b2086df Create drawable hierarchy for RoomInspector in load, remove display* methods. 2018-05-19 01:26:39 -03:00
DrabWeb
ebfbe58abb Move Header breadcrumbs to a subclass. 2018-05-17 06:19:55 -03:00
DrabWeb
1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5 Add multiplayer screen header. 2018-05-15 20:34:14 -03:00
DrabWeb
937ff50a5a Remove unused using. 2018-05-11 13:56:27 -03:00
DrabWeb
41de02fc78 Make DrawableRooms select when they are clicked. 2018-05-11 13:43:53 -03:00
DrabWeb
518dec0c68 Merge https://github.com/ppy/osu into drawable-room-improvements 2018-05-11 13:41:50 -03:00
DrabWeb
bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb
2d206d258a Move multiplayer screen components to osu.Game/Screens/Multi/Components 2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00