1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 00:23:22 +08:00
Commit Graph

379 Commits

Author SHA1 Message Date
Dean Herbert
41cefd1cb3
xmldoc commenting. 2017-03-03 20:08:21 +09:00
Dean Herbert
c3cb225eef
Fix being able to stop rotation when it isn't started. 2017-03-03 20:07:57 +09:00
smoogipooo
5a4d07d770 Better way to initialize team lists. 2017-03-03 18:47:56 +09:00
smoogipooo
890066dae4 Use sprite visualiser lines instead of shader. 2017-03-03 18:47:22 +09:00
smoogipooo
54993b874f Fix idle and stopping -> stopped state. 2017-03-03 18:45:04 +09:00
smoogipooo
2a49200008 Nothing to see here. 2017-03-03 18:02:02 +09:00
smoogipooo
b2661be0b2 Fix setting same state multiple times. 2017-03-03 17:59:16 +09:00
smoogipooo
7cac2680b1 Make test case add test drawings file. 2017-03-03 16:33:40 +09:00
smoogipooo
1d1c08125b Further safety checking. 2017-03-03 16:01:24 +09:00
smoogipooo
777996d884 Rewrite VisualiserLine + add VisualiserContainer. 2017-03-03 15:43:16 +09:00
smoogipooo
a70b1ae108 Use a singular FlowContainer for teams. 2017-03-03 15:12:26 +09:00
smoogipooo
04dd24b04b OnTeamSelected + async changes. 2017-03-03 14:51:19 +09:00
smoogipooo
3ae55933c4 Remove game dependency. 2017-03-03 14:11:47 +09:00
smoogipooo
d96345e408 s/internalPeriod/_period 2017-03-03 14:11:37 +09:00
smoogipooo
e6d911e49b Move modified key conditional location. 2017-03-03 14:08:37 +09:00
smoogipooo
3174b56e28 Add license headers. 2017-03-03 13:17:24 +09:00
smoogipooo
959a3d49be Post-merge fixes. 2017-03-03 13:17:16 +09:00
Dan Balasescu
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
smoogipooo
efb13b29d1 General cleanups. 2017-03-03 13:01:57 +09:00
smoogipooo
d0894bbc9b Use storage instead of raw file access. 2017-03-03 12:59:58 +09:00
smoogipooo
b7b36b6306 Unused. 2017-03-03 12:59:31 +09:00
smoogipooo
d6c1f82105 Make visualiser lines have no separation. 2017-03-03 12:59:19 +09:00
smoogipooo
d222c523a1 Exit drawings if no drawings.txt file. 2017-03-03 12:43:48 +09:00
smoogipooo
26b81a14cf Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it. 2017-03-03 12:42:19 +09:00
smoogipooo
062d8ddc7c Don't handle menu buttons when Shift or Ctrl or Alt is pressed. 2017-03-03 12:41:45 +09:00
smoogipooo
febdfd5de4 Make groups fill up in round robin way, rather than sequentially. 2017-03-03 12:06:35 +09:00
Dean Herbert
78a0bce3bb Merge pull request #423 from peppy/general-fixes
Move PauseOverlay to correct namespace.
2017-03-03 11:32:42 +09:00
DrabWeb
f872330902 Fix BeatmapDeleteDialog namespace 2017-03-02 21:28:05 -04:00
Dean Herbert
3a8246f56d
Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09:00
Dean Herbert
ecd3453774
Fix potential nullref. 2017-03-02 22:17:14 +09:00
Dean Herbert
f9b87ad08c
Fix selection on entry to song select.
Also only shows sets with beatmaps for current play mode.
2017-03-02 22:02:32 +09:00
Dean Herbert
9ea83230aa
Formatting fixes. 2017-03-02 22:01:53 +09:00
Dean Herbert
51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
Dean Herbert
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
Dean Herbert
c4ca18eeba
Remove references to PassThrough. 2017-03-02 16:28:51 +09:00
smoogipooo
b0d5d88fe9 Fix slight threading scheduling issue. 2017-03-02 12:26:42 +09:00
smoogipooo
1a4f0a92a5 Add saving + reloading (to/from drawings_results.txt) functionality. 2017-03-02 12:20:31 +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
smoogipooo
35d246b59d Merge remote-tracking branch 'origin/master' into tournament_drawings 2017-03-01 19:32:33 +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
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
DrabWeb
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
Dean Herbert
e60cead483
Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
DrabWeb
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
smoogipooo
1e15318da6 Add background. 2017-02-28 10:26:37 +09:00