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

337 Commits

Author SHA1 Message Date
Dan Balasescu 566470e852
Merge branch 'master' into better-loading-logo 2018-06-04 20:06:22 +09:00
Dean Herbert 3795a55808 Fix menu flashes not extending to the edge of screen during parallax 2018-06-03 22:26:47 +09:00
Dean Herbert 7487c82ec1 Stop the logo from beating 2018-05-31 17:14:47 +09:00
Dean Herbert 9df173b339
Merge branch 'master' into better-loading-logo 2018-05-31 15:59:04 +09:00
smoogipoo e48b17fb0d Unindent 2018-05-31 15:17:59 +09:00
Dean Herbert 9ea6ab28ea Fix intro potentially starting out-of-sync due to logo's outward animation 2018-05-30 20:22:31 +09:00
Dean Herbert 0caf15166e Remove unnecessary FinishTransforms 2018-05-30 20:05:31 +09:00
Dean Herbert 0dafcf00b7 Fix some discrepancies with the main menu logo transitions 2018-05-30 19:50:00 +09:00
Aergwyn 76fbc656a1 fix disclaimer allowing notifications 2018-05-22 17:53:36 +02:00
Dean Herbert ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable 2018-05-22 19:00:42 +09:00
Dan Balasescu 99163ca8ba
Merge branch 'master' into fix-main-menu-escape 2018-05-22 18:17:51 +09:00
Aergwyn cee8d21542 hide overlays when going back to initial menu state 2018-05-21 17:24:57 +02:00
Dean Herbert d109522bf7 Fix escape not working to go backwards in menus before finally exiting the game 
Resolves #2596.
 2018-05-21 23:09:00 +09:00
Aergwyn b7e3ea348b expose two Bindables with split logic instead of one with mixed logic 2018-05-21 15:53:55 +02:00
Aergwyn 1482bca147 Rename for better understanding 
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
 2018-05-21 09:42:29 +02:00
Roman Kapustin 17d1759c37 Get rid of multiple blank lines in a row 2018-05-18 01:01:54 +03:00
Roman Kapustin 81d7e8a393 Resolve merge conflict 2018-05-18 00:25:47 +03:00
DrabWeb 1a78ac3d10 Add Multiplayer screen. 2018-05-15 21:14:10 -03:00
Roman Kapustin f2f2fb8c73 Use both OnKeyDown and GlobalAction.Back 2018-05-14 22:09:09 +03:00
Roman Kapustin e802b722f0 Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" 
This reverts commit 44bbb8700e.
 2018-05-14 20:27:05 +03:00
Dean Herbert f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
DrabWeb a86843ccc9 Remove unused usings caused by multiplayer folder restructuring. 2018-05-10 20:49:42 -03:00
DrabWeb bc9ac8f72a Move multiplayer screens to osu.Game/Screens/Multi/Screens 2018-05-10 20:47:25 -03:00
DrabWeb c35760fdef Rename osu.Game/Screens/Multiplayer to Multi. 2018-05-10 20:39:05 -03:00
Dean Herbert 5df9f126d1 Implement a hold-to-confirm screen when exiting game using escape key 2018-05-10 17:07:19 +09:00
Roman Kapustin 44bbb8700e Handle mouse back button using OnMouseDown override instead of using GlobalAction 2018-05-08 00:22:11 +03:00
TocoToucan 804b59ee80 Handle GlobalAction.Back 2018-04-29 20:15:09 +03:00
Dean Herbert 2d82c0b5cd Fix logical regression 2018-04-23 16:41:15 +09:00
Dean Herbert 2c9b2aa0e7 Fix intro setting beatmap in background thread causing race conditions 2018-04-22 02:46:20 +09:00
FreezyLemon 3ece54e1c3 make buttons only accept input when expanded 
both other states are "inactive"/invisible so should never accept keyboard input
 2018-04-14 00:08:54 +02:00
Dean Herbert 32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
smoogipoo 3f3f57e51e Use cached vertexbatch add delegate 2018-03-22 15:13:38 +09:00
Dean Herbert e0b74a357a Fix osu! logo making hover beat sounds when not visible 2018-03-22 03:31:14 +09:00
smoogipoo 78d73d4c11 Additional fixes for flow ordering after framework changes 2018-03-06 17:20:58 +09:00
smoogipoo 148551afa2 osu!-side changes in-line with framework layout changes 2018-03-06 14:12:37 +09:00
Dean Herbert 6dc9411a90 Don't use BufferedContainer for OsuLogo 
Minor performance improvement. Not sure why this was done but it's not required any more.
 2018-03-01 16:01:42 +09:00
Dean Herbert d340509b1d Move ArchiveReaders to a more global namespace 
Also moves delete and action logic to a shared implementation
 2018-02-15 14:22:39 +09:00
Dean Herbert 6ff63c2f0c Move deletion to ArchiveModelImportManager 2018-02-15 14:22:39 +09:00
Dean Herbert d8f84fcca3 Give ArchiveReader a filename 2018-02-15 14:22:39 +09:00
Dean Herbert 5e1cd8ddc4 Apply conditionals directly rather than using an in-between property 2018-01-16 20:34:40 +09:00
Dean Herbert e7a0a02466 Don't limit keyboard input based on menu button scale 2018-01-16 20:34:40 +09:00
Dean Herbert 9b33499fe7 Merge remote-tracking branch 'upstream/master' into RefactorInputQueues 2018-01-16 20:04:34 +09:00
TocoToucan c3ca40dcff Local functions related CI fixes 2018-01-15 23:27:00 +03:00
TocoToucan 3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
Dean Herbert 0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
Aergwyn ae1adfd2f2 remove unnecessary empty lines 
codefactor.io \(o.o)/
also one unnecessary semicolon
 2018-01-12 19:30:34 +01:00
smoogipoo 620e125fad Fix cursor being displayed on intro/disclaimer 2018-01-12 19:34:55 +09:00
smoogipoo 512e4d2c9f Rewrite the way that cursor overrides are done game-wide 2018-01-12 18:13:17 +09:00
TocoToucan ae032cbf23 Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties 2018-01-07 23:40:00 +03:00
Dean Herbert 37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00