1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 03:42:58 +08:00
Commit Graph

2625 Commits

Author SHA1 Message Date
Thomas Müller
66cdc76621 Merge branch 'master' into hide-cursor 2017-03-19 09:23:30 +01:00
Dean Herbert
034d818427 Update framework. 2017-03-19 17:22:47 +09:00
Dean Herbert
af85bcaf1d Merge pull request #500 from smoogipooo/explicit_expires
Make DrawableHitObject expires explicit.
2017-03-19 12:47:43 +09:00
Dean Herbert
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
Dean Herbert
f237b5f1b8 Merge pull request #498 from smoogipooo/taiko_hitobject_base
Taiko hitobject base
2017-03-19 12:03:29 +09:00
Dean Herbert
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
Dean Herbert
7337cb5f62 Merge branch 'master' into taiko_hitobject_base 2017-03-19 11:37:39 +09:00
Dean Herbert
f56b84a1ca Fix mouse cursor in VisualTestGame. 2017-03-19 02:32:21 +09:00
Dean Herbert
3c7b4a8ffa Fix cursor being displayed during disclaimer. 2017-03-19 01:59:13 +09:00
Dean Herbert
8f75032b64 Fix incorrect abs. 2017-03-18 22:37:50 +09:00
Dean Herbert
125936bad0 Fix double-assignment. 2017-03-18 22:23:53 +09:00
Dean Herbert
87622f9349 Update framework. 2017-03-18 22:21:51 +09:00
Dean Herbert
919ec2d3a5 Spend more when wound up. 2017-03-18 22:17:23 +09:00
Dean Herbert
6f07930110 Move cursor hiding to OsuGameDesktop (fixes headless). 2017-03-18 21:46:58 +09:00
Thomas Müller
f636f59289 Nicer cursor orientation when dragging 2017-03-18 12:47:49 +01:00
Thomas Müller
9af0104e3e Fix NaN when dragging music controller
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
Thomas Müller
3649b432a1 Update framework 2017-03-18 12:04:42 +01:00
Thomas Müller
341f36be5f Add tests service reference 2017-03-18 12:00:44 +01:00
Thomas Müller
3ee2b68215 Hide the OS cursor in OsuGameBase 2017-03-18 12:00:31 +01:00
smoogipooo
4b3308fd1d Remove TaikoHitObject Type, we won't be using this going forward. 2017-03-18 18:40:26 +09:00
smoogipooo
b68b017a49 What even was this lol. 2017-03-18 18:38:51 +09:00
smoogipooo
26b0bb02d8 Remove IIsLegacy, expose LegacyBeatmap without a public constructor. 2017-03-18 18:32:54 +09:00
Dean Herbert
33d70b9bbc
Update framework. 2017-03-18 13:23:58 +09:00
Dan Balasescu
124efe8126 Merge pull request #504 from peppy/song-select-loading-reoptimisation
Song select performance / code cleanup.
2017-03-18 02:19:02 +09:00
Dan Balasescu
e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
smoogipooo
bcaf12e3d9 Rename Criteria -> CreateCriteria and make into method. 2017-03-18 02:11:14 +09:00
Dan Balasescu
af55bc4a12 Merge pull request #505 from peppy/menu-cursor
Add menu cursor.
2017-03-18 02:09:10 +09:00
smoogipooo
77067b7e64 Re-style. 2017-03-18 02:04:23 +09:00
Dan Balasescu
1fda7ee33e Merge branch 'master' into menu-cursor 2017-03-18 01:51:41 +09:00
Dan Balasescu
cd30958086 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 01:25:22 +09:00
Dean Herbert
3e3cde01ef
Fix missing permitNulls. 2017-03-17 21:21:16 +09:00
Dean Herbert
cefb59caa0 Merge pull request #497 from smoogipooo/controlpoint_effects
Add reading of KiaiMode/OmitFirstBarLine from legacy control points.
2017-03-17 21:11:13 +09:00
Dean Herbert
317dc94b4c
Adjust appearance. 2017-03-17 21:09:31 +09:00
Dean Herbert
ba67e63ffa
Update resources. 2017-03-17 20:53:20 +09:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor. 2017-03-17 20:45:27 +09:00
Dean Herbert
7110ab8e17
Stop cursor moving when paused. 2017-03-17 20:45:27 +09:00
Dean Herbert
292de44a0b
WIP menu cursor. 2017-03-17 20:45:27 +09:00
Dean Herbert
0a03bdc428
Add missing license header. 2017-03-17 20:44:02 +09:00
Dean Herbert
6be80c95ae
Preload song select from main menu. 2017-03-17 20:11:59 +09:00
Dean Herbert
c7fa79b027
Fix nullref. 2017-03-17 20:09:23 +09:00
Dean Herbert
907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
Dean Herbert
4b97304603
CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
Dean Herbert
dc28f8c79e
Remove all external access to BeatmapGroup. 2017-03-17 19:12:15 +09:00
Dean Herbert
3401759665
Don't batch imports for now. 2017-03-17 18:57:24 +09:00
Dean Herbert
ba73968303
Load whole panel background in async. 2017-03-17 18:28:21 +09:00
smoogipooo
cce1ae055f Make DrawableHitObject expires explicit. 2017-03-17 15:30:19 +09:00
smoogipooo
74a1837a05 Fix nullref. 2017-03-17 14:56:50 +09:00
Dean Herbert
2abcdbf4df
Fix potentially incorrect states being applied to panels on first display. 2017-03-17 14:56:12 +09:00
smoogipooo
67c9bb37fd Add license headers. 2017-03-17 14:51:09 +09:00
smoogipooo
862c4c408f Add legacy beatmap flag. 2017-03-17 14:24:46 +09:00