Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Aergwyn
707af02097
apply feedback
...
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
Dean Herbert
9ea6ab28ea
Fix intro potentially starting out-of-sync due to logo's outward animation
2018-05-30 20:22:31 +09:00
Aergwyn
2b3a630270
add OverlayActivation enum
...
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
Dean Herbert
2c9b2aa0e7
Fix intro setting beatmap in background thread causing race conditions
2018-04-22 02:46:20 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c
Move deletion to ArchiveModelImportManager
2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3
Give ArchiveReader a filename
2018-02-15 14:22:39 +09:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +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
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
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
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
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
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
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
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
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
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
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
