smoogipoo
|
1dfa3ff995
|
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
|
2018-05-22 18:30:29 +09:00 |
|
Dan Balasescu
|
99163ca8ba
|
Merge branch 'master' into fix-main-menu-escape
|
2018-05-22 18:17:51 +09:00 |
|
smoogipoo
|
0e122468db
|
Fix progress easing to 0 if aborting after confirmation
|
2018-05-22 18:06:40 +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 |
|
AlFasGD
|
2769f6c47b
|
Fix issues
|
2018-05-22 09:09:25 +03: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 |
|
AlFasGD
|
d504a44dfb
|
Implement mask layering (incomplete)
|
2018-05-21 23:08:04 +03: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 |
|
Dean Herbert
|
f9c162dee9
|
Adjust design and feel
|
2018-05-22 00:49:33 +09:00 |
|
Aergwyn
|
cee8d21542
|
hide overlays when going back to initial menu state
|
2018-05-21 17:24:57 +02:00 |
|
Dean Herbert
|
d5afccd610
|
Make hint text display briefly at initial display, then on hover
|
2018-05-22 00:02:03 +09:00 |
|
Dean Herbert
|
3d9d40448d
|
Fix incorrect syntax
|
2018-05-22 00:01:40 +09:00 |
|
Dean Herbert
|
841336a181
|
Merge branch 'master' into exit_replay_button
|
2018-05-21 23:45:06 +09:00 |
|
Dean Herbert
|
9820666bcf
|
Merge branch 'master' into respect-showoverlay-bindable
|
2018-05-21 23:26:34 +09: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 |
|
AlFasGD
|
a54bda6ce1
|
Apply requested changes
|
2018-05-21 13:23:39 +03:00 |
|
Aergwyn
|
1482bca147
|
Rename for better understanding
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
|
2018-05-21 09:42:29 +02:00 |
|
Dean Herbert
|
c48c62ea04
|
Merge branch 'master' into player_loader_input_toggles
|
2018-05-21 16:20:08 +09:00 |
|
Joehu
|
46c6c1d07e
|
Allow drag clicking footer and filter on song select
|
2018-05-20 20:25:39 -07: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 |
|
smoogipoo
|
82607b3eb3
|
Expose properties to control zoom
|
2018-05-18 17:53:09 +09:00 |
|
Dean Herbert
|
e2389ad7a4
|
Allow using back button on PlayerLoader and Replay
|
2018-05-18 13:32:05 +09:00 |
|
smoogipoo
|
bc3d195aa2
|
Fix line endings
|
2018-05-18 13:05:58 +09: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 |
|