RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,868 Commits 3 Branches 651 Tags 353 MiB
Commit Graph

208 Commits

Author SHA1 Message Date
Thomas Müller 9e8fb698c6 Remove incorrectly shadowed variable 2017-02-23 22:33:07 +01:00
Thomas Müller 2689de0c0c Update framework and add "Async" suffix to asynchronous methods 2017-02-23 22:32:10 +01:00
Dean Herbert 6701cd9016 Merge branch 'master' into general-fixes 2017-02-23 17:04:53 +09:00
Dean Herbert f812641696 Merge pull request #383 from peppy/player-loading-screen 
Add loading screen.
 2017-02-23 17:04:44 +09:00
Dean Herbert da2bfe6d3c
Framework updates. 2017-02-23 16:42:12 +09:00
Dean Herbert d19a7813f3 Fix TestCasePlayer regression. 2017-02-22 23:27:29 +09:00
Dean Herbert c83d2bbe6e
Make panels fade in again. 2017-02-22 21:54:49 +09:00
Thomas Müller 417f146386 Add difficulty calculation 
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
 2017-02-19 17:41:51 +01:00
Dean Herbert 32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Dean Herbert 94dd268fd2
Move constant for default ControlPoint out of Slider. 2017-02-18 15:54:16 +09:00
Thomas Müller ef775458dd Fix compilation error introduced in merge conflict resolution. 2017-02-17 21:27:17 +01:00
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