1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Commit Graph

10231 Commits

Author SHA1 Message Date
Dean Herbert
976f7cec39
Merge branch 'master' into playfield-judgements 2018-01-16 15:26:13 +09:00
Dean Herbert
af6917d629
Merge pull request #1914 from smoogipoo/more-nested-playfields
Move nested playfields to the base Playfield
2018-01-16 14:59:00 +09:00
Dean Herbert
807e455a58
Merge branch 'master' into more-nested-playfields 2018-01-16 14:50:09 +09:00
smoogipoo
0459f0a069 Invert CanShowCursor conditional to fix cursor not showing in VisualTests 2018-01-16 13:40:02 +09:00
Dan Balasescu
47d964d21e
Merge pull request #1916 from aQaTL/hr-crashing-game
Cap ApproachRate in HardRock mod at 10
2018-01-16 13:27:17 +09:00
Dan Balasescu
480a75b8d9
Merge branch 'master' into hr-crashing-game 2018-01-16 13:18:02 +09:00
Dan Balasescu
1ddd6684e3
Merge pull request #1917 from UselessToucan/UseLocalFunctions
Use local functions
2018-01-16 13:12:50 +09:00
TocoToucan
c3ca40dcff Local functions related CI fixes 2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
aQaTL
65ecc18141
Cap ApproachRate in HardRock mod at 10.0f 2018-01-15 16:11:00 +01:00
smoogipoo
8c5ef0a330 Remove base OnJudgement from Playfield to properly accomodate nested playfields 2018-01-15 20:48:57 +09:00
Dan Balasescu
e0220de1a5
Merge pull request #1912 from peppy/smaller-judgements
Make judgements visually smaller
2018-01-15 20:43:02 +09:00
smoogipoo
c32ff9c43b Move nested playfields to the base Playfield 2018-01-15 20:39:57 +09:00
smoogipoo
0ae0dac192 Fix DrawableHitObject not binding nested hitobject events 2018-01-15 20:35:38 +09:00
smoogipoo
39b6425c3e Use a grid container to position the stages
Should be more flexible in the future + provides a more dual-stage feel.
2018-01-15 19:55:15 +09:00
smoogipoo
28586317dd Give stages a size again 2018-01-15 19:44:42 +09:00
smoogipoo
8a7892b66a Make variant keybindings work 2018-01-15 19:29:51 +09:00
smoogipoo
561786c5ef Generate the correct default bindings for variants 2018-01-15 19:25:14 +09:00
smoogipoo
b9909ed1cf Refactor addition of hitobjects 2018-01-15 18:20:43 +09:00
smoogipoo
89c3fcbf6a Refactor column construction 2018-01-15 18:11:53 +09:00
smoogipoo
dd67070b6f ManiaAction.Special -> ManiaAction.Special1 2018-01-15 17:58:04 +09:00
smoogipoo
351afc350e Implement co-op keybindings 2018-01-15 17:43:45 +09:00
Dean Herbert
053a29f9a7 Make judgements visually smaller
This is a temporary change based on people's feedback. Makes judgements feel a lot better.

nb: This is one of my changes that I've had deployed sinfce the end-of-year 2017 build.
2018-01-15 17:41:17 +09:00
Dean Herbert
96242234c0
Merge pull request #1910 from smoogipoo/fix-alljudged-usages
Fix a few usages of AllJudged possibly not being correct
2018-01-15 16:49:42 +09:00
Dean Herbert
20923321ad
Merge branch 'master' into fix-alljudged-usages 2018-01-15 16:39:16 +09:00
Dean Herbert
263ffaac3f
Merge pull request #1887 from smoogipoo/fix-skipbutton-ordering
Improve game-wide cursor visualisation handling
2018-01-15 16:29:31 +09:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering 2018-01-15 15:54:18 +09:00
smoogipoo
0d79d16692 Cleanup testcase 2018-01-15 15:52:07 +09:00
smoogipoo
dbcabfb6ac Remove ManiaAction.Specia2 2018-01-15 15:50:57 +09:00
smoogipoo
1c74e56bab Increase the point at which normal keys start in ManiaAction 2018-01-15 15:50:43 +09:00
smoogipoo
d2b1e27527 Cleanup implementation of coop key mod
This is how I intended the functionality to be implemented.
2018-01-15 15:49:03 +09:00
smoogipoo
9f98983550 Remove gravity mod
Not sure how this made it back in here.
2018-01-15 15:36:36 +09:00
smoogipoo
bfdfb52666 Fix a few usages of AllJudged possibly not being correct 2018-01-15 15:28:08 +09:00
smoogipoo
7c41925144 ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc 2018-01-15 14:07:09 +09:00
smoogipoo
43f8a8e8c5 Rename OsuCursorVisualiser -> CursorOverrideContainer 2018-01-15 14:00:13 +09:00
ANDY840119-PC\andy840119
bbb741245e fix CI error 2018-01-14 21:51:07 +09:00
ANDY840119-PC\andy840119
999386497a implement co-op mod 2018-01-14 21:35:35 +09:00
ANDY840119-PC\andy840119
cf0d9e4d9b not sure is it a goodway to delete mania ManiaAction.Special or add more 2018-01-14 21:20:01 +09:00
ANDY840119-PC\andy840119
2d266a8604 fix :
1. Instead of this property, turn SpecialColumnPosition into a
2. special column does not display
2018-01-14 20:44:17 +09:00
ANDY840119-PC\andy840119
5ecfc3a57c fix CI error 2018-01-14 13:06:37 +09:00
ANDY840119-PC\andy840119
58bf611d17 This should be done in the stage instead of the playfield. 2018-01-14 12:51:55 +09:00
ANDY840119-PC\andy840119
d07636a105 Fix :
1. This (along with OnJudgement above) should be done in the following three steps:
2. How about giving the stages an Inverted BindableBool, and having them decide their scale?
2018-01-14 12:49:01 +09:00
ANDY840119-PC\andy840119
f7a908fbfa Fix :
This (along with OnJudgement above) should be done in the following three steps:
.
i'm not sure does it means the code i write
2018-01-14 12:08:09 +09:00
ANDY840119-PC\andy840119
4f0e1f03d2 fix the problem that smoogipoo suggest
1. Rename to stages
2. This should be checking for null or 0, with two exceptions:
3. Space before and after =.
4. foreach (var stage ...
5. Rename to getStageByColumn, and actualColumn -> column.
2018-01-14 11:49:23 +09:00
ANDY840119-PC\andy840119
e947e46566 fix :
1. Add space before {, before Duration, and after 1000
2. How about just ManiaStage?
3. This is really just Columns.Count, you're not saving much with this extra variable here.
2018-01-14 11:41:52 +09:00
ANDY840119-PC\andy840119
561c9f2233 update rom ppy master
.
Find out that has some problem long hit note will not show hit result
2018-01-14 11:32:54 +09:00
Dan Balasescu
25d4445543
Merge pull request #1902 from Aergwyn/expose-ishit
Expose "IsHit" on DrawableHitObject
2018-01-14 00:35:21 +09:00
Aergwyn
8ac6818639 expose IsHit 2018-01-13 16:26:14 +01:00
Dan Balasescu
a9d7eac8be
Merge pull request #1899 from Aergwyn/shrink-drawablehitobject_t
Slim down DrawableHitObject<T>
2018-01-14 00:24:52 +09:00
Dan Balasescu
ebb8550f53
Merge branch 'master' into shrink-drawablehitobject_t 2018-01-14 00:16:42 +09:00