Thomas Müller
|
1198705a6f
|
Merge branch 'master' of github.com:ppy/osu into general-fixes
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
|
2017-02-17 21:22:34 +01:00 |
|
Shadoxfix
|
7a45ea58b2
|
Add comment explaining why the branch is necessary
|
2017-02-17 18:17:18 +01:00 |
|
Shadoxfix
|
72306e8757
|
Fix beatmap import crash when the first timingPoint starts later than a slider
|
2017-02-17 17:36:00 +01:00 |
|
Dean Herbert
|
0b922365bb
|
Fix nullref due to missing controlPoints.
|
2017-02-17 15:27:48 +09:00 |
|
Damnae
|
b7fca88b4f
|
Clearer slider Velocity and TickDistance calculations.
|
2017-02-15 18:55:49 +01:00 |
|
Dean Herbert
|
11643d2e09
|
Remove unnecessary methods and local variables.
|
2017-02-13 18:30:51 +09:00 |
|
Dean Herbert
|
1aeb48b920
|
Merge remote-tracking branch 'upstream/master' into osb_loading
|
2017-02-13 18:22:29 +09:00 |
|
Thomas Müller
|
aaaf7163e0
|
Update framework.
|
2017-02-13 17:46:50 +09:00 |
|
Thomas Müller
|
e3f35cd66e
|
Merge branch 'master' into osb_loading
|
2017-02-12 12:26:25 +01:00 |
|
Dean Herbert
|
37e75e9a54
|
Add null check when loading beatmap background.
|
2017-02-12 16:13:44 +09:00 |
|
Damnae
|
a504c73f33
|
Load beatmap data from an optional osb file.
|
2017-02-09 15:19:09 +01:00 |
|
Andrey Zavadskiy
|
e06aa44c4c
|
Warning Fixes
|
2017-02-09 16:18:08 +03: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
|
756fd78a88
|
Fix incorrect line endings.
|
2017-02-07 13:52:19 +09:00 |
|
Dean Herbert
|
57d97ba2e9
|
Make triangles look better in many cases.
|
2017-02-04 22:09:44 +09: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 |
|
Dean Herbert
|
aec84ae725
|
Fix laggy animations, incorrect hiding logic.
|
2017-02-02 19:24:14 +09:00 |
|
Drew DeVault
|
9f9245cee3
|
Fix use of previous value in Alpha check
Frustratingly, this does not fix the problem of ghost groups
|
2017-02-01 19:28:08 -05:00 |
|
Drew DeVault
|
3143e9d35e
|
Fix poorly written BeatmapGroup logic
|
2017-01-31 20:04:17 -05:00 |
|
Drew DeVault
|
0861eb79e4
|
Minor cleanups
|
2017-01-31 19:55:36 -05: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 |
|
Drew DeVault
|
5852657205
|
Refactor out Hidden
Also fixes a bug I didn't think about before
|
2017-01-30 22:35:09 -05:00 |
|
Drew DeVault
|
42a2285ef3
|
Make BeatmapGroup.Hidden more intelligent
|
2017-01-30 09:47:04 -05:00 |
|
Drew DeVault
|
c00a558cb7
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-30 09:35:14 -05:00 |
|
Dean Herbert
|
bdbe8501d3
|
Merge branch 'master' into add-flash-effects
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
|
2017-01-30 21:47:05 +09:00 |
|
Dean Herbert
|
f0d30cc873
|
Make triangles opaque.
|
2017-01-30 16:53:12 +09:00 |
|
Dean Herbert
|
9f90b57543
|
Move BPM calculations to Beatmap.
|
2017-01-30 16:03:45 +09:00 |
|
Dean Herbert
|
0272c4b559
|
Add StarDifficulty property and correct colouring of difficulty icons.
|
2017-01-30 15:26:28 +09:00 |
|
Dean Herbert
|
2ed5cf7c91
|
Hook up icons better.
|
2017-01-30 13:35:40 +09:00 |
|
Dean Herbert
|
3125fa89ee
|
Fix method which should be class.
|
2017-01-29 15:06:44 +09:00 |
|
Dean Herbert
|
77558abf58
|
Merge branch 'master' into more-beatmap-info
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
|
2017-01-29 14:47:42 +09:00 |
|
Drew DeVault
|
10897486ba
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-27 15:41:46 -05:00 |
|
Drew DeVault
|
f3c5c1f0b8
|
Fixes following recent updates upstream
|
2017-01-26 21:31:28 -05:00 |
|
Dean Herbert
|
162e183b36
|
Fix some nullrefs when running visualtests with no maps loaded.
|
2017-01-27 00:16:02 +09:00 |
|
Drew DeVault
|
678f0aaa16
|
Implement filtering with strings
|
2017-01-17 19:18:15 -05:00 |
|
Dean Herbert
|
ee0b6be84b
|
Merge pull request #266 from kizayoi/master
Add support for old beatmaps
|
2017-01-16 16:02:22 +08:00 |
|
Drew DeVault
|
fa007e632d
|
Refactor colors to palette based design
|
2017-01-12 16:38:27 -05:00 |
|
Drew DeVault
|
70ecf48ca7
|
Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.
Closes #126
|
2017-01-09 17:20:31 -05:00 |
|
柯十六夜
|
acfbf2e32e
|
Add prefix Online to BeatmapID and BeatmapSetID
|
2017-01-09 21:05:01 +08:00 |
|
柯十六夜
|
e578e50721
|
Add support for old beatmaps
|
2016-12-21 16:29:57 +08:00 |
|
Dean Herbert
|
1d5dc77c4d
|
Keep reference to reader to avoid early disposal.
|
2016-12-18 20:47:00 +09:00 |
|
Dean Herbert
|
f14a9e7d6b
|
Remove unused beatmap reference in BeatmapGroup.
|
2016-12-18 17:06:56 +09:00 |
|
Dean Herbert
|
5ac9402d5f
|
Adjust fade out transform of difficulty panels to avoid overlap.
|
2016-12-18 17:06:03 +09:00 |
|
Dean Herbert
|
6e10a9bb29
|
Allow starting maps by clicking an active panel a second time.
|
2016-12-18 16:59:13 +09:00 |
|
n4b3l
|
73532b9172
|
small code improvements
|
2016-12-17 19:57:58 +01:00 |
|
Dean Herbert
|
8ce18e8986
|
Improve song select startup time via better database querying. Also fix difficulty displays.
|
2016-12-15 22:58:32 +09:00 |
|
Dean Herbert
|
f356640cb7
|
Add missing licence headers.
|
2016-12-06 19:07:15 +09:00 |
|
Thomas Müller
|
a0131b8b25
|
Fix slider velocity not being applied.
|
2016-12-03 14:52:51 +01:00 |
|
Dean Herbert
|
11f958030f
|
Make Triangles more flexible and more random.
|
2016-12-01 18:53:13 +09:00 |
|
Thomas Müller
|
b12b82fdd3
|
Fix depth values.
|
2016-11-29 20:50:12 +01:00 |
|
Dean Herbert
|
a506e91b7c
|
Fix compile issues.
|
2016-11-28 23:05:05 +09:00 |
|
Dean Herbert
|
49470318f2
|
Remove silly static using statement.
|
2016-11-28 22:48:28 +09:00 |
|
Dean Herbert
|
187a8bbfa7
|
Don't store beatmap reference in hitobjects.
|
2016-11-28 18:45:50 +09:00 |
|
Dean Herbert
|
bf63be0602
|
Add better slider duration calculation using bpm and difficulty information.
|
2016-11-28 15:31:54 +09:00 |
|
Dean Herbert
|
a5651427f6
|
Add basic ControlPoint parsing.
|
2016-11-28 15:12:11 +09:00 |
|
Thomas Müller
|
724f849543
|
Fix incorrect BeatmapPanel border caused by triangles.
|
2016-11-27 11:49:51 +01:00 |
|
Dean Herbert
|
5764bf8093
|
Improve IsAlive logic.
|
2016-11-26 17:22:58 +09:00 |
|
Dean Herbert
|
a1c3d15e6c
|
Add triangles to difficulty panels.
|
2016-11-26 17:10:13 +09:00 |
|
Dean Herbert
|
e36a51acf0
|
Custom LifetimeList (experimental).
|
2016-11-25 18:30:13 +09:00 |
|
Dean Herbert
|
f540bf3765
|
Ensure set headers are above difficulties.
|
2016-11-25 12:48:59 +09:00 |
|
Dean Herbert
|
35a02aa972
|
Fade in headers but not difficulties by default.
|
2016-11-25 12:48:41 +09:00 |
|
Dean Herbert
|
12c74b1b0b
|
Don't set hidden; make it based on alpha value.
|
2016-11-25 12:47:58 +09:00 |
|
Dean Herbert
|
ece3bc0e01
|
Refactor BeatmapInfoWedge to be async.
|
2016-11-24 13:48:48 +09:00 |
|
Dean Herbert
|
611619fd9c
|
Fix some namespaces.
|
2016-11-23 12:00:17 +09:00 |
|
Thomas Müller
|
030a20a3f2
|
Fix minor issues with alpha fading at edges.
|
2016-11-22 21:58:46 +01:00 |
|
Thomas Müller
|
9bf23bc4ad
|
Only handle beatmap panels that are visible in song select.
|
2016-11-22 21:41:48 +01:00 |
|
Thomas Müller
|
2596e71494
|
Improve smooth movement in beatmap carousel.
|
2016-11-22 20:10:04 +01:00 |
|
Dean Herbert
|
4cf2dd90d6
|
Standardise and simplify the amount of beatmap information passed around song select.
|
2016-11-22 22:07:15 +09:00 |
|
Dean Herbert
|
b73cdba08c
|
Change the structure of BeatmapSetHeader to allow for bufferedcontainer invalidation.
|
2016-11-22 21:38:46 +09:00 |
|
Dean Herbert
|
3bc38268a0
|
Make MusicController more async.
|
2016-11-22 20:47:28 +09:00 |
|
Dean Herbert
|
f576b4bf82
|
Don't use texture atlases for beatmap backgrounds.
|
2016-11-22 20:14:58 +09:00 |
|
Dean Herbert
|
0109c79cae
|
Async load of panel backgrounds (failing for on-screen panels).
|
2016-11-22 19:48:51 +09:00 |
|
Dean Herbert
|
7df8324957
|
Explicit disposal via using() to WorkingBeatmap.
|
2016-11-22 14:57:53 +09:00 |
|
Dean Herbert
|
41a84ba00c
|
Add finalizer logic for WorkingBeatmap for now.
|
2016-11-21 21:35:10 +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
|
d3f810f72f
|
Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).
|
2016-11-14 22:03:39 +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 |
|
Huo Yaoyuan
|
7c8ef2a82b
|
Select and unselect BeatmapPanel when selecting BeatmapGroup.
|
2016-11-14 04:22:06 +08:00 |
|
Dean Herbert
|
cc0f61f545
|
Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
|
2016-11-12 20:18:26 +09:00 |
|
Dean Herbert
|
18c0e431c1
|
Fix some nullrefs.
|
2016-11-12 18:25:58 +09:00 |
|
Drew DeVault
|
d49b418449
|
Implement ShowUnicode option behavior
|
2016-11-10 21:35:58 -05:00 |
|
Drew DeVault
|
fe9034323b
|
Get the game running, though not perfectly
|
2016-11-10 16:42:29 -05:00 |
|
Drew DeVault
|
ee24cd310c
|
Convert everything to DI pattern
|
2016-11-10 16:41:18 -05:00 |
|
Huo Yaoyuan
|
c59cad2478
|
AudioEquals method for BeatmapInfo.
|
2016-11-07 21:52:23 +08:00 |
|
Dean Herbert
|
f14a35d480
|
Update FontAwesome definitions.
|
2016-11-07 17:59:00 +09:00 |
|
Thomas Müller
|
103176826f
|
Ensure transformations are never used prior to being added to the Drawable tree.
|
2016-11-06 11:13:52 +01:00 |
|
Thomas Müller
|
32ee20b843
|
Merge branch 'master' of github.com:ppy/osu into better-clocks
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
|
2016-11-06 10:08:24 +01:00 |
|
Thomas Müller
|
5f2bf165a2
|
Remove now obsolete clock usages.
|
2016-11-06 10:06:09 +01:00 |
|
Thomas Müller
|
a6c0fd29f2
|
Make use of new timing system in Drawables and Transforms.
|
2016-11-06 08:25:21 +01:00 |
|
Maciej
|
bcc1d7c669
|
Background scaling different approach
|
2016-11-06 04:37:41 +01:00 |
|
Maciej
|
c4132339a6
|
Working beatmap background scaling fix
Add a check for the working beatmap background width and assign a proper
scaling value to cover the whole box
|
2016-11-06 04:12:35 +01:00 |
|
Dean Herbert
|
3c8f94dd0f
|
Merge pull request #136 from Tom94/general-fixes
Fix wrong initial state of beatmap panels.
|
2016-11-05 23:04:37 +09:00 |
|
Thomas Müller
|
7c7e2160ec
|
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
|
2016-11-05 14:05:42 +01:00 |
|
Thomas Müller
|
619d97c642
|
Fix indentation and typo.
|
2016-11-05 13:51:52 +01:00 |
|
Thomas Müller
|
07e74068e7
|
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
|
2016-11-05 13:35:15 +01:00 |
|
Huo Yaoyuan
|
e69dac7745
|
Fix lock object.
|
2016-11-05 20:21:08 +08:00 |
|
Huo Yaoyuan
|
f2b37e1fe7
|
Add lock on each property of WorkingBeatmap.
|
2016-11-05 20:01:46 +08:00 |
|