Commit Graph

445 Commits

Author SHA1 Message Date
Dean Herbert 68857b573d
More code tidying. 2017-03-02 17:14:05 +09:00
Dean Herbert c4871bbbf3
Tidy up code.
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
2017-03-02 17:08:00 +09:00
Dean Herbert d1cd077e0d
Post-merge fixes. 2017-03-02 16:54:55 +09:00
Dean Herbert ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
DrabWeb befdf68abe Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once 2017-03-01 18:41:00 -04:00
Thomas Müller 4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller 9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
DrabWeb ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
DrabWeb 50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
DrabWeb bc7fd3bd39 Remove uneccesary cast, move enter OK button to one liner 2017-02-27 22:38:44 -04:00
DrabWeb 94f34b985b Forgot returns 2017-02-27 22:32:30 -04:00
DrabWeb 0ce8fff666 Enter key presses first OK button, 1-9 presses button at number 2017-02-27 22:31:23 -04:00
DrabWeb e8cae3b45e Remove new override in DialogButton 2017-02-27 21:38:25 -04:00
DrabWeb 164f205ee5 Remove SpaceTextOnHover 2017-02-27 21:30:10 -04:00
DrabWeb b3a231185b Conform to naming conventions 2017-02-27 20:55:10 -04:00
DrabWeb 34ba3129a3 Removed background triangles 2017-02-27 20:44:27 -04:00
DrabWeb 64d036fe81 Update to work with latest framework 2017-02-27 16:41:45 -04:00
DrabWeb 3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
default0 03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
Andrey Zavadskiy 9444ffd849 Removed redundant qualifiers 2017-02-27 17:37:38 +03:00
Andrey Zavadskiy 3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
DrabWeb d78dca3d85 New design 2017-02-26 23:35:13 -04:00
default0 8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
Dean Herbert 686372a7f9
Update with framework structural changes. 2017-02-26 20:54:32 +09:00
Dean Herbert 9f5518312d
Add missing file. 2017-02-26 18:28:01 +09:00
Dean Herbert 79993a576f
Add basic GC options. 2017-02-26 18:06:59 +09:00
Thomas Müller 1585ae842a Update framework 2017-02-26 11:22:58 +09:00
DrabWeb a009268370 Merge https://github.com/ppy/osu into popup-dialog 2017-02-25 21:22:47 -04:00
DrabWeb bd6ca99246 Even faster 2017-02-24 16:48:30 -04:00
DrabWeb 42b26a4c2f Speedup triangles 2017-02-24 16:41:10 -04:00
Dean Herbert 6c3bda18b6
Add beatmap deletion support.
Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.
2017-02-24 14:37:54 +09:00
DrabWeb c94da4fcf0 Added popup dialog 2017-02-24 00:05:37 -04:00
Dean Herbert c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings 2017-02-24 11:29:34 +09:00
Thomas Müller 37bc75a7b6 Remove unused variables 2017-02-23 22:32:49 +01:00
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Thomas Müller a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Kelvin fd622286fe Enable Tabbing in LoginOptions 2017-02-23 00:50:09 -08:00
Dean Herbert f1538791c3
Correctly hook up window mode dropdown. 2017-02-23 17:35:14 +09:00
Dean Herbert da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Thomas Müller 44bedb5407 Merge branch 'master' into chat-improvement 2017-02-22 07:36:42 +01:00
Dean Herbert 190bed8939
Add top padding. 2017-02-22 13:38:22 +09:00
Dean Herbert b7a9fd85ea
Assert single channel support for now. 2017-02-22 13:38:10 +09:00
Dean Herbert cbd061d573
Improve appearance of notifications. 2017-02-21 13:52:37 +09:00
Dean Herbert 6a83620589
Add better focus handling and padding/margin updates. 2017-02-20 21:11:09 +09:00
Dean Herbert e3fa49dda7
Naively "send" messages that the user types (doesn't arrive yet). 2017-02-20 21:10:43 +09:00
Dean Herbert 7a2eedbd7e
Add message batching per-channel. 2017-02-20 21:09:34 +09:00
Dean Herbert de87141e90 Remove unused using statements. 2017-02-19 18:39:54 +09:00
Dean Herbert aac4ba2baa Add input box to ChatOverlay. 2017-02-19 18:02:25 +09:00
Dean Herbert 0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00