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 |
|
smoogipooo
|
35d246b59d
|
Merge remote-tracking branch 'origin/master' into tournament_drawings
|
2017-03-01 19:32:33 +09:00 |
|
Dean Herbert
|
e60cead483
|
Merge remote-tracking branch 'upstream/master' into warning_fixes
|
2017-02-28 13:49:19 +09: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 |
|
smoogipooo
|
44f3dfa3fe
|
Make it display by default.
|
2017-02-27 23:38:37 +09:00 |
|
Andrey Zavadskiy
|
3487dfe236
|
Removed unused variables and parameters
|
2017-02-27 17:32:32 +03:00 |
|
default0
|
8d91519d59
|
Update usage of FlowContainer and its subclasses
|
2017-02-26 21:32:43 +01:00 |
|
Dean Herbert
|
c5ad79e3e2
|
Remove unnecessary schedule.
|
2017-02-26 21:15:33 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09: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 |
|
Jorolf
|
a48e4a31a7
|
Parallax Option works now
|
2017-02-18 21:34:21 +01:00 |
|
Dean Herbert
|
c1194102b1
|
Remove second sample playback when clicking osu! logo.
|
2017-02-18 22:33:24 +09:00 |
|
Dean Herbert
|
32ce8cf723
|
Audio class renames in line with framework changes.
|
2017-02-18 17:35:04 +09:00 |
|
Dean Herbert
|
bf33cc6f53
|
Make disclaimer actually be a thing.
|
2017-02-18 14:16:46 +09:00 |
|
Dean Herbert
|
fe3a6248ec
|
Add better screen hierarchy and placeholder for dev build disclaimer.
|
2017-02-17 20:07:16 +09:00 |
|
Dean Herbert
|
e6ef9f67aa
|
GameMode -> Screen.
|
2017-02-17 19:23:58 +09:00 |
|
Dean Herbert
|
9e8b4d43dd
|
Improve exit procedure.
|
2017-02-17 17:25:28 +09:00 |
|
Dean Herbert
|
04346dbb92
|
Make osu! logo at song select correctly handle mouse focus.
|
2017-02-16 22:24:25 +09:00 |
|
Thomas Müller
|
aaaf7163e0
|
Update framework.
|
2017-02-13 17:46:50 +09:00 |
|
Dean Herbert
|
e23202c449
|
Merge remote-tracking branch 'upstream/master' into desktop-unit-tests
|
2017-02-10 17:22:38 +09:00 |
|
Andrey Zavadskiy
|
e06aa44c4c
|
Warning Fixes
|
2017-02-09 16:18:08 +03:00 |
|
Dean Herbert
|
829fb2605b
|
Fix visualtest regression.
|
2017-02-09 17:47:11 +09:00 |
|
Dean Herbert
|
a7dac15d05
|
Toolbar is now toggled by the main menu.
|
2017-02-08 20:30:45 +09:00 |
|
Dean Herbert
|
34a030e3be
|
Fix race conditions causing menu transitions to look wrong when executed in very fast succession.
|
2017-02-07 22:19:36 +09:00 |
|
Dean Herbert
|
d06f0cf870
|
Fix escape not always handling back action correctly at main menu (back button not yet visible).
|
2017-02-07 22:19:17 +09:00 |
|
Dean Herbert
|
dc5e9dde56
|
Fix escape key nonsense.
|
2017-02-07 21:46:13 +09:00 |
|
Dean Herbert
|
8a0887c3c3
|
Add sound effect to osu! logo clicking.
|
2017-02-07 21:45:59 +09:00 |
|
Dean Herbert
|
24ba21363e
|
Make intro->mainmenu work better by delaying interactiveness of osu! logo.
|
2017-02-07 21:37:34 +09:00 |
|
Dean Herbert
|
e2f680a65f
|
Change main menu buttons to be activate OnClick.
|
2017-02-07 20:30:40 +09:00 |
|
Dean Herbert
|
6b011a50d2
|
Naming standardisation and enforcing.
|
2017-02-07 16:20:36 +09:00 |
|
Dean Herbert
|
50bd80cb0c
|
Update and standardise license headers.
|
2017-02-07 14:27:41 +09:00 |
|
Dean Herbert
|
9b9ed32245
|
Remove all @2x references, updates resource and framework.
|
2017-02-06 22:19:47 +09:00 |
|
Thomas Müller
|
6db70f8850
|
Use MaskingSmoothness to make masked diagonal edges smoother.
|
2017-02-04 11:06:26 +01:00 |
|
Dean Herbert
|
16a01abc4d
|
Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
|
2017-02-03 13:16:07 +09:00 |
|
Drew DeVault
|
637a99e8d0
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-31 19:00:50 -05:00 |
|
Dean Herbert
|
6b66ecc131
|
Global shadows and more sane font size setting.
|
2017-01-31 18:53:52 +09:00 |
|
Dean Herbert
|
f0d30cc873
|
Make triangles opaque.
|
2017-01-30 16:53:12 +09:00 |
|
Dean Herbert
|
a315db68ab
|
Remove unused field.
|
2017-01-30 16:08:31 +09:00 |
|
Dean Herbert
|
6d44c5c8f1
|
Move logo colour definitions local to their usage.
|
2017-01-27 17:57:52 +09:00 |
|
Dean Herbert
|
9b2669e1ae
|
Add flash when activating the osu! logo.
|
2017-01-27 17:23:53 +09:00 |
|
Dean Herbert
|
50e4c39e32
|
Add flash when activating a menu button.
|
2017-01-27 17:23:53 +09:00 |
|
Dean Herbert
|
a238637990
|
Move osu! logo colour declarations to palette.
|
2017-01-27 17:23:53 +09:00 |
|
Drew DeVault
|
f3c5c1f0b8
|
Fixes following recent updates upstream
|
2017-01-26 21:31:28 -05:00 |
|
Dean Herbert
|
ae464fcace
|
Move Intro logic to OnEntering in line with framework changes.
|
2017-01-20 16:30:24 +08:00 |
|
Drew DeVault
|
fa007e632d
|
Refactor colors to palette based design
|
2017-01-12 16:38:27 -05:00 |
|
Drew DeVault
|
c222be05c0
|
Add Color4.Opacity and OsuColor.Gray
|
2017-01-10 13:44:40 -05:00 |
|
Dean Herbert
|
f356640cb7
|
Add missing licence headers.
|
2016-12-06 19:07:15 +09:00 |
|
Dean Herbert
|
ef8793ff24
|
Merge branch 'refs/heads/master' into more-sound-effects
|
2016-12-06 00:08:45 +09:00 |
|
Dean Herbert
|
7bd9a87bda
|
Add menu button sound effects.
|
2016-12-05 21:09:41 +09:00 |
|
Dean Herbert
|
ff85ccca6d
|
Move the actual outro sequence into Intro rather than MainMenu.
|
2016-12-05 19:34:52 +09:00 |
|
Thomas Müller
|
1e8dc780ab
|
Use new framework-level triangles.
|
2016-12-01 19:12:35 +01:00 |
|
Dean Herbert
|
22905d2033
|
Align logo correctly between intro and main menu.
Kinda hacky but will do for now.
|
2016-12-01 21:59:32 +09:00 |
|
Dean Herbert
|
2342a17dbc
|
Move BufferedContainer usage to allow ripple to blend correctly with the background layer.
|
2016-12-01 21:29:14 +09:00 |
|
Dean Herbert
|
511dab32ef
|
Remove masking from Triangles to simplify OsuLogo masking hierarchy.
|
2016-12-01 21:12:37 +09:00 |
|
Dean Herbert
|
4b74ea7586
|
Separate logo hover and bounce into separate containers to fix consecutive actions.
|
2016-12-01 20:52:26 +09:00 |
|
Dean Herbert
|
1f370fe29c
|
Add animated osu! logo.
|
2016-12-01 20:21:14 +09:00 |
|
Dean Herbert
|
c26587ec3a
|
Update depth comparer name.
|
2016-11-30 15:50:48 +09:00 |
|
Dean Herbert
|
5101297f53
|
Add drop shadows to main menu buttons.
|
2016-11-30 15:02:53 +09:00 |
|
Dean Herbert
|
476168eec2
|
Add shadow to main menu button/icon text.
|
2016-11-30 13:15:34 +09:00 |
|
Thomas Müller
|
c6d688898f
|
Initial implementation of a beatmap carousell and various minor improvements to song select.
No big optimizations yet, but groundwork is laid out.
|
2016-11-20 20:34:16 +01:00 |
|
Dean Herbert
|
d846246ef2
|
ShowToolbar -> ShowOverlays; include MusicController.
|
2016-11-15 20:55:57 +09:00 |
|
Dean Herbert
|
abdfe42388
|
Merge branch 'refs/heads/master' into better-anchors
# Conflicts:
# osu.Game.Mode.Osu/UI/OsuComboCounter.cs
# osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs
|
2016-11-15 14:33:13 +09:00 |
|
Dean Herbert
|
06f4f93918
|
Move play modes to Modes namespace.
|
2016-11-14 18:03:20 +09:00 |
|
Dean Herbert
|
0f4538f69f
|
Rename GameModes namespace to Screens.
|
2016-11-14 17:23:33 +09:00 |
|