Commit Graph

34861 Commits

Author SHA1 Message Date
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
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
418ae24fea Document private method getBeatmapSet(path) 2017-03-01 17:57:57 +01:00
1e901a1604 Only set StoryBoardFile once 2017-03-01 17:08:12 +01:00
08e96c2460 Merge remote-tracking branch 'refs/remotes/ppy/master' into moarOptions 2017-03-01 16:06:12 +01:00
b6e7e054c3 wankoz 2017-03-01 22:56:20 +09:00
58ae9e888d Basic partial replay support. 2017-03-01 22:04:20 +09:00
b3a411d8c3 Merge pull request #414 from EVAST9919/input_overlay
KeyCounter visibility
2017-03-01 21:50:13 +09:00
a6504e8f22 Triggering fix 2017-03-01 13:36:53 +03:00
35d246b59d Merge remote-tracking branch 'origin/master' into tournament_drawings 2017-03-01 19:32:33 +09:00
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00
327300e9a7 Merge pull request #408 from Jorolf/pluginManager
Disable mousewheel while playing
2017-03-01 13:10:47 +09:00
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
22c46ec9fb Fix CI? 2017-03-01 13:03:33 +09:00
ec83da2845 Update framework. 2017-03-01 11:56:26 +09:00
f0e9ed4636 Fix regression in TrianglesPiece. 2017-03-01 11:56:14 +09:00
d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
61cbcfd597 Merge branch 'master' into pluginManager 2017-02-28 20:34:56 +01:00
e462ec46c3 Merge branch 'master' into general-fixes 2017-02-28 19:02:07 +01:00
585d42f89f Improve naming and correctness of triangles fading 2017-02-28 19:01:02 +01:00
eff66a1da6 Only delete on successful import. 2017-02-28 14:46:16 +01:00
7e72911d3a Update tests 2017-02-28 14:36:11 +01:00
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
522034020e Moved Bindable init 2017-02-28 11:44:12 +01:00
c3a81127f2 Updated to work with latest framework 2017-02-28 02:25:38 -04:00
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
6ce0b7c83a Merge pull request #406 from EVAST9919/warning_fixes
Warning fixes
2017-02-28 14:03:29 +09:00
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
654859a2a1 Restore potentially breaking change. 2017-02-28 13:56:35 +09:00
e60cead483 Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
98cd0d0733 Merge pull request #411 from huoyaoyuan/vs2017
EditorConfig naming style settings for vs2017.
2017-02-28 13:45:25 +09:00
3208b3d8b4 EditorConfig naming style settings for vs2017. 2017-02-28 11:37:08 +08:00
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
bc7fd3bd39 Remove uneccesary cast, move enter OK button to one liner 2017-02-27 22:38:44 -04:00
94f34b985b Forgot returns 2017-02-27 22:32:30 -04:00
0ce8fff666 Enter key presses first OK button, 1-9 presses button at number 2017-02-27 22:31:23 -04:00
aa9582c0fa Add exponential fall-off of triangles' alpha values. 2017-02-28 11:28:25 +09:00
e8cae3b45e Remove new override in DialogButton 2017-02-27 21:38:25 -04:00
164f205ee5 Remove SpaceTextOnHover 2017-02-27 21:30:10 -04:00
1e15318da6 Add background. 2017-02-28 10:26:37 +09:00
b3a231185b Conform to naming conventions 2017-02-27 20:55:10 -04:00
34ba3129a3 Removed background triangles 2017-02-27 20:44:27 -04:00
8b3477820f Disable mousewheel while playing 2017-02-28 00:08:34 +01:00
2e84188be7 Merge pull request #405 from peppy/fix-db-deletion
Actually delete all related database entries, not just the set.
2017-02-28 07:05:18 +09:00
64d036fe81 Update to work with latest framework 2017-02-27 16:41:45 -04:00
3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
f96144f234 Merge branch 'master' into fix-db-deletion 2017-02-27 20:59:52 +01:00
6d8b4cd31e Merge pull request #402 from peppy/welded-bindables
Welded bindable updates & nuget updates
2017-02-27 20:59:33 +01:00