h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 14:27:31 +08:00
Code Issues Releases Wiki Activity
4,010 Commits 3 Branches 653 Tags 366 MiB
324d5c1093
Commit Graph

4010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipooo
324d5c1093 Merge remote-tracking branch 'origin/master' into fix-drumroll-conversion 2017-04-26 13:17:28 +09:00
Dean Herbert
36c649f965 Merge pull request #673 from peppy/general-fixes 
Update framework.
 2017-04-25 21:51:03 +09:00
Dean Herbert
aa534ead7d Update framework. 2017-04-25 20:52:26 +09:00
Dean Herbert
73b8d58944 Merge pull request #658 from Jorolf/slider-stuff 
Slider tooltip and letterboxing/dim changes
 2017-04-25 20:03:59 +09:00
Dean Herbert
30e2e7bfe4 Merge branch 'master' into slider-stuff 2017-04-25 19:42:46 +09:00
Dean Herbert
8d1ad1ab8c Merge pull request #671 from peppy/general-fixes 
Update README.
 2017-04-25 19:42:36 +09:00
Dean Herbert
dd7c856228 Merge branch 'master' into general-fixes 2017-04-25 19:36:09 +09:00
Dean Herbert
5dddd49c96 Merge pull request #634 from ColdVolcano/intro-improvements 
Bind MenuMusic and MenuVoice
 2017-04-25 13:39:30 +09:00
Dean Herbert
f93adebc52 Minor style fixes. 2017-04-25 13:33:34 +09:00
ColdVolcano
51c577624b Remove BeatmapInfo field 2017-04-24 22:59:33 -05:00
ColdVolcano
1df50adc3a Post-merge fixes (and CodeFactor fixes) 2017-04-24 22:48:25 -05:00
ColdVolcano
630c556b80 Merge branch 'master' of https://github.com/ppy/osu into intro-improvements 2017-04-24 22:42:28 -05:00
ColdVolcano
12036cada5 Merge branch 'intro-improvements' of https://github.com/ColdVolcano/osu into intro-improvements 2017-04-24 22:32:23 -05:00
ColdVolcano
e6428dd0c2 Merge branch 'master' of https://github.com/ColdVolcano/osu into intro-improvements 2017-04-24 22:32:10 -05:00
Dean Herbert
b80fa74f47 Update README. 2017-04-25 11:11:57 +09:00
Dean Herbert
fd6f1db316 Merge pull request #670 from peppy/info-wedge-design-update 
Update BeatmapInfoWedge design
 2017-04-25 08:56:41 +09:00
Dan Balasescu
91b264da1a Merge branch 'master' into info-wedge-design-update 2017-04-25 08:14:59 +09:00
Dan Balasescu
39ff081ff9 Merge pull request #668 from peppy/general-fixes 
General fixes
 2017-04-25 08:14:44 +09:00
Dan Balasescu
b3e21f6f99 Merge branch 'master' into general-fixes 2017-04-25 08:05:03 +09:00
Dan Balasescu
908f32b221 Merge pull request #669 from peppy/online-metrics 
Retrieve online metrics
 2017-04-25 08:02:56 +09:00
Dan Balasescu
f329587bd4 Fix mismatched braces. 2017-04-25 08:02:09 +09:00
Jorolf
a6ea6738e5 add some spaces after commas 2017-04-24 17:10:00 +02:00
Jorolf
7ef90e6597 Merge branch 'master' of git://github.com/ppy/osu into slider-stuff 2017-04-24 17:05:32 +02:00
Dean Herbert
b8bf942860 Don't use parallel compiling on non-windows platforms. 
This currently triggers a unhandled exception in msbuild.
 2017-04-24 22:14:19 +09:00
Dean Herbert
43d09a9734 CI fixes 2017-04-24 20:31:25 +09:00
Dean Herbert
2d6fa711d1 Remove unnecessary base.Update() in PlayerInputManager. 2017-04-24 20:22:21 +09:00
Dean Herbert
3c98170330 Use method group for MusicController fault. 2017-04-24 20:22:21 +09:00
Dean Herbert
915ff7cba5 Add parallel compile flag. 2017-04-24 20:22:21 +09:00
Dean Herbert
9ecfb4e4bf Last CI fix. 2017-04-24 20:22:04 +09:00
Dean Herbert
c7b789424b Update BeatmapInfoWedge design 
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
 2017-04-24 20:19:44 +09:00
Dean Herbert
d84f1f05e2 Add better commenting for ambiguous parameter 2017-04-24 20:16:53 +09:00
Dean Herbert
9670ea9a2a CI fixes 2017-04-24 20:16:41 +09:00
Dean Herbert
8b048a6706 Fix typo. 2017-04-24 19:33:48 +09:00
Dean Herbert
c55d406b44 Fix nullref possibility. 2017-04-24 19:25:35 +09:00
Dean Herbert
6aa6e5eef7 Store and restore the selected details tab at song select. 2017-04-24 19:25:27 +09:00
Dean Herbert
e1a2f1bc7a Add beatmap metrics lookup. 2017-04-24 19:17:11 +09:00
Dean Herbert
d6c5654924 Reduce paddings and lock in some fixed heights for BeatmapDetails. 2017-04-24 18:55:49 +09:00
Dean Herbert
4fa22146b8 Increase safety of score lookups when leaderboard isn't visible. 2017-04-24 18:48:28 +09:00
Dean Herbert
ee659e7307 Fix decimal display of beatmap details being too precise. 2017-04-24 18:34:27 +09:00
Dean Herbert
c61f69569c Merge pull request #662 from smoogipooo/nodal-hit-sounds 
Nodal hit sounds
 2017-04-24 14:22:45 +09:00
Dean Herbert
a475f1f237 Remove redundant qualifier. 2017-04-24 14:16:51 +09:00
Dean Herbert
ba2db75890 Merge branch 'master' into nodal-hit-sounds 2017-04-24 14:14:33 +09:00
Dean Herbert
239f19ad02 Fix incorrect line endings. 2017-04-24 14:10:44 +09:00
Dean Herbert
c48c10e248 Merge branch 'master' into intro-improvements 2017-04-24 13:05:18 +09:00
Dean Herbert
8ee7968dc9 Merge pull request #667 from ColdVolcano/music-controller-fixes 
Fix MusicController not being able to change song
 2017-04-24 00:05:22 +09:00
ColdVolcano
30b7a029dc Remove for real this time 2017-04-23 00:57:41 -05:00
ColdVolcano
6a05440e6c Only schedule when faulted 2017-04-23 00:53:21 -05:00
ColdVolcano
fe35d20def Remove not needed stuff (+typo fix) 2017-04-23 00:50:02 -05:00
ColdVolcano
4b69477531 Trim whitespace 2017-04-23 00:41:15 -05:00
ColdVolcano
094a0f9639 Move MenuMusic logic to MainMenu 2017-04-23 00:36:23 -05:00