Commit Graph

2452 Commits

Author SHA1 Message Date
smoogipooo
e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
smoogipooo
a9bc253b8c General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
smoogipooo
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
smoogipooo
1c87d998a6 Rename HitObjectType -> TObject. 2017-03-15 16:29:14 +09:00
smoogipooo
bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
Dean Herbert
1317198628 Merge pull request #482 from huoyaoyuan/more-songselect
More SongSelect
2017-03-15 11:28:21 +09:00
Dean Herbert
e008574697 Merge branch 'master' into more-songselect 2017-03-15 11:24:14 +09:00
Huo Yaoyuan
37ff1f3971 Control footer by virtual property. 2017-03-15 10:10:59 +08:00
Dean Herbert
c35977584a Merge pull request #484 from peppy/general-fixes
Update framework.
2017-03-15 10:47:56 +09:00
Dean Herbert
b5a8ef07fe
Update framework. 2017-03-15 09:46:03 +09:00
Huo Yaoyuan
8c991eae01 Fix CI issues. 2017-03-14 22:27:24 +08:00
Huo Yaoyuan
a8d15e616b Remove parameter of OnSelected. 2017-03-14 22:22:23 +08:00
Huo Yaoyuan
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
Huo Yaoyuan
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +08:00
Huo Yaoyuan
259d39c6ad Stop playing the track in editor
to avoid unused member warning
2017-03-14 21:28:33 +08:00
Huo Yaoyuan
f97e8ae97f Fix typo and warnings. 2017-03-14 21:20:38 +08:00
Huo Yaoyuan
c939897a8a Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
2017-03-14 21:13:57 +08:00
Huo Yaoyuan
e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00
Huo Yaoyuan
beb0a8ff03 Auto assign hotkeys for BeatmapOptionsButton. 2017-03-14 20:50:43 +08:00
Huo Yaoyuan
35a60a8f7d Use depth to arrange buttons. 2017-03-14 20:19:05 +08:00
Huo Yaoyuan
618e8e822b Implement EditSongSelect and MatchSongSelect. 2017-03-14 19:53:20 +08:00
Huo Yaoyuan
3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
Dean Herbert
10ab015501
Fix typo. 2017-03-14 20:23:58 +09:00
Dean Herbert
864a97fa45
Output StandardError when an error occurs with a command line invocation. 2017-03-14 20:23:53 +09:00
Dean Herbert
1699c9fb1d
Don't download executables when pulling down existing assets. 2017-03-14 20:23:37 +09:00
Dean Herbert
c192de9ebd
Give deploy uploads more time before dying. 2017-03-14 20:23:23 +09:00
Dean Herbert
31c41e3e14
Don't overwrite newer config files (doesn't seem to fix anything buut..). 2017-03-14 20:23:07 +09:00
Huo Yaoyuan
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
Huo Yaoyuan
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00
Huo Yaoyuan
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
Huo Yaoyuan
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
Dan Balasescu
90447b0ba7 Merge pull request #481 from peppy/general-fixes
Fix KeyCounter showing keys mapped to mouse buttons as mouse button presses.
2017-03-14 17:43:03 +09:00
Dean Herbert
71959b161d
Update framework. 2017-03-14 17:39:32 +09:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
Dean Herbert
14b22445fa
Merge remote-tracking branch 'upstream/master' into general-fixes
# Conflicts:
#	osu.Game/Modes/UI/HitRenderer.cs
2017-03-14 16:15:26 +09:00
Dean Herbert
69e1fa98ef
Update framework. 2017-03-14 16:09:05 +09:00
Dean Herbert
1f68731a09
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter). 2017-03-14 16:00:35 +09:00
Dean Herbert
66d1e7c732 Merge pull request #469 from smoogipooo/mod_application
Mod application
2017-03-14 12:59:33 +09:00
smoogipooo
db8cbba8d5 Okay resharper u da boss. 2017-03-14 12:52:12 +09:00
smoogipooo
a502ff2c87 Fix post-merge issues. 2017-03-14 12:47:29 +09:00
Dan Balasescu
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
smoogipooo
6ebd88060a Simplify foreach. 2017-03-14 12:38:30 +09:00
smoogipooo
bc5912eab5 Applyable -> Applicable. 2017-03-14 12:32:31 +09:00
Dean Herbert
0da950beac
Fix KeyCounter M1 M2 display. 2017-03-14 12:31:09 +09:00
Dean Herbert
98f13be7ca Merge pull request #472 from peppy/general-fixes
Update framework.
2017-03-14 12:12:02 +09:00
Dean Herbert
1eacafc7b4
Merge branch 'master' into general-fixes 2017-03-14 12:02:24 +09:00
Dean Herbert
9eaec6945f
Update resources. 2017-03-14 12:02:06 +09:00
Dean Herbert
4fa037c0b2
Update framework. 2017-03-14 12:01:58 +09:00
Dean Herbert
ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
2017-03-14 11:46:34 +09:00
Dean Herbert
29eeebefb0 Merge pull request #474 from huoyaoyuan/fixes
Fixes
2017-03-14 09:40:02 +09:00