DrabWeb
|
650fc7563d
|
ScoreRank, Avatar to own files, +DrawableRank
|
2017-03-14 10:58:28 -03:00 |
|
Dean Herbert
|
8176b4ef77
|
Fix merge errors.
|
2017-03-14 22:11:38 +09:00 |
|
Dean Herbert
|
12326f610e
|
Adjust transition to flyte's liking.
|
2017-03-14 22:11:29 +09:00 |
|
Seth
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -03:00 |
|
DrabWeb
|
d53f219051
|
Adjusted score rank size
|
2017-03-14 10:04:42 -03: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
|
1f68731a09
|
Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).
|
2017-03-14 16:00:35 +09:00 |
|
Dan Balasescu
|
879a78156d
|
Merge branch 'master' into mod_application
|
2017-03-14 12:38:55 +09:00 |
|
Dean Herbert
|
0da950beac
|
Fix KeyCounter M1 M2 display.
|
2017-03-14 12:31:09 +09:00 |
|
Dean Herbert
|
1eacafc7b4
|
Merge branch 'master' into general-fixes
|
2017-03-14 12:02:24 +09:00 |
|
Dean Herbert
|
4fa037c0b2
|
Update framework.
|
2017-03-14 12:01:58 +09:00 |
|
Huo Yaoyuan
|
3913a0a9ee
|
Fix removal of the last one beatmap.
|
2017-03-14 05:35:58 +08:00 |
|
DrabWeb
|
6bd9e3cac1
|
+Score ranks
|
2017-03-13 18:34:43 -03:00 |
|
Huo Yaoyuan
|
14a22f032f
|
Fix beatmap panel removal.
|
2017-03-14 04:35:43 +08:00 |
|
DrabWeb
|
8e90e05f23
|
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
|
2017-03-13 12:31:46 -03:00 |
|
DrabWeb
|
442a2c97db
|
Merge conflicts
|
2017-03-13 09:44:22 -03:00 |
|
DrabWeb
|
dbc8d513f9
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-13 09:36:16 -03:00 |
|
DrabWeb
|
9912f5f9e1
|
Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore
|
2017-03-13 09:33:25 -03:00 |
|
smoogipooo
|
c0e29652a6
|
Initial attempt at making mods apply better.
|
2017-03-12 22:13:43 +09:00 |
|
smoogipooo
|
64aab090d5
|
Instantiate HitRenderer with WorkingBeatmap.
|
2017-03-12 18:03:13 +09:00 |
|
smoogipooo
|
529cabb001
|
Make HudOverlay not dependent on Ruleset.
|
2017-03-10 16:16:07 +09:00 |
|
smoogipooo
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +09:00 |
|
smoogipooo
|
31f6cbd8cf
|
Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.
|
2017-03-10 12:14:13 +09:00 |
|
Dean Herbert
|
d7497330b2
|
Reduce warning/suggestion count to zero.
|
2017-03-09 15:52:40 +09:00 |
|
Dean Herbert
|
da751804b6
|
Reduce error count.
|
2017-03-09 14:24:16 +09:00 |
|
Dean Herbert
|
01c379da19
|
User invariant culture sorting.
|
2017-03-09 14:02:20 +09:00 |
|
Dean Herbert
|
9772f2a042
|
Update framework.
|
2017-03-09 13:50:33 +09:00 |
|
Dean Herbert
|
5a42035f88
|
Update license headers.
|
2017-03-08 15:50:52 +09:00 |
|
Dean Herbert
|
02cab41d34
|
Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
|
2017-03-07 19:30:48 +09:00 |
|
Dean Herbert
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +09:00 |
|
Dean Herbert
|
4430255ec4
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
|
2017-03-07 13:50:08 +09:00 |
|
Dean Herbert
|
1751532a01
|
Fix a few regressions.
|
2017-03-07 13:30:36 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Dan Balasescu
|
bc74f453aa
|
Merge branch 'master' into replay
|
2017-03-07 11:41:16 +09:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Dean Herbert
|
57cbecba83
|
Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554).
|
2017-03-06 22:08:02 +09:00 |
|
Dean Herbert
|
88f3dc0e02
|
Fix a few naming issues.
|
2017-03-06 18:49:23 +09:00 |
|
Dean Herbert
|
9908c1905d
|
Add keyboard shortcuts at song select for mod/random/options.
|
2017-03-06 17:32:12 +09:00 |
|
Dean Herbert
|
e356758a7d
|
Don't expicitly set origin of TextAwesome.
|
2017-03-06 17:06:48 +09:00 |
|
Dean Herbert
|
76ef8c1a6c
|
Add bindable mods and autoplay support.
|
2017-03-06 14:52:37 +09:00 |
|
Dean Herbert
|
faf07ab51a
|
Use generics everywhere.
|
2017-03-06 13:59:11 +09:00 |
|
Dean Herbert
|
81cc27e104
|
Fix typo.
|
2017-03-06 10:06:25 +09:00 |
|
Dean Herbert
|
7afcac3660
|
Move PreferredPlayMode to WorkingBeatmap.
|
2017-03-05 17:45:40 +09:00 |
|
Dean Herbert
|
4e4408cd20
|
Merge branch 'master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
|
2017-03-05 17:45:03 +09:00 |
|
DrabWeb
|
5719c6656a
|
Update to work with latest framework
|
2017-03-04 22:38:01 -04:00 |
|
DrabWeb
|
9cde20ffc7
|
Merge https://github.com/ppy/osu into leaderboards
|
2017-03-04 22:33:05 -04:00 |
|
DrabWeb
|
b02e413e56
|
Removed LeaderboardFade fully
|
2017-03-04 22:30:48 -04:00 |
|
DrabWeb
|
269c139d2a
|
Flags(redoing later), glowing text, proper Score and User usage
|
2017-03-04 22:29:52 -04:00 |
|
Thomas Müller
|
73fef85b12
|
Remove unnecessary usings
|
2017-03-04 19:43:59 +01:00 |
|
Thomas Müller
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|