DrabWeb
|
2e8b1ad390
|
Woops
|
2017-03-14 10:09:58 -03:00 |
|
Seth
|
21a9996225
|
Merge branch 'master' into leaderboards
|
2017-03-14 10:07:33 -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 |
|
smoogipooo
|
bc5912eab5
|
Applyable -> Applicable.
|
2017-03-14 12:32:31 +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 |
|
Huo Yaoyuan
|
db104d04d3
|
Use AutoGenerateBindingRedirects instead of explicit app.config.
|
2017-03-14 03:20:33 +08:00 |
|
Dean Herbert
|
2756d5f09f
|
Merge branch 'master' into mod_application
|
2017-03-13 23:00:11 +09:00 |
|
Dean Herbert
|
c51e97e8cc
|
Merge pull request #471 from smoogipooo/beatmap_conversion
Beatmap conversion
|
2017-03-13 22:17:22 +09:00 |
|
Dean Herbert
|
b2981fb729
|
Merge branch 'master' into mod_application
|
2017-03-13 22:15:26 +09: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 |
|
Alex Amadori
|
caa6e9c82b
|
General improvements
|
2017-03-13 11:29:24 +01:00 |
|
Alex Amadori
|
971d8eb7c5
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-13 10:56:31 +01:00 |
|
smoogipooo
|
35ddca78f5
|
Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).
|
2017-03-13 14:50:55 +09:00 |
|
smoogipooo
|
c0e29652a6
|
Initial attempt at making mods apply better.
|
2017-03-12 22:13:43 +09:00 |
|
smoogipooo
|
3480dca0ad
|
Remove PlayMode enum requirement. Clean things up a lot.
|
2017-03-12 14:32:50 +09:00 |
|
smoogipooo
|
77a4a896c9
|
Cleanups.
|
2017-03-12 01:08:34 +09:00 |
|
smoogipooo
|
592e05a2c8
|
Better beatmap conversion model.
|
2017-03-12 00:34:21 +09:00 |
|
smoogipooo
|
75a5da62d0
|
Fix filenames.
|
2017-03-10 16:11:38 +09:00 |
|
smoogipooo
|
4015b87965
|
General fixes.
|
2017-03-10 13:09:50 +09:00 |
|
smoogipooo
|
617ceb8001
|
Rename to StandardComboCounter, add HealthDisplay abstraction.
|
2017-03-10 12:47:00 +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 |
|
Alex Amadori
|
309019aab3
|
Merge remote tracking branch 'upstream/master' into archive-reader
|
2017-03-07 08:41:44 +01: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
|
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 |
|
Alex Amadori
|
fd53d10264
|
Refactor ArchiveReader for extensibility
|
2017-03-06 23:56:08 +01:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Dean Herbert
|
dcc7386609
|
Add option toggle for debug cached setting.
|
2017-03-06 22:07:46 +09:00 |
|
Dean Herbert
|
b5aff9df5f
|
Add options footer.
|
2017-03-06 17:30:46 +09:00 |
|
Dean Herbert
|
95e2e2b027
|
Replay loading via drag-drop huzzah!
|
2017-03-04 19:02:43 +09:00 |
|
Dean Herbert
|
aa9d85624d
|
Change IPC to make sense.
|
2017-03-04 18:51:16 +09:00 |
|
DrabWeb
|
a112b354f0
|
Basic implementation of score UI
|
2017-03-04 03:37:34 -04:00 |
|
Dean Herbert
|
adb6f01e39
|
Create class hierarchy for Score/Replay storage.
|
2017-03-04 15:32:41 +09:00 |
|
Dean Herbert
|
9e1383fa48
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
|
2017-03-04 13:17:01 +09:00 |
|
Dean Herbert
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
Dean Herbert
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|
Dean Herbert
|
38a9e820e6
|
GroupsContainer -> GroupContainer.
|
2017-03-03 20:46:07 +09:00 |
|
Dean Herbert
|
bc01935a89
|
Move around some namespaces.
|
2017-03-03 20:42:22 +09:00 |
|
smoogipooo
|
5a4d07d770
|
Better way to initialize team lists.
|
2017-03-03 18:47:56 +09:00 |
|
Seth
|
fde509ab1d
|
Merge branch 'master' into mod-overlay
|
2017-03-03 04:12:42 -04:00 |
|
smoogipooo
|
777996d884
|
Rewrite VisualiserLine + add VisualiserContainer.
|
2017-03-03 15:43:16 +09:00 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
Seth
|
2e74b4be60
|
Merge branch 'master' into beatmap-options
|
2017-03-03 00:52:45 -04: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 |
|
DrabWeb
|
7a4b9c5571
|
osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options
|
2017-03-02 21:20:30 -04:00 |
|