1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 05:27:51 +08:00
Commit Graph

886 Commits

Author SHA1 Message Date
EVAST9919
15160f5116 Simplify the code by using more delayed sequences 2017-10-10 20:43:07 +03:00
EVAST9919
d3a62082b4 Final adjustments 2017-10-10 20:20:49 +03:00
EVAST9919
a58e828f54 Timing adjustments 2017-10-10 20:06:18 +03:00
EVAST9919
10a3f7c1d0 Use constants instead of magic numbers 2017-10-10 18:30:46 +03:00
EVAST9919
c34b9aef98 No need to put a lot of stuff inside the big circular container 2017-10-10 15:29:29 +03:00
EVAST9919
67a6da44f9 Rings timing adjustment 2017-10-10 15:02:43 +03:00
EVAST9919
9cad0ce2e9 Group transforms using delayed sequence
And some timing adjustments
2017-10-10 07:07:09 +03:00
EVAST9919
6fb8755a95 Use less masking for the ring 2017-10-10 06:06:09 +03:00
EVAST9919
19723b82f7 Remove ring's background field and adjust some timings 2017-10-10 04:12:01 +03:00
EVAST9919
e2d6659d48 Change Ring type, use RelativeSizeAxes for Background/Foreground 2017-10-10 03:57:15 +03:00
EVAST9919
59a0343c01 CI fixes 2017-10-10 01:36:40 +03:00
TocoToucan
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
EVAST9919
f8830e1b7c Animation adjustments 2017-10-05 21:37:37 +03:00
EVAST9919
cafacf20ff Add all the needed objects 2017-10-05 02:50:13 +03:00
EVAST9919
6fa45aafc6 Basic logic 2017-10-04 23:06:31 +03:00
TocoToucan
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
EVAST9919
e7c9ad245e Fix icons in main button system jumps on one side for a long time 2017-09-15 09:24:31 +03:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
Dean Herbert
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
Shane Woolcock
262aea8b6b Fix osu! logo triangles going super fast when the track is paused 2017-09-11 19:16:44 +09:30
smoogipooo
19db7a8f72 Update in line with framework changes. 2017-09-07 22:46:21 +09:00
smoogipooo
57678a13d9 Update in-line with framework changes. 2017-09-04 09:32:35 +09:00
Dean Herbert
0d9ea97828 Allow Rulesets to create a non-FontAwesome icon
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
Dean Herbert
5f53426a9a *Database -> *Store
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642 Make BeatmapStore's BeatmapDatabase private 2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777 Simplify and document DatabaseStore API 2017-07-27 15:06:10 +09:00
Dean Herbert
898a601098 Introduce a reference counting file store 2017-07-26 20:22:02 +09:00
Dean Herbert
9e20a02c0a Split out BeatmapDatabase into BeatmapStore
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert
64f2e2dc32 Use Colour instead of ColourInfo 2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b Update framework 2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-21 11:15:26 +02:00
MrTheMake
22f3e97241 Small optimization to the main menu intro seeking. 2017-07-20 17:15:39 +02:00
Dean Herbert
3bdd4d7d02 Centralise TrackManager.AddItem logic to avoid duplicate adds 2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4 Remove usage of SetExclusive
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
MrTheMake
fd518e2294 Don't start a beatmap's track until the intro is done playing 2017-07-20 01:57:46 +02:00
Thomas Müller
c4619f614a Merge branch 'master' of github.com:ppy/osu into better-transforms
# Conflicts:
#	osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
8ce71ef235 Fix broken test case 2017-07-19 18:48:27 +09:00
Dean Herbert
da92fccdb0 Merge branch 'master' into non-null-beatmap 2017-07-19 18:32:42 +09:00
Dean Herbert
c34856922c Gratify CI 2017-07-19 16:34:18 +09:00
Dean Herbert
2a2f4e2a8b Ensure side flashes are not visible during moving transitions 2017-07-19 16:13:01 +09:00
Dean Herbert
2b1e19814c Side flashes should not be affected by parallax 2017-07-19 16:07:11 +09:00
Dean Herbert
64ebc01a3b Remove many now unnecessary null-checks 2017-07-19 15:45:23 +09:00
Dean Herbert
d0dea33faa Make Beatmap (bindable) non-nullable. 2017-07-19 15:16:53 +09:00
Thomas Müller
3ba119c115 Ensure toolbar disappears when osu logo transition is cancelled 2017-07-18 17:09:53 +03:00
Thomas Müller
b40c897dbd Fix osu logo shockwave playing when transition is aborted
This is a very nice use-case scenario for TransformSequence.OnComplete
2017-07-18 15:28:56 +03:00
Thomas Müller
87bcd526f3 Get rid of raw AddDelay calls within osu.Game 2017-07-17 16:51:21 +03:00
Thomas Müller
19fb03e737 Try different formatting style 2017-07-16 18:28:20 +03:00
Thomas Müller
032e9df67b ApplyDelay -> AddDelay 2017-07-16 17:47:29 +03:00
Thomas Müller
99221260c4 Replace several usages of BeginDelayedSequence with LINQ-style 2017-07-16 17:42:01 +03:00
Thomas Müller
71105bb9ee Delay -> ApplyDelay; DelayReset -> ResetDelay 2017-07-16 14:06:46 +03:00
Thomas Müller
a5e610a7ba Update framework and fix compilation
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
0322e66c25 Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist 2017-07-12 13:07:23 +09:00
Thomas Müller
9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
Thomas Müller
4045083dcd Update sorting comparers in line with framework changes 2017-07-11 21:21:58 +03:00
Dean Herbert
a9c50786b2 Fix osu! logo on main menu ending up in the wrong place
Also switch to using BeginDelayedSequence where possible.
2017-07-11 13:27:45 +09:00
Dean Herbert
2c8b8c3f9c Update loop logic in line with framework changes 2017-07-09 18:23:34 +09:00
Thomas Müller
6de9776e05 Update framework with tooltip changes 2017-07-07 08:59:17 +03:00
Dean Herbert
724e5aa99e Merge master into better-input 2017-07-05 13:59:40 -07:00
Dean Herbert
3a82d77e5b Add missing tab 2017-07-01 07:10:04 -07:00
Thomas Müller
bb15bc0467 Use ReceiveMouseInputAt whenever possible 2017-06-30 09:54:03 +03:00
Dean Herbert
7469d0e3ba Merge remote-tracking branch 'upstream/master' into new-samples 2017-06-29 11:51:51 -07:00
Dean Herbert
ee96d39b93 Shuffle sound samples around and make more conformant 2017-06-28 10:19:04 -07:00
Dean Herbert
cbf188c293 Add new main menu backgrounds 2017-06-26 19:10:13 +09:00
Dean Herbert
ec99d83f6d Merge branch 'master' into fix_logo_sound 2017-06-25 15:13:57 +09:00
Thomas Müller
e3489928b7 Remove now obsolete InternalContains 2017-06-24 09:21:08 +02:00
EVAST9919
817d2c3da1 Fixed logo heartbeat playing even without beating 2017-06-23 23:57:57 +03:00
ColdVolcano
c619de7f9b Rename const in all of the code 2017-06-21 18:55:44 -05:00
ColdVolcano
1978a4e8a6 Boost visualiser performance
Also fixes amplitudes being set wrongly if kiai was false.
2017-06-21 18:32:31 -05:00
Dean Herbert
d0d0f11857 Merge branch 'master' into heartbeat 2017-06-21 15:35:54 +09:00
paparony03
62dee59672 Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
EVAST9919
a991cff908 OsuLogo beat sound 2017-06-19 17:37:00 +03:00
Dean Herbert
17cb043cb2 Visualiser 2017-06-19 18:41:35 +09:00
Dean Herbert
a1b9499480 More documentation and constants 2017-06-19 18:41:11 +09:00
Dean Herbert
8c063fe2b8 Simplify AccentColour property for now 2017-06-19 18:38:39 +09:00
Dean Herbert
e269bdbad7 Use additive colour; adjust constants a bit 2017-06-19 18:30:13 +09:00
Dean Herbert
359cb4c083 Add kiai support 2017-06-19 18:29:44 +09:00
ColdVolcano
77ca48c1bd CI Fixes 2017-06-18 23:52:42 -05:00
ColdVolcano
84aa17dea3 Attempt to fix possible loss of fraction 2017-06-18 23:08:27 -05:00
ColdVolcano
63aabc162b Fix TestCaseMenuButtonSystem not starting up 2017-06-18 22:34:45 -05:00
ColdVolcano
3764c1d799 Make bar length and visualizer count floats 2017-06-18 22:28:18 -05:00
ColdVolcano
cea8dc5602 Fix possible loss of fraction 2017-06-18 22:13:21 -05:00
ColdVolcano
d3662636d6 CI fixes 2017-06-18 22:01:07 -05:00
ColdVolcano
ccac2e9a75 Add a visualizer around the logo 2017-06-18 19:33:50 -05:00
smoogipooo
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
John Neijzen
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
John Neijzen
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
John Neijzen
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
Dean Herbert
bdeaf2dbb4 Update method names in line with framework changes 2017-05-28 18:34:12 +09:00
Dean Herbert
0dbb2220e0 Add missing early activation to menu flashes 2017-05-24 21:07:12 +09:00
Dean Herbert
45a964cebe Merge branch 'master' into osu-direct 2017-05-24 15:33:53 +09:00
Dean Herbert
03f9a86366 Add missing readonly 2017-05-24 13:29:12 +09:00
Dean Herbert
16d9a677d0 Add a low-end cutoff for scale adjust 2017-05-24 13:08:59 +09:00
Dean Herbert
a9d1e54c27 Adjust triangle movement based on amplitude 2017-05-24 13:08:54 +09:00
Dean Herbert
4ee11764b8 Merge branch 'master' into osu-direct 2017-05-24 12:16:34 +09:00
Dean Herbert
b1bd88ae71 Merge branch 'master' into logo-beat 2017-05-24 11:41:02 +09:00
ColdVolcano
207d6e4ac3 Update to new syntax of OnNewBeat 2017-05-23 20:01:20 -05:00
ColdVolcano
c6d744eb7c Merge branch 'master' of ppy/osu into menu-flashes 2017-05-23 20:00:02 -05:00
Dean Herbert
b477e5cd9e Fix potential nullref 2017-05-24 02:53:21 +09:00
Dean Herbert
813b09189c Remove unused parameter 2017-05-24 02:09:31 +09:00
Dean Herbert
7e827c4f11 Add amplitude adjust 2017-05-24 01:45:01 +09:00
Dean Herbert
b12300391b Merge branch 'master' 2017-05-24 01:17:09 +09:00
Dean Herbert
0dd52e4e29 Various refactoring 2017-05-23 17:26:28 +09:00
Dean Herbert
2decb2b2ff Add more flashiness during kiai time 2017-05-23 16:42:47 +09:00
Dean Herbert
73320f9a7e Don't bounce the ripple
Also ripple better.
2017-05-23 16:42:41 +09:00
Dean Herbert
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
Dean Herbert
3e0aaa1aa0 Add basic beat response to osu! logo 2017-05-23 12:29:43 +09:00
ColdVolcano
9235cbff8d Apply suggestions 2017-05-22 05:59:16 -05:00
ColdVolcano
63196df541 Typo fix
Forgot the pharenteses
2017-05-22 05:05:54 -05:00
ColdVolcano
601b840713 Apply suggestions 2017-05-22 04:55:33 -05:00
ColdVolcano
f2b5be27c8 CI Fixes 2017-05-22 04:53:32 -05:00
ColdVolcano
a1547f12d4 Applied suggestions + Update Framework 2017-05-22 04:38:21 -05:00
ColdVolcano
059af0850b Changes in-line with framework 2017-05-21 23:47:08 -05:00
ColdVolcano
38a566890f Add licence header 2017-05-20 11:44:19 -05:00
ColdVolcano
4e83f12f34 Initial implementation
Note this won't work with the osu!bgm because it is not a beatmap
2017-05-20 11:02:42 -05:00
DrabWeb
9ba356f2c6 Added osu!direct header and filter control 2017-05-17 05:58:34 -03:00
Dean Herbert
89e2a39d14 Merge remote-tracking branch 'upstream/master' into margin-padding-namespace 2017-05-16 16:36:34 +09:00
Dean Herbert
efab186384 Update namespaces in line with framework 2017-05-16 12:50:30 +09:00
Dean Herbert
23760d6805 Adjust osu! logo metrics and add shockwave impact animation 2017-05-15 19:36:03 +09:00
Dean Herbert
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586 Change all instances of options to settings where applicable 2017-05-15 10:55:29 +09:00
Dean Herbert
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Huo Yaoyuan
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
30b7a029dc Remove for real this time 2017-04-23 00:57:41 -05:00
ColdVolcano
fe35d20def Remove not needed stuff (+typo fix) 2017-04-23 00:50:02 -05:00
ColdVolcano
094a0f9639 Move MenuMusic logic to MainMenu 2017-04-23 00:36:23 -05:00
ColdVolcano
ca1f89f2cf Fix crash when there's no beatmaps 2017-04-14 17:48:27 -05:00
ColdVolcano
2c6327fca9 Build for real this time 2017-04-14 17:17:51 -05:00
Javier Flores
984c7092a6 Pls AppVeyor don't die 2017-04-14 16:33:58 -05:00
ColdVolcano
b7d61add45 Cleanup + AppVeyor fixes 2017-04-14 13:10:59 -05:00
ColdVolcano
b5fc84087f Show song in MusicController and SongSelect 2017-04-14 12:59:15 -05:00
ColdVolcano
2eb73a7c70 More smoothness when MenuMusic is false 2017-04-14 12:58:47 -05:00
ColdVolcano
2a9f4e6950 Get MenuMusic and MenuVoice woking 2017-04-14 12:42:42 -05:00
Dean Herbert
b5431c496b Fix osu! logo handling drags for no reason. 2017-04-08 19:34:04 +09:00
Dean Herbert
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
Dean Herbert
ab97967237
Update references and framework. 2017-03-29 09:54:00 +09:00
Dean Herbert
f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert
681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert
fbe08436d2
Fix usages of CircularContainer in line with framework changes. 2017-03-22 19:35:03 +09:00
Dean Herbert
3c7b4a8ffa Fix cursor being displayed during disclaimer. 2017-03-19 01:59:13 +09:00
Dan Balasescu
e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
Dean Herbert
6be80c95ae
Preload song select from main menu. 2017-03-17 20:11:59 +09:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains. 2017-03-16 17:38:36 +09:00
Huo Yaoyuan
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dean Herbert
e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Thomas Müller
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Thomas Müller
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
Dean Herbert
4a109fcc55
Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided. 2017-03-03 20:21:11 +09:00
smoogipooo
5a4d07d770 Better way to initialize team lists. 2017-03-03 18:47:56 +09:00
smoogipooo
e6d911e49b Move modified key conditional location. 2017-03-03 14:08:37 +09:00
Dan Balasescu
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
smoogipooo
26b81a14cf Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it. 2017-03-03 12:42:19 +09:00
smoogipooo
062d8ddc7c Don't handle menu buttons when Shift or Ctrl or Alt is pressed. 2017-03-03 12:41:45 +09: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
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