1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 07:27:24 +08:00
Commit Graph

83 Commits

Author SHA1 Message Date
Dean Herbert
4163569e57
Fix some license headers. 2017-03-02 18:45:20 +09: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
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
Thomas Müller
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
Thomas Müller
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Dean Herbert
32ce8cf723
Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00
Dean Herbert
ca6946c7a2
Update Health display design. 2017-02-16 22:44:21 +09:00
Dean Herbert
8bf3902cbd
Add the concept of nested DrawableHitObjects.
- Applies to Slider Ticks and start circle. repeat/endpoints still need addressing.
- Removed SliderTicksLayer abstraction for now.
2017-02-16 17:02:36 +09:00
Dean Herbert
2640c2ac43
Add tick sample. 2017-02-16 13:39:01 +09:00
Dean Herbert
7fbc5990d1
Add combo numbers. 2017-02-15 23:23:55 +09:00
Dean Herbert
580584a015
Don't use osu! mode parser for other game modes for now (convert still works). 2017-02-15 12:36:47 +09:00
Dean Herbert
8e9a5e9faa Add the ability to make DrawableHitObjects non-interactive (for use in other contexts). 2017-02-15 01:23:20 +09:00
Dean Herbert
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +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
7ce5fc08ee Merge branch 'master' into skip-button
# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
2ed5cf7c91 Hook up icons better. 2017-01-30 13:35:40 +09:00
Dean Herbert
e93f60396f Add the ability for individual game modes to report statistics for display at song select. 2017-01-30 13:12:30 +09:00
Dean Herbert
3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
Dean Herbert
8987a09741 Merge pull request #293 from peppy/general-fixes
Fix some nullrefs when running visualtests with no maps loaded.
2017-01-27 16:12:46 +09:00
Dean Herbert
629605c6b4 Make HasFailed's set private. 2017-01-27 00:41:34 +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
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Dean Herbert
3a27178bb1 Merge pull request #289 from UselessToucan/JudgementsCapacity
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
TocoToucan
badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +08:00
TocoToucan
259c0964fd Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations 2017-01-16 23:14:35 +03:00
Dean Herbert
a3770adbc5 Merge branch 'master' into hpdisplay 2017-01-16 11:23:54 +08:00
Drew DeVault
fa007e632d Refactor colors to palette based design 2017-01-12 16:38:27 -05: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
Drew DeVault
70ecf48ca7 Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.

Closes #126
2017-01-09 17:20:31 -05:00
Dean Herbert
cf8283582b Don't update LifetimeStart on HitObject state change. 2016-12-15 22:58:23 +09:00
Dean Herbert
d8e40d4fb1 Add naive lifetime calculation for drawable HitObjects. 2016-12-15 22:58:22 +09:00
Dean Herbert
c420c55291 Merge branch 'master' into hit-samples
# Conflicts:
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
2016-12-13 17:57:24 +09:00
Thomas Müller
882d5edf7d Fix dropped input outside of playfield. 2016-12-11 10:09:58 +01:00
Dean Herbert
f8395c4d3f Fix slider ball not tracking when mouse hasn't been moved since slider appeared. 2016-12-08 21:07:20 +09:00
Dean Herbert
c53743ca7d Fix unit test regression. 2016-12-08 20:00:24 +09:00
Dean Herbert
391767e01d Add very basic hitsound support. 2016-12-08 19:54:22 +09:00
Dean Herbert
63da7e5ea4 Merge pull request #225 from peppy/hitobject-improvements
Slider & other hit object improvements.
2016-12-08 16:11:50 +09:00