h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 14:22:55 +08:00
Code Issues Releases Wiki Activity
7,522 Commits 3 Branches 661 Tags 370 MiB
cf44868bcd
Commit Graph

7522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Balasescu
860b389e9a Merge pull request #1305 from WebFreak001/master 
URL encode beatmap filename
 2017-09-25 10:02:56 +09:00
Dan Balasescu
a5622bb293 Merge branch 'master' into master 2017-09-25 09:58:29 +09:00
Huo Yaoyuan
2b11ecec13 Remove usings to extensions. 2017-09-24 06:03:52 +08:00
Huo Yaoyuan
87c8278139 Use Array.Empty. 2017-09-24 03:45:46 +08:00
Huo Yaoyuan
c5aebf6401 Use TimeSpan to represent time. 2017-09-24 03:23:31 +08:00
Huo Yaoyuan
d277952e0f Use DateTimeOffset.ToUnixTime 2017-09-24 00:42:46 +08:00
Dean Herbert
b59379252b Merge pull request #1307 from huoyaoyuan/song-select-fix 
Fix overlay toggling in song select.
 2017-09-23 20:01:10 +08:00
Huo Yaoyuan
442259d9e0 Fix overlay toggling in song select. 2017-09-23 19:47:23 +08:00
WebFreak001
e04526222c URL encode beatmap filename 2017-09-22 22:47:26 +02:00
MrTheMake
34fb6ccdf5 Removed generic parameter function 2017-09-22 16:17:03 +02:00
Dan Balasescu
8853cab911 Merge pull request #1298 from peppy/song-select-toggle-overlays 
Ensure only one dialog is being displayed by the SongSelect footer at a time
 2017-09-22 22:57:53 +09:00
Dan Balasescu
9e02570802 Merge branch 'master' into song-select-toggle-overlays 2017-09-22 22:41:52 +09:00
MrTheMake
02bc429911 CI fix 2017-09-22 15:37:17 +02:00
MrTheMake
0a27916761 Added infoMessage class to the project, use the class for the /help command and handle command parameter better 2017-09-22 15:31:30 +02:00
MrTheMake
18c26a85ba Added an infoMessage class to represent system messages that aren't errors 2017-09-22 15:30:07 +02:00
MrTheMake
29707788f9 Code formatting 2017-09-22 15:29:04 +02:00
MrTheMake
dc5c046d4b Fixed wrong action message color 2017-09-22 14:33:20 +02:00
Damnae
2c245f4c22 Merge branch 'master' into storyboard_integration 
# Conflicts:
#	osu.Game/Configuration/OsuConfigManager.cs
#	osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs
 2017-09-22 12:45:34 +02:00
MrTheMake
3e8941f8e1 Fix chat message style for non action messages 2017-09-22 11:35:07 +02:00
MrTheMake
dce577f92a Updated design 2017-09-22 11:30:01 +02:00
Dean Herbert
d82b7575e1 Merge pull request #1283 from gabixdev/master 
Add option to disable cursor rotation.
 2017-09-22 15:43:09 +08:00
Dean Herbert
98c22e8111 Merge branch 'master' into master 2017-09-22 15:19:23 +08:00
MrTheMake
31e26364a6 Initial implementation of chat commands 2017-09-22 01:47:24 +02:00
gabixdev
8438ea1267 Fix formatting ;_; 2017-09-21 22:11:35 +02:00
DrabWeb
01e70f9bef Change type check to safe cast. 2017-09-21 14:53:42 -03:00
DrabWeb
46af17f00c Fix preview button potential null ref. 2017-09-21 14:46:51 -03:00
DrabWeb
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
smoogipooo
e65a17ad96 Remove redundant usings 2017-09-20 18:40:41 +09:00
smoogipooo
7168e8fd99 Improve layout of bottom bar in the Editor 2017-09-20 18:16:03 +09:00
smoogipooo
58b09a161f CI fixes 2017-09-20 17:16:12 +09:00
smoogipooo
7588f1b6ca Add SummaryTimeline to Editor 2017-09-20 17:09:38 +09:00
smoogipooo
f9568619e7 Move SummaryTimeline into /Edit/Components/SummaryTimeline 2017-09-20 16:59:03 +09:00
smoogipooo
3da3ef1a50 CI fixes 2017-09-20 16:53:01 +09:00
smoogipooo
5978668d2b Mini -> Summary 2017-09-20 16:48:30 +09:00
smoogipooo
967bfa404e Generate a set beatmap instead of using the available beatmaps 2017-09-20 16:40:37 +09:00
smoogipooo
6a9572db6c Merge branch 'master' into editor-timing-timeline 
# Conflicts:
#	osu-framework
 2017-09-20 16:19:08 +09:00
smoogipooo
01d84893a0 Cleanup + commenting 2017-09-20 15:55:23 +09:00
smoogipooo
fd278256ad EditorTimingTimeline -> EditorMiniTimeline 2017-09-20 15:50:32 +09:00
smoogipooo
252121968d Actually load a beatmap for TestCaseEditorTimingTimeline 2017-09-20 15:40:42 +09:00
smoogipooo
01c3818ea0 Make EditorTimingTimeline support beatmap changes 2017-09-20 15:40:27 +09:00
Dean Herbert
120446e4a7 Ensure only one dialog is being displayed by the SongSelect footer at a time 
Fixes #1208
 2017-09-20 14:32:15 +09:00
Dan Balasescu
278e51eebc Merge pull request #1297 from peppy/deploy-multiple-targets 
Allow deploy script to deploy multiple project targets
 2017-09-20 12:57:24 +09:00
Damnae
fcaabf7fdf Merge branch 'master' into storyboard_integration 2017-09-19 17:36:29 +02:00
Dean Herbert
2923af1946 Allow deploy script to deploy multiple project targets 2017-09-19 23:44:46 +09:00
smoogipooo
67d3861226 Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline 
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
 2017-09-19 23:09:08 +09:00
EVAST9919
1de8bca7f6 Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix 2017-09-19 17:08:32 +03:00
Dan Balasescu
183f192dd5 Merge pull request #1296 from peppy/fix-release-paths 
Fix ruleset target path for release builds
 2017-09-19 22:57:28 +09:00
Dean Herbert
e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
Dan Balasescu
2e799aaf67 Merge pull request #1277 from peppy/ctb-improvements 
osu!catch improvements
 2017-09-19 21:50:18 +09:00
Dean Herbert
611f4df484 Add licence header 2017-09-19 21:41:51 +09:00