Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
Dean Herbert
|
78a0bce3bb
|
Merge pull request #423 from peppy/general-fixes
Move PauseOverlay to correct namespace.
|
2017-03-03 11:32:42 +09:00 |
|
Dean Herbert
|
70f046092c
|
Merge pull request #424 from DrabWeb/namespace-fix
Fix BeatmapDeleteDialog namespace
|
2017-03-03 11:32:35 +09:00 |
|
Dean Herbert
|
1b297d73c2
|
Merge pull request #425 from huoyaoyuan/password
"Security" update for OsuPasswordTextBox.
|
2017-03-03 11:24:25 +09:00 |
|
Huo Yaoyuan
|
5b5fbbfdff
|
Update framework.
|
2017-03-03 10:17:46 +08:00 |
|
Huo Yaoyuan
|
ef13cdbff7
|
Disallow copying from OsuPasswordTextBox.
|
2017-03-03 10:00:39 +08:00 |
|
DrabWeb
|
f872330902
|
Fix BeatmapDeleteDialog namespace
|
2017-03-02 21:28:05 -04:00 |
|
Dean Herbert
|
3a8246f56d
|
Move PauseOverlay to correct namespace.
|
2017-03-03 10:17:39 +09:00 |
|
Dean Herbert
|
ae1d51bc9b
|
Merge pull request #422 from Tom94/no-negative-margin
Remove usages of negative Margin / Padding
|
2017-03-03 10:05:55 +09:00 |
|
Dean Herbert
|
e189c36ffd
|
Framework update.
|
2017-03-03 09:58:48 +09:00 |
|
Dean Herbert
|
f81836f635
|
Merge remote-tracking branch 'upstream/master' into no-negative-margin
|
2017-03-03 09:58:40 +09:00 |
|
Dean Herbert
|
ed26d87170
|
Merge pull request #419 from peppy/song-selection-improvements
Fix selection on entry to song select.
|
2017-03-03 09:55:11 +09:00 |
|
Thomas Müller
|
c732890664
|
Remove usages of negative Margin / Padding
Replaces such usage with more sensible settings, like changing the
position or size.
|
2017-03-02 19:16:31 +01:00 |
|
Dean Herbert
|
ecd3453774
|
Fix potential nullref.
|
2017-03-02 22:17:14 +09:00 |
|
Dean Herbert
|
f9b87ad08c
|
Fix selection on entry to song select.
Also only shows sets with beatmaps for current play mode.
|
2017-03-02 22:02:32 +09:00 |
|
Dean Herbert
|
9ea83230aa
|
Formatting fixes.
|
2017-03-02 22:01:53 +09:00 |
|
Dean Herbert
|
ef8a35f5cc
|
Fix Toolbar's mode changer not working correctly.
|
2017-03-02 22:01:24 +09:00 |
|
Dean Herbert
|
e399d6c6d1
|
Use bindable for PlayMode.
|
2017-03-02 21:16:58 +09:00 |
|
Dean Herbert
|
ab91333b21
|
Replace missing perfect icon with cross.
|
2017-03-02 20:29:48 +09:00 |
|
Dean Herbert
|
8bb4bea1a4
|
Fix incorrect ordering.
|
2017-03-02 20:27:13 +09:00 |
|
Dean Herbert
|
471b9daa93
|
Merge branch 'master' into mod-overlay
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:27:04 +09:00 |
|
Dean Herbert
|
d74a601180
|
Update version number generation slightly.
|
2017-03-02 20:08:01 +09:00 |
|
Dean Herbert
|
35c920d04b
|
Merge pull request #368 from tacchinotacchi/master
Added basic sorting functionality
|
2017-03-02 18:46:34 +09:00 |
|
Dean Herbert
|
4163569e57
|
Fix some license headers.
|
2017-03-02 18:45:20 +09:00 |
|
Dean Herbert
|
68a359698d
|
Fix potential nullref caused by test data.
|
2017-03-02 18:35:24 +09:00 |
|
Dean Herbert
|
51950eef43
|
Merge branch 'master' into master
|
2017-03-02 18:06:31 +09:00 |
|
Dean Herbert
|
ffd65606be
|
Merge pull request #409 from DrabWeb/popup-dialog
Popup dialog
|
2017-03-02 18:01:41 +09:00 |
|
Dean Herbert
|
963117f07d
|
Fix incorrect event order.
|
2017-03-02 17:41:33 +09:00 |
|
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 |
|
Dean Herbert
|
66cea49ba6
|
Merge pull request #404 from default0/flowcontainer-refactor
Flowcontainer refactor
|
2017-03-02 16:42:03 +09:00 |
|
Dean Herbert
|
c4ca18eeba
|
Remove references to PassThrough.
|
2017-03-02 16:28:51 +09:00 |
|
Dean Herbert
|
0bd3138887
|
Update framework.
|
2017-03-02 16:27:49 +09:00 |
|
DrabWeb
|
482be9f451
|
Remove AvailableMods
|
2017-03-02 02:04:26 -04:00 |
|
DrabWeb
|
367d6d694c
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-03-02 01:44:18 -04:00 |
|
DrabWeb
|
37ed1b3d09
|
Moved key press select mods to ModSection
|
2017-03-02 01:24:32 -04:00 |
|
DrabWeb
|
1eee587c18
|
CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection
|
2017-03-02 01:07:28 -04:00 |
|
DrabWeb
|
6c680825ed
|
ModSections in Ruleset, fixed toolbar play mode changed not firing
|
2017-03-01 22:05:52 -04:00 |
|
DrabWeb
|
bb12463ae4
|
Working on better way to handle mods
|
2017-03-01 20:57:33 -04: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 |
|
Dean Herbert
|
b3a411d8c3
|
Merge pull request #414 from EVAST9919/input_overlay
KeyCounter visibility
|
2017-03-01 21:50:13 +09:00 |
|
Andrey Zavadskiy
|
a6504e8f22
|
Triggering fix
|
2017-03-01 13:36:53 +03:00 |
|
Andrey Zavadskiy
|
cc92459ee1
|
KeyCounter visibility
|
2017-03-01 13:22:01 +03:00 |
|
Dean Herbert
|
327300e9a7
|
Merge pull request #408 from Jorolf/pluginManager
Disable mousewheel while playing
|
2017-03-01 13:10:47 +09:00 |
|
Dean Herbert
|
5bd18ce629
|
Merge pull request #410 from peppy/general-fixes
Add exponential fall-off of triangles' alpha values.
|
2017-03-01 13:08:04 +09:00 |
|