h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Code Issues Releases Wiki Activity
2,020 Commits 3 Branches 654 Tags 364 MiB
dfa21444b4
Commit Graph

2020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mikal Stodal
dfa21444b4 Ensure correct exception logged 2017-03-02 14:10:32 +01:00
Mikal Stodal
2498305174 Merged branch master into remove-source-on-import 2017-03-02 13:39:22 +01:00
Mikal Stodal
47162a3e91 Update summary and commentary 2017-03-02 13:39:02 +01:00
Mikal Stodal
6661195e92 Only add set if ID is 0 2017-03-02 13:36:01 +01:00
Dean Herbert
d74a601180
Update version number generation slightly. 2017-03-02 20:08:01 +09:00
Dean Herbert
35c920d04b Merge pull request #368 from tacchinotacchi/master 
Added basic sorting functionality
 2017-03-02 18:46:34 +09:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
Dean Herbert
68a359698d
Fix potential nullref caused by test data. 2017-03-02 18:35:24 +09:00
Dean Herbert
51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
Dean Herbert
ffd65606be Merge pull request #409 from DrabWeb/popup-dialog 
Popup dialog
 2017-03-02 18:01:41 +09:00
Dean Herbert
963117f07d
Fix incorrect event order. 2017-03-02 17:41:33 +09:00
Dean Herbert
68857b573d
More code tidying. 2017-03-02 17:14:05 +09:00
Dean Herbert
c4871bbbf3
Tidy up code. 
The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.
 2017-03-02 17:08:00 +09:00
Dean Herbert
d1cd077e0d
Post-merge fixes. 2017-03-02 16:54:55 +09:00
Dean Herbert
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
Dean Herbert
66cea49ba6 Merge pull request #404 from default0/flowcontainer-refactor 
Flowcontainer refactor
 2017-03-02 16:42:03 +09:00
Dean Herbert
c4ca18eeba
Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
Dean Herbert
0bd3138887
Update framework. 2017-03-02 16:27:49 +09:00
DrabWeb
befdf68abe Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once 2017-03-01 18:41:00 -04:00
Thomas Müller
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
Thomas Müller
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
Thomas Müller
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor 
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
 2017-03-01 18:05:58 +01:00
Mikal Stodal
418ae24fea Document private method getBeatmapSet(path) 2017-03-01 17:57:57 +01:00
Mikal Stodal
1e901a1604 Only set StoryBoardFile once 2017-03-01 17:08:12 +01:00
Dean Herbert
b3a411d8c3 Merge pull request #414 from EVAST9919/input_overlay 
KeyCounter visibility
 2017-03-01 21:50:13 +09:00
Andrey Zavadskiy
a6504e8f22 Triggering fix 2017-03-01 13:36:53 +03:00
Andrey Zavadskiy
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00
Dean Herbert
327300e9a7 Merge pull request #408 from Jorolf/pluginManager 
Disable mousewheel while playing
 2017-03-01 13:10:47 +09:00
Dean Herbert
5bd18ce629 Merge pull request #410 from peppy/general-fixes 
Add exponential fall-off of triangles' alpha values.
 2017-03-01 13:08:04 +09:00
Dean Herbert
22c46ec9fb
Fix CI? 2017-03-01 13:03:33 +09:00
Dean Herbert
ec83da2845
Update framework. 2017-03-01 11:56:26 +09:00
Dean Herbert
f0e9ed4636
Fix regression in TrianglesPiece. 2017-03-01 11:56:14 +09:00
DrabWeb
d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
Jorolf
61cbcfd597 Merge branch 'master' into pluginManager 2017-02-28 20:34:56 +01:00
Thomas Müller
e462ec46c3 Merge branch 'master' into general-fixes 2017-02-28 19:02:07 +01:00
Thomas Müller
585d42f89f Improve naming and correctness of triangles fading 2017-02-28 19:01:02 +01:00
Mikal Stodal
eff66a1da6 Only delete on successful import. 2017-02-28 14:46:16 +01:00
Mikal Stodal
7e72911d3a Update tests 2017-02-28 14:36:11 +01:00
Mikal Stodal
d54a75a5c5 Delete file after importing BeatmapSet w/error handling, 
also changed batch-commit of multiple sets to database.
 2017-02-28 14:35:42 +01:00
Jorolf
522034020e Moved Bindable init 2017-02-28 11:44:12 +01:00
DrabWeb
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
Dean Herbert
6ce0b7c83a Merge pull request #406 from EVAST9919/warning_fixes 
Warning fixes
 2017-02-28 14:03:29 +09:00
DrabWeb
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
Dean Herbert
654859a2a1
Restore potentially breaking change. 2017-02-28 13:56:35 +09:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
Dean Herbert
98cd0d0733 Merge pull request #411 from huoyaoyuan/vs2017 
EditorConfig naming style settings for vs2017.
 2017-02-28 13:45:25 +09:00
Huo Yaoyuan
3208b3d8b4 EditorConfig naming style settings for vs2017. 2017-02-28 11:37:08 +08:00
DrabWeb
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
DrabWeb
bc7fd3bd39 Remove uneccesary cast, move enter OK button to one liner 2017-02-27 22:38:44 -04:00
DrabWeb
94f34b985b Forgot returns 2017-02-27 22:32:30 -04:00