RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-25 00:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,056 Commits 6 Branches 666 Tags 362 MiB
471b9daa93
Commit Graph

37 Commits

Author SHA1 Message Date
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay 
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
 2017-03-02 20:27:04 +09:00
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09:00
DrabWeb
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
Andrey Zavadskiy
a6504e8f22 Triggering fix 2017-03-01 13:36:53 +03:00
Andrey Zavadskiy
cc92459ee1 KeyCounter visibility 2017-03-01 13:22:01 +03:00
DrabWeb
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
Dean Herbert
7c602a2af3
Update framework. 2017-02-27 15:55:57 +09:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
DrabWeb
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
DrabWeb
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
Dean Herbert
ca6946c7a2
Update Health display design. 2017-02-16 22:44:21 +09:00
Damnae
77ee161be8 Add follow points. 2017-02-10 06:19:59 +01:00
Damnae
38b25a7df3 Add hit object stacking. 2017-02-09 07:28:40 +01:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor 
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
 2017-02-03 13:16:07 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
Dean Herbert
4efedd942d Use null propagation. 2017-01-27 00:41:34 +09:00
Dean Herbert
139cac5e57 Add fail dialog and flow. 2017-01-27 00:41:34 +09:00
Dean Herbert
c01863dfa2 Add min/max constraints to HealthDisplay. 2017-01-27 00:39:00 +09:00
Dean Herbert
cd149f04fc Use bindable for HealthDisplay. 2017-01-27 00:38:21 +09:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
Dean Herbert
1392cdfb9a Hook up naively. 2017-01-10 18:35:27 +08:00
Dean Herbert
7eab50b989 Add basic HP display support. 2017-01-10 16:08:01 +08:00
Thomas Müller
882d5edf7d Fix dropped input outside of playfield. 2016-12-11 10:09:58 +01:00
Dean Herbert
ae72f91975 Reshuffle hit explosions to be on their own layer. 
Style misses better.
 2016-12-06 21:14:38 +09:00
Dean Herbert
74e3a87f78 Add *very* basic ranking screen. 2016-11-29 23:59:56 +09:00
Dean Herbert
2947121e48 Hook up ScoreProcessor to Scoreoverlay etc. 2016-11-29 21:28:43 +09:00
Dean Herbert
9d2a69f1e2 Add concept of ScoreProcessor. 2016-11-29 20:30:16 +09:00
Dean Herbert
9871960112 Basic score flow. 2016-11-29 17:34:16 +09:00
Dean Herbert
396ca9fe91 Remove HitJudgementResolver; reimplement in DrawableHitObject. 2016-11-26 16:51:51 +09:00
Dean Herbert
3dff72ac6c Bypass masking checks for input on playfields. 2016-11-24 18:59:09 +09:00
Dean Herbert
3ac89216bd Standardise some naming and make hitcircles feel better. 2016-11-19 19:07:57 +09:00
Dean Herbert
acb85d0140 Fix regressions in combo counters and tidy up naming of SpriteTexts. 2016-11-19 16:19:54 +09:00
Dean Herbert
5dd4e31011 Move DrawableHitObject. 2016-11-14 19:49:29 +09:00
Dean Herbert
4590be552f Move play modes to their own projects. 2016-11-14 18:54:24 +09:00