Thomas Müller
|
ac99e2d488
|
Avoid using load to construct the drawable hierarchy whereever possible.
|
2016-11-12 18:34:36 +01:00 |
|
Thomas Müller
|
16dc74df5b
|
Avoid stack overflow when trying to push a not-yet async loaded background.
|
2016-11-12 18:33:47 +01:00 |
|
Dean Herbert
|
cc0f61f545
|
Merge branch 'refs/heads/master' into dependency-injection
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
|
2016-11-12 20:18:26 +09:00 |
|
Dean Herbert
|
80f146e4bd
|
Fix a locally set beatmap getting overridden by the game-global one.
|
2016-11-12 18:26:27 +09:00 |
|
Dean Herbert
|
099b309645
|
Introduce back the concept of Rulesets.
|
2016-11-12 18:26:21 +09:00 |
|
Dean Herbert
|
16a0be44df
|
Add local InputManager to Player; handle Z and X.
|
2016-11-12 18:26:14 +09:00 |
|
Dean Herbert
|
a0e1513df6
|
Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence
# Conflicts:
# osu.Game/OsuGame.cs
|
2016-11-11 13:30:57 +09:00 |
|
Drew DeVault
|
0d4560a054
|
Update to latest DI stuff
|
2016-11-10 17:40:42 -05:00 |
|
Drew DeVault
|
7327db307b
|
Fix player loading from song select
|
2016-11-10 16:43:04 -05:00 |
|
Drew DeVault
|
ee24cd310c
|
Convert everything to DI pattern
|
2016-11-10 16:41:18 -05:00 |
|
Drew DeVault
|
dc03f36793
|
Use DI for Player
|
2016-11-10 16:38:44 -05:00 |
|
Drew DeVault
|
19fd6fe249
|
Introduce dependency injection
|
2016-11-10 16:38:25 -05:00 |
|
Dean Herbert
|
788c11de10
|
Merge pull request #103 from huoyaoyuan/music-controller
Music controller
|
2016-11-10 12:54:56 +09:00 |
|
Dean Herbert
|
fdb83bed79
|
Make OsuGameModes self-aware of if they want a toolbar or not.
|
2016-11-09 15:24:22 +09:00 |
|
Dean Herbert
|
a61fb5ef5d
|
Initial updates to make generic containers work.
|
2016-11-07 21:13:56 +09:00 |
|
Huo Yaoyuan
|
8037f1233f
|
Merge branch 'master'
|
2016-11-07 18:58:35 +08:00 |
|
Dean Herbert
|
f14a35d480
|
Update FontAwesome definitions.
|
2016-11-07 17:59:00 +09:00 |
|
Thomas Müller
|
90c889a7ce
|
Smoothen wedged buttons in main menu and the wedges on song select background.
|
2016-11-06 19:34:44 +01:00 |
|
Thomas Müller
|
103176826f
|
Ensure transformations are never used prior to being added to the Drawable tree.
|
2016-11-06 11:13:52 +01:00 |
|
Thomas Müller
|
32ee20b843
|
Merge branch 'master' of github.com:ppy/osu into better-clocks
# Conflicts:
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
|
2016-11-06 10:08:24 +01:00 |
|
Thomas Müller
|
5f2bf165a2
|
Remove now obsolete clock usages.
|
2016-11-06 10:06:09 +01:00 |
|
Thomas Müller
|
a6c0fd29f2
|
Make use of new timing system in Drawables and Transforms.
|
2016-11-06 08:25:21 +01:00 |
|
Huo Yaoyuan
|
c470140d64
|
Merge branch 'master'
|
2016-11-06 00:11:30 +08:00 |
|
Thomas Müller
|
07e74068e7
|
Merge branch 'master' of github.com:ppy/osu into peppy/hitcircle-revision-2
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs
|
2016-11-05 13:35:15 +01:00 |
|
Dean Herbert
|
a11d534067
|
Add beatmap backgrounds.
|
2016-11-05 20:00:14 +09:00 |
|
Dean Herbert
|
2ee5e2efb7
|
Bring framework up-to-date.
# Conflicts:
# osu-framework
|
2016-11-05 18:18:52 +09:00 |
|
Huo Yaoyuan
|
2d86cb1e81
|
Merge branch 'master'
|
2016-11-05 16:21:59 +08:00 |
|
Dean Herbert
|
92b85b251e
|
Fix scale more.
|
2016-11-04 15:43:53 +09:00 |
|
Dean Herbert
|
e939746159
|
Fix scale ratio of gamefield.
|
2016-11-04 15:43:53 +09:00 |
|
Dean Herbert
|
788cba6f4d
|
Add autoplay toggle (const).
|
2016-11-04 15:43:53 +09:00 |
|
Dean Herbert
|
f3d461e318
|
Fix some events not firing correctly.
|
2016-11-04 12:27:43 +09:00 |
|
Huo Yaoyuan
|
f2a8cc0c29
|
Merge branch 'master'
|
2016-11-03 20:38:34 +08:00 |
|
Dean Herbert
|
439204b4fa
|
Merge remote-tracking branch 'refs/remotes/upstream/master' into async-workflow
|
2016-11-03 16:44:49 +09:00 |
|
Dean Herbert
|
3d611dd57b
|
Improve coodination of startup sequence.
|
2016-11-02 01:02:48 +09:00 |
|
Dean Herbert
|
c78e3efc66
|
Schedule some illegal calls.
|
2016-11-02 01:02:34 +09:00 |
|
Drew DeVault
|
0edfeaaff9
|
Move wedgeContainer transition to OnEntering
|
2016-11-01 09:22:49 -06:00 |
|
Dean Herbert
|
b86f308af6
|
Add async workflow.
|
2016-11-01 23:24:14 +09:00 |
|
Drew DeVault
|
e5f948dccc
|
Fade song select wedges in
|
2016-10-31 16:16:11 -06:00 |
|
Adonais Romero González
|
fd0900eb3c
|
I knew I forgot something >:(
|
2016-10-29 18:42:40 -05:00 |
|
Adonais Romero González
|
ef9d2b5b3c
|
Minor improvements to combo counters
|
2016-10-29 18:26:12 -05:00 |
|
Dean Herbert
|
d8ca11bf0d
|
Use Any instead of First to avoid potential throw.
|
2016-10-29 04:29:43 +09:00 |
|
Dean Herbert
|
a2f995ebe0
|
Remove forgotten parens.
|
2016-10-29 03:44:27 +09:00 |
|
Dean Herbert
|
c969e0b4f0
|
Remove forced disposal of WorkingBeatmap.
|
2016-10-29 03:31:40 +09:00 |
|
Dean Herbert
|
f0e4a252a5
|
Add some warning comments.
|
2016-10-28 23:35:49 +09:00 |
|
Dean Herbert
|
42ad96778e
|
Tidy shit up; reduce number of unnecssesary events being fired.
|
2016-10-28 23:29:21 +09:00 |
|
Huo Yaoyuan
|
6aba03e1ca
|
OsuGameMode<-WorkingBeatMap->OsuGameBase.
|
2016-10-28 21:03:59 +08:00 |
|
Dean Herbert
|
5dc495e41d
|
Avoid accessing the beatmap too early.
|
2016-10-28 21:08:32 +09:00 |
|
Dean Herbert
|
10ef34b805
|
Lazy parse beatmap; Don't reload audio track if it hasn't changed.
|
2016-10-28 20:24:14 +09:00 |
|
Dean Herbert
|
74f1a9622f
|
Add initial game-wide beatmap flow.
|
2016-10-28 19:55:48 +09:00 |
|
Dean Herbert
|
0f5614ffa2
|
Only allow osu! mode maps to be played for now.
|
2016-10-28 18:07:42 +09:00 |
|