1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 09:07:25 +08:00
Commit Graph

378 Commits

Author SHA1 Message Date
Dean Herbert
f6ea5b0590 Remove duplicated code 2017-11-18 10:34:17 +09:00
Dean Herbert
8bd59ff0b3 Fix osu! logo occasionally being in the wrong state on entering the main menu 2017-11-17 17:40:10 +09:00
smoogipoo
9344502b71 More warning fixes 2017-11-14 18:05:07 +09:00
smoogipoo
bd7a6a90f5 Remove unused fields 2017-11-14 17:43:19 +09:00
Dean Herbert
49a5af60e2 Fix multiple order-of-execution issues with osu! logo
Also sets better defaults.
2017-11-13 18:43:16 +09:00
Dean Herbert
9e82fc21ac Improve transition when exiting song select
Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.
2017-11-10 01:10:44 +09:00
Dean Herbert
724540ceaa Fix toolbar not appearing at main menu 2017-11-09 20:38:34 +09:00
Dean Herbert
598e1652dc Adjust timings 2017-11-09 18:12:33 +09:00
Dean Herbert
6d56b3c2df Hide triangles during outro 2017-11-09 17:52:38 +09:00
Dean Herbert
e3a868744e
Merge branch 'master' into intro-v2 2017-11-09 17:48:42 +09:00
Dean Herbert
4874371dbf Rename methods back 2017-11-09 17:38:20 +09:00
Dean Herbert
e2005c4431 Add comment explaining necessity of AlwaysPresent for now 2017-11-08 20:36:18 +09:00
Dean Herbert
df6c808d28 Adjust animation to designer-san's liking 2017-11-08 17:04:36 +09:00
Dean Herbert
cabb22b6d1 Merge branch 'single-osu-logo' into intro-v2 2017-11-08 16:43:07 +09:00
Dean Herbert
c2d4a213b1 Rename logo-related methods 2017-11-08 16:34:03 +09:00
Dean Herbert
7ad498cb29 Remove unused puzzle pieces 2017-11-08 14:45:01 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
41fcecf759 Add intro in to actual game 2017-11-08 14:31:11 +09:00
Dean Herbert
d8d7165164 Add a test case which starts the game 2017-11-08 13:52:44 +09:00
Dean Herbert
713d730d10 Simplify restart process and defaults initialisation 2017-11-08 13:32:03 +09:00
Dean Herbert
1771e003f7 Simplify more 2017-11-08 12:13:30 +09:00
Dean Herbert
419f041291 Fix text alignment 2017-11-08 12:12:27 +09:00
Dean Herbert
f83c095269 Simplify more 2017-11-08 12:10:32 +09:00
Dean Herbert
89426e1c11 Simplify lines 2017-11-08 12:07:52 +09:00
Dean Herbert
7dcdf78608 Make bars and circles better 2017-11-08 12:06:22 +09:00
Dean Herbert
a72e798b85 bar -> line 2017-11-08 11:21:50 +09:00
Dean Herbert
97b238d084 Simplify intro sequence a bit more 2017-11-08 11:20:21 +09:00
Dean Herbert
552a361a24 Merge remote-tracking branch 'upstream/master' into intro-v2 2017-11-08 11:08:42 +09:00
EVAST9919
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
Dean Herbert
3adcfa8c38 Many fixes 2017-11-03 17:54:35 +09:00
Dean Herbert
2f205d1f63 Merge branch 'single-osu-logo' into intro-v2 2017-11-03 15:37:24 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
15197b9a76 Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 16:57:59 +09:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Dean Herbert
31dc5c97f2 Fix intro and duplicate inserts 2017-10-17 11:22:42 +09:00
smoogipoo
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
TocoToucan
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
EVAST9919
28a594179f CI fixes 2017-10-10 21:03:35 +03:00
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