ekrctb
|
4392c57889
|
Merge branch 'master' into catch-droplet-fix
|
2018-05-25 19:34:59 +09:00 |
|
Dean Herbert
|
58317be41e
|
Merge pull request #2499 from AlFasGD/editor-seekbar-fix
Prevent user from scrolling outside the timeline in the editor
|
2018-05-25 19:34:28 +09:00 |
|
ekrctb
|
22e6e016fc
|
Merge branch 'master' of https://github.com/ppy/osu into catch-droplet-fix
|
2018-05-25 19:28:36 +09:00 |
|
Dean Herbert
|
8977670088
|
Update framework
|
2018-05-25 19:21:49 +09:00 |
|
ekrctb
|
456dc81f2f
|
Fix InspectCode issues
|
2018-05-25 19:18:11 +09:00 |
|
ekrctb
|
26c6313dec
|
catch: the fruit positions are finalized on the post process
|
2018-05-25 19:11:29 +09:00 |
|
Dean Herbert
|
699f661b02
|
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
|
2018-05-25 19:07:30 +09:00 |
|
Dean Herbert
|
b474dca09a
|
Merge pull request #2612 from jorolf/open-external
Add icon next to beatmap title/username to open in browser
|
2018-05-25 19:01:27 +09:00 |
|
ekrctb
|
8c8e87ed7a
|
Make FastRandom public
|
2018-05-25 18:57:59 +09:00 |
|
ekrctb
|
ca2c209701
|
add FastRandom
|
2018-05-25 18:57:46 +09:00 |
|
ekrctb
|
9f2e09dae4
|
Move PostProcessing to after control points applied and nested hit objects created.
|
2018-05-25 18:57:06 +09:00 |
|
Dean Herbert
|
cc69f07172
|
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
|
2018-05-25 18:52:05 +09:00 |
|
Dean Herbert
|
1cb7d50407
|
Add and use default size (smaller than before)
|
2018-05-25 18:51:57 +09:00 |
|
Dean Herbert
|
78ca111d69
|
Merge pull request #2504 from UselessToucan/player_loader_input_toggles
Add input toggles to the PlayerLoader screen
|
2018-05-25 18:50:45 +09:00 |
|
Dean Herbert
|
1b5bb79fe9
|
Merge remote-tracking branch 'upstream/master' into jorolf-open-external
|
2018-05-25 18:50:30 +09:00 |
|
Dean Herbert
|
28aa6faef9
|
Merge branch 'master' into player_loader_input_toggles
|
2018-05-25 18:38:12 +09:00 |
|
Dean Herbert
|
e62718f251
|
Merge pull request #2587 from smoogipoo/diffcalc-double-hr
Fix double-HR application in OsuDifficultyCalculator
|
2018-05-25 14:17:25 +09:00 |
|
Dean Herbert
|
67447ef560
|
Merge branch 'master' into diffcalc-double-hr
|
2018-05-25 14:03:10 +09:00 |
|
Dean Herbert
|
1c947fd3a7
|
Merge pull request #2618 from smoogipoo/musiccontroller-nullref
Fix possible MusicController nullref
|
2018-05-25 11:25:05 +09:00 |
|
Dean Herbert
|
385c2c5c86
|
Merge branch 'master' into musiccontroller-nullref
|
2018-05-25 11:01:09 +09:00 |
|
Dean Herbert
|
568d4882c6
|
Remove unnecessary null coalesce
|
2018-05-25 11:00:56 +09:00 |
|
Dean Herbert
|
6d6cea19ec
|
Merge pull request #2624 from Aergwyn/hide-toolbar-after-play
Fix incorrect default values keeping overlays in wrong state
|
2018-05-24 09:43:52 +09:00 |
|
Aergwyn
|
0c0f86fe26
|
fix incorrect default values keeping overlays in wrong state
|
2018-05-23 16:25:10 +02:00 |
|
smoogipoo
|
f894d73501
|
Fix possible MusicController nullref
|
2018-05-23 14:36:09 +09:00 |
|
Dean Herbert
|
194710eae4
|
Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications
Fix disclaimer allowing notifications
|
2018-05-23 11:22:49 +09:00 |
|
Aergwyn
|
76fbc656a1
|
fix disclaimer allowing notifications
|
2018-05-22 17:53:36 +02:00 |
|
jorolf
|
8fbda5bc59
|
add license header
|
2018-05-22 15:41:10 +02:00 |
|
jorolf
|
b324337fa1
|
Add icon next to beatmap title/username to open in browser
|
2018-05-22 15:29:52 +02:00 |
|
Dean Herbert
|
088deee70a
|
Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable
FIx overlays from not hiding when returning to initial main menu state
|
2018-05-22 19:19:00 +09:00 |
|
Dean Herbert
|
ef40ca8805
|
Merge branch 'master' into respect-showoverlay-bindable
|
2018-05-22 19:00:42 +09:00 |
|
Dean Herbert
|
52230d6279
|
Merge pull request #2600 from peppy/fix-main-menu-escape
Fix escape not working to go backwards in menus before finally exiting the game
|
2018-05-22 18:58:48 +09:00 |
|
Dan Balasescu
|
99163ca8ba
|
Merge branch 'master' into fix-main-menu-escape
|
2018-05-22 18:17:51 +09:00 |
|
Dan Balasescu
|
c0802b5646
|
Merge pull request #2430 from UselessToucan/exit_replay_button
Add hold-to-quit button for gameplay/replays
|
2018-05-22 18:17:40 +09:00 |
|
smoogipoo
|
0e122468db
|
Fix progress easing to 0 if aborting after confirmation
|
2018-05-22 18:06:40 +09:00 |
|
Dean Herbert
|
39de807445
|
Update framework
|
2018-05-22 16:46:55 +09:00 |
|
Dean Herbert
|
d43e4af8ea
|
Fix overlap between quit button at key input overlay
|
2018-05-22 16:45:42 +09:00 |
|
Dean Herbert
|
436067c01f
|
Handle scale back in a nicer way
|
2018-05-22 16:44:37 +09:00 |
|
Dean Herbert
|
7b770d03c5
|
Use OnMouseMove instead of Update logic
|
2018-05-22 16:26:59 +09:00 |
|
Dean Herbert
|
babb7d5158
|
Fix white ring flash when holding button post-confirmation
|
2018-05-22 16:23:05 +09:00 |
|
Dean Herbert
|
5f8eb6d823
|
Fix class name
|
2018-05-22 16:04:36 +09:00 |
|
Dean Herbert
|
8fbda9d57e
|
Improve comment
|
2018-05-22 16:04:07 +09:00 |
|
Dean Herbert
|
58ae545747
|
innerCircle -> overlayCircle
|
2018-05-22 15:59:53 +09:00 |
|
Dean Herbert
|
ef55c3c197
|
Fix icon scale not resetting due to no implicit triggering
|
2018-05-22 15:58:17 +09:00 |
|
Dean Herbert
|
2ce2bd9788
|
Add comment for pendingAnimation
|
2018-05-22 15:58:00 +09:00 |
|
Dean Herbert
|
5a892e4d08
|
This quit button don't quit
|
2018-05-22 02:09:52 +09:00 |
|
Dean Herbert
|
323aa189b6
|
Make on-confirmation animation more robust
|
2018-05-22 02:08:44 +09:00 |
|
Dean Herbert
|
156d7fb25a
|
Change depth of HUD
Yes, this is intentional.
|
2018-05-22 02:08:21 +09:00 |
|
Dean Herbert
|
946a75ddb2
|
Block hover to use UI cursor instead of gameplay cursor
|
2018-05-22 02:05:08 +09:00 |
|
Dean Herbert
|
ebda287e81
|
Share code with HoldToConfirm implementations elsewhere
|
2018-05-22 01:44:06 +09:00 |
|
Roman Kapustin
|
30956b64aa
|
Do not change Margin for player settings groups on the PlayerLoader screen
|
2018-05-21 18:57:01 +03:00 |
|