h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 05:27:26 +08:00
Code Issues Releases Wiki Activity
4,200 Commits 3 Branches 648 Tags 270 MiB
f37c857af8
Commit Graph

4200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
smoogipooo
ee0a5409bb CI fixes. 2017-05-02 16:33:48 +09:00
smoogipooo
9eaf6b3ccb Merge branch 'master' into custom-drawings-flags 
# Conflicts:
#	osu-framework
 2017-05-02 16:29:54 +09:00
Dean Herbert
beb98c14b6 Fix layout not being invalidated when re-filtering playlist display. 2017-05-02 16:26:11 +09:00
Dean Herbert
57e63b9934 Merge pull request #697 from peppy/general-fixes 
Update framework with new DI changes.
 2017-05-02 15:41:29 +09:00
Dean Herbert
d06b3c898f Update framework with new DI changes. 2017-05-02 15:32:47 +09:00
smoogipooo
91e000fd44 Back to sanity. 2017-05-02 14:21:22 +09:00
smoogipooo
f17046abaf Add ability to load Drawings flags from osu/Drawings/Flags. 2017-05-02 13:28:35 +09:00
smoogipooo
e856abe59a Let's not use Country for drawings-specific stuff... 2017-05-02 13:02:14 +09:00
Dan Balasescu
3604c3562a Merge pull request #694 from peppy/general-fixes 
Set a sane default transform direction.
 2017-05-02 11:51:19 +09:00
Dean Herbert
50909eaa39 Update framework (upstream testcase fix). 2017-05-02 11:44:37 +09:00
Dean Herbert
6074cb5979 Make playlist filtering work. 
Also standardises searchable terms in beatmap metadata.
 2017-05-02 10:45:55 +09:00
Dean Herbert
b07af21202 Update framework. 2017-05-02 10:03:21 +09:00
Dan Balasescu
8caba36230 Merge branch 'master' into general-fixes 2017-05-02 09:50:35 +09:00
Dean Herbert
668566e73c Merge pull request #695 from ColdVolcano/intro-improvements 
Fix startup crash caused by MenuMusic binding
 2017-05-02 09:49:33 +09:00
ColdVolcano
6ce0245c2b Typo 2017-05-01 19:34:08 -05:00
ColdVolcano
1b52445f86 Fix crash when selecting non-existent IDs from database 2017-05-01 19:31:46 -05:00
Dean Herbert
b52781db73 Update README.md 2017-05-01 22:00:36 +09:00
smoogipooo
80ebd04e85 Add keys to columns and add key down transformations. 2017-05-01 20:48:43 +09:00
Dean Herbert
737ad78056 Set a sane default transform direction. 2017-05-01 20:10:19 +09:00
Dean Herbert
703ce259a9 Merge pull request #687 from DrabWeb/playlist 
Playlist
 2017-05-01 20:01:30 +09:00
Dean Herbert
2437c416b1 Use less usings. 2017-05-01 19:56:01 +09:00
Dean Herbert
2e0eda6b15 Merge branch 'master' into playlist 2017-05-01 19:44:57 +09:00
Dean Herbert
3943e4ae95 Fix comma. 2017-05-01 19:32:31 +09:00
Dean Herbert
c59589eba7 Only retrieve colour once. 2017-05-01 19:32:00 +09:00
smoogipooo
82cbb63af5 Add column generation + put spacing one level up. 2017-05-01 17:24:35 +09:00
Dean Herbert
0f4ef16910 Remove custom word splitting logic, add localisation support. 2017-05-01 17:14:59 +09:00
smoogipooo
4aea18b673 Add initial column design. 2017-05-01 17:00:41 +09:00
Dean Herbert
42a62e14e1 Merge pull request #665 from thomastanck/autoreplay-refactor-squashed 
Refactor Auto
 2017-05-01 16:57:57 +09:00
Dean Herbert
d00d4cce35 Merge branch 'master' into autoreplay-refactor-squashed 2017-05-01 16:53:46 +09:00
Dean Herbert
358be00ff3 Merge pull request #693 from ColdVolcano/song-select-fixes 
Fix SelectionChanged being invoked twice when changing selection with keyboard.
 2017-05-01 15:54:00 +09:00
Dean Herbert
2cfb83436d Add placeholder logic for filtering. 2017-05-01 15:27:41 +09:00
Dean Herbert
a1f341a64f Fix textbox focus issues (and inability to use escape). 2017-05-01 15:23:01 +09:00
Dean Herbert
c1d0aea217 Refactoring part 5. 2017-05-01 15:09:14 +09:00
Dean Herbert
580cf93147 Refactoring part 4. 2017-05-01 15:03:11 +09:00
ColdVolcano
f2b0602f90 Double check if the selectedpanel is not the provided as argument 2017-05-01 00:13:00 -05:00
Dean Herbert
97a7f16ab7 Refactoring part 3. 2017-05-01 13:41:22 +09:00
Dean Herbert
7c2e193db1 Refactoring part 2. 2017-05-01 13:25:32 +09:00
Dean Herbert
37944bb04e Initial refactoring. 2017-05-01 13:01:08 +09:00
Dean Herbert
ad03f5cede Merge pull request #685 from EVAST9919/metadata_additions 
Use localized metadata in PlayerLoader
 2017-05-01 12:07:27 +09:00
Dean Herbert
47e4a5b9cb Merge branch 'master' into metadata_additions 2017-05-01 12:02:35 +09:00
Dan Balasescu
8df4459b1f Merge pull request #684 from peppy/song-select-performance 
Song select performance tweaks
 2017-05-01 11:43:38 +09:00
EVAST9919
0386e96573 applied requested changes 2017-05-01 05:38:51 +03:00
Dean Herbert
96a4388b20 Merge branch 'master' into song-select-performance 2017-05-01 11:01:10 +09:00
EVAST9919
668262ed06 Applied requested changes 2017-05-01 04:53:46 +03:00
EVAST9919
e9094bac51 Added suggested changes 2017-04-30 17:05:00 +03:00
EVAST9919
e522a8c433 Merge remote-tracking branch 'refs/remotes/ppy/master' into metadata_additions 2017-04-30 16:57:57 +03:00
Dean Herbert
1e71192915 Merge pull request #691 from Jorolf/fix-typo 
fix typo
 2017-04-30 21:53:51 +09:00
Jorolf
6b08f485b4 fix typo 2017-04-30 14:45:23 +02:00
Dean Herbert
1e3847c73c Cancel the existing scheduled task when running it ahead of time. 2017-04-29 20:28:56 +09:00
Dean Herbert
2dcb4e9b93 Fix race condition when attempting to start a beatmap during debounce. 2017-04-29 20:12:09 +09:00