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

3708 Commits

Author SHA1 Message Date
Jorolf dd26f9fcac Merge branch 'master' of git://github.com/ppy/osu into tooltips 2017-04-17 14:45:46 +02:00
Dean Herbert 3c00776416 Merge pull request #639 from huoyaoyuan/fixes 
Don't block input in BeatmapInfoWedge.
 2017-04-17 19:54:06 +09:00
Huo Yaoyuan c235a14e3e Don't block input in BeatmapInfoWedge. 2017-04-17 17:08:01 +08:00
Dean Herbert 6239eab233 Update forgotten submodule. 2017-04-16 22:40:29 +09:00
Dean Herbert ce5d48b86c Merge pull request #637 from Dormanil/CS7-migration 
Explicitly set language version to C# 6.0 for now.
 2017-04-16 20:37:31 +09:00
Dean Herbert fbda181769 Update framework. 2017-04-16 20:15:36 +09:00
Adrian Kaz Scherzinger 60f7879875 Explicitly set C# 6.0 for now. 2017-04-16 06:44:08 +09:00
Dan Balasescu 9927f9aca5 Merge pull request #363 from DrabWeb/song-progress-graph 
Song Progress
 2017-04-15 01:37:25 +09:00
Dan Balasescu 31ce66bfdc Trim whitespace. 2017-04-15 01:31:42 +09:00
Dan Balasescu 3de3b94978 Merge branch 'master' into song-progress-graph 2017-04-15 01:29:02 +09:00
Dan Balasescu b247a7c3c3 Merge pull request #633 from peppy/hud-improvements 
Rearrange HUD elements
 2017-04-14 23:50:08 +09:00
Dean Herbert 52ddc414d5
Fix errors. 2017-04-14 20:17:17 +09:00
Dean Herbert ed3956eca5
Make comma separators optional. 2017-04-14 20:09:01 +09:00
Dean Herbert ac3b435f00
Merge remote-tracking branch 'upstream/master' into hud-improvements 
# Conflicts:
#	osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
 2017-04-14 19:29:59 +09:00
Dean Herbert 9d753a7798 Merge branch 'master' into song-progress-graph 2017-04-14 19:24:13 +09:00
Dean Herbert 627114abec
Improve test case. 2017-04-14 19:23:33 +09:00
Dean Herbert 98544a8077
Fix unsynchronised tweening. 2017-04-14 19:20:07 +09:00
Dean Herbert ea0631ede8
Encapsulate progress update logic better. 2017-04-14 18:23:34 +09:00
Dean Herbert acd7a5b254
Hook up beatmap object density to progress display. 2017-04-14 17:58:37 +09:00
Dean Herbert 6421f040dd
Fix SongProgress handling escape. 2017-04-14 15:27:24 +09:00
Dean Herbert 8c41707ac7
Fix incorrect default state. Handle input better. 2017-04-14 14:40:52 +09:00
Dean Herbert 09195a03a2
Merge remote-tracking branch 'upstream/master' into song-progress-graph 
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
 2017-04-14 11:25:00 +09:00
Dean Herbert d2fd3f1e0c Merge pull request #631 from peppy/pause-clean-up 
Pause clean up
 2017-04-14 11:22:15 +09:00
Jorolf 7f08c3c417 add IHasOverhangingTooltip 2017-04-14 00:18:17 +02:00
Jorolf f6f75fac74 Merge branch 'master' of git://github.com/ppy/osu into tooltips 
# Conflicts:
#	osu.Game/Graphics/Cursor/MenuCursor.cs
 2017-04-13 23:12:07 +02:00
Jorolf c2b2e5ec19 changed way the tool tip is found and displayed 2017-04-13 23:00:49 +02:00
Dean Herbert 9bf861d0a4 Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up 
# Conflicts:
#	osu.Game/Screens/Play/FailOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
 2017-04-14 01:07:34 +09:00
Dan Balasescu 9b44ff3b8e Merge pull request #629 from peppy/general-fixes 
General fixes
 2017-04-14 01:05:26 +09:00
Dean Herbert e62922ba64 Update framework. 2017-04-14 00:57:57 +09:00
Dean Herbert 262a2c9f0e
Add exception for failing. 2017-04-13 19:13:09 +09:00
Dean Herbert 5f8baf874d
Use interpolatedSourceClock's IsRunning value for consistency. 2017-04-13 18:31:23 +09:00
Dean Herbert 13f057f900
Give CursorTrail its own clock for the time being. 2017-04-13 14:14:12 +09:00
Dean Herbert 1f4e0b0251
Fix MosueUp and HighResolution events not being handled by MenuOverlays. 2017-04-13 13:03:07 +09:00
Dean Herbert 359fea7e25
Improve "escape" pressing logic in pause/fail menus. 2017-04-13 12:40:00 +09:00
Dean Herbert 94bf1d65b6
Fix thread race conditions on pausing close to a fail. 2017-04-13 11:41:08 +09:00
smoogipooo 3054697f98 Expose AccentColour/GlowColour from hud elements, and set from HudOverlay. 2017-04-13 10:04:12 +09:00
ocboogie 7b240d84da Merge branch 'master' into master 2017-04-12 15:04:27 -07:00
Dean Herbert 37d458e562 Merge pull request #574 from Jorolf/details 
Beatmap Details
 2017-04-12 21:19:14 +09:00
Dean Herbert 2c3fa30386
Metric -> Metrics. 2017-04-12 21:09:39 +09:00
Dean Herbert 00cd2c8372
Better comments. 2017-04-12 21:08:28 +09:00
ocboogie 32b87d12b5 Removed unneeded `using` 2017-04-12 04:54:24 -07:00
smoogipooo 2987a57588 Use formatter to add zeroes. 2017-04-12 20:28:04 +09:00
Dean Herbert 157ad17606 Merge branch 'master' into details 2017-04-12 20:25:51 +09:00
Dean Herbert cfacfe8294 Merge pull request #622 from peppy/sliderbar-improvements 
Add special SliderBar sound behaviour when at extents.
 2017-04-12 20:24:53 +09:00
Dan Balasescu 5bf71aae9c Remove unused using. 2017-04-12 20:14:12 +09:00
Dean Herbert 1d1b291efc Merge branch 'master' into sliderbar-improvements 2017-04-12 20:04:36 +09:00
Dan Balasescu c20f8f5e8e Merge pull request #625 from peppy/dependency-updates 
Update nuget packages.
 2017-04-12 20:04:00 +09:00
ocboogie 6c6ef946bd Some more clean up 2017-04-12 04:01:52 -07:00
Dan Balasescu ce269eaebb Merge branch 'master' into dependency-updates 2017-04-12 19:56:18 +09:00
Dean Herbert ec6267c5b2
switch -> if. 2017-04-12 19:41:11 +09:00