Commit Graph

25276 Commits

Author SHA1 Message Date
17a7a75707 Merge master with conflicts resolved 2020-01-20 08:52:03 +03:00
fab8f4661a Merge pull request #7541 from EVAST9919/overlay-header-web-colours
Implement colour schemes for OverlayHeader
2020-01-20 14:13:09 +09:00
6875b41f74 Remove unnecessary setter 2020-01-20 07:47:49 +03:00
3b3d24bf25 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-20 07:46:20 +03:00
fa1b1479ed Merge pull request #7561 from peppy/fix-tournament-null-handling
Fix hard crashes on tournament client if a round contains an empty beatmap
2020-01-20 12:20:50 +09:00
840677bb05 Merge branch 'master' into fix-tournament-null-handling 2020-01-20 11:50:20 +09:00
43f144cd6a Invert condition 2020-01-20 11:48:56 +09:00
17e13dd718 Merge pull request #7564 from iiSaLMaN/update-license-year
Update license year
2020-01-20 11:13:09 +09:00
5a2ed5391d Update license year 2020-01-19 23:51:10 +03:00
55ed823c88 Fix hard crashes on tournament client if a round contains an empty beatmap 2020-01-19 22:26:15 +09:00
a2a2df0973 Make exception message more descriptive 2020-01-18 23:57:20 +03:00
1b06957566 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-18 23:54:12 +03:00
3f2512295c Merge pull request #7555 from peppy/update-framework
Update framework
2020-01-18 15:57:16 +09:00
4c7e92257c Merge pull request #7556 from peppy/remove-snapchat-logo
Remove usage of snapchat icon
2020-01-18 15:28:46 +09:00
e8e6897603 Remove unnecessary linq count usage 2020-01-18 15:27:21 +09:00
9a2d85e7d9 Remove usage of snapchat icon 2020-01-18 15:12:31 +09:00
9709b80c88 Merge branch 'fix-channeltabcontrol-test' into update-framework 2020-01-18 14:59:40 +09:00
bf7f2300af Merge pull request #7537 from mcendu/mod-text
Make iconless mods display acronyms
2020-01-18 14:57:35 +09:00
969cb23671 Add reference comment 2020-01-18 08:55:29 +03:00
e258489bb5 Merge remote-tracking branch 'refs/remotes/ppy/master' into overlay-header-web-colours 2020-01-18 08:51:10 +03:00
5b7fd7e3ec Update framework 2020-01-18 14:42:22 +09:00
159cd9a90b Merge branch 'master' into mod-text 2020-01-17 21:42:01 +08:00
b30e268238 Fix json web requests having incorrect user agents (#7549)
Fix json web requests having incorrect user agents
2020-01-17 22:08:43 +09:00
2187523bf3 Fix json web requests having incorrect user agents 2020-01-17 19:21:27 +09:00
6579aa144d Merge branch 'master' into mod-text 2020-01-16 20:11:51 +08:00
e096688ac8 simplify some stuff 2020-01-16 17:58:47 +08:00
d01cc37968 Fix channel tab control test scene 2020-01-16 18:36:27 +09:00
86ae442d54 Merge pull request #7543 from peppy/fix-registration
Fix user agent missing in registration request
2020-01-16 13:17:05 +09:00
0d8b4e7c3e Fix user agent missing in registration 2020-01-16 12:51:43 +09:00
ef735f106e Merge pull request #7534 from revelsix/fix-tooltip-capitalization
Fix tooltip capitalization
2020-01-16 12:46:20 +09:00
5d4b9d11cf Throw an excepion for incorerect colourScheme values 2020-01-15 23:35:40 +03:00
476717e181 Make OverlayHeader use colour schemes 2020-01-15 22:41:22 +03:00
02af546d3c Implement web colour schemes 2020-01-15 22:22:13 +03:00
4c18a67268 add test step 2020-01-15 18:24:43 +08:00
052772cce7 add test case 2020-01-15 18:15:56 +08:00
62615fb8c1 format 2020-01-15 18:00:14 +08:00
970653470c format 2020-01-15 17:49:45 +08:00
a0b6cadab5 add test scene 2020-01-15 17:36:27 +08:00
428f3d1278 Merge pull request #7535 from smoogipoo/beatmap-export
Implement exporting beatmap package as .osz
2020-01-15 16:16:44 +09:00
1ec54eeaf9 Merge branch 'master' into beatmap-export 2020-01-15 15:39:35 +09:00
990f5b5f78 Implement editor beatmap saving (#7532)
Implement editor beatmap saving
2020-01-15 15:35:26 +09:00
6cb8b964fd Allow changing volume in song select with arrow keys when press… (#7528)
Allow changing volume in song select with arrow keys when pressing alt
2020-01-15 15:12:23 +09:00
e88e40eec4 Expand on comment 2020-01-15 15:11:36 +09:00
363d7d724a Use old ctor params 2020-01-15 14:02:29 +09:00
b42b23d65b Add comment for alt pressed
Taken from OsuScrollContainer
2020-01-14 20:52:15 -08:00
e49701a215 Save before exporting 2020-01-15 13:48:28 +09:00
2060be345d Move alt pressed condition to top of method 2020-01-14 20:44:55 -08:00
c25fefa3ca Add beatmap package export 2020-01-15 13:44:46 +09:00
443dedfd07 undo menu item capitalization 2020-01-14 14:54:06 -05:00
a86fb2113e fix tooltip capitalization 2020-01-14 14:26:54 -05:00