Dean Herbert
56df27fcc2
Merge branch 'master' into fix-event-bindings
2018-01-16 17:49:01 +09:00
Dean Herbert
03b19961be
Merge pull request #1915 from smoogipoo/playfield-judgements
...
Individually bind OnJudgement from hitobjects in each Playfield
2018-01-16 16:33:31 +09:00
smoogipoo
c309cc9454
Privatise OnJudgements as much as possible
2018-01-16 15:37:32 +09:00
smoogipoo
d230fd486e
Add automated cursor testcase
2018-01-16 15:28:00 +09:00
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
TocoToucan
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +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
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
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
TocoToucan
6e35484160
Fix osu.Game.csproj which was broken during resolving merge conflict
2018-01-13 23:09:43 +03:00
TocoToucan
d3afbdaac6
Resolve merge conflict
2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a
Rename ReplaySomething -> PlayerSomething
2018-01-13 22:25:09 +03: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
Aergwyn
7875f0cb01
remove unnecessary internal
2018-01-13 16:15:41 +01:00
Dan Balasescu
093db77c62
Merge pull request #1894 from Aergwyn/remove-empty-lines
...
Remove unnecessary empty lines
2018-01-14 00:13:50 +09:00
Aergwyn
356bb5da1e
move sample logic up too
2018-01-13 12:55:52 +01:00
Aergwyn
70fc09f81e
move judgement + state logic up to DrawableHitObject
2018-01-13 12:42:42 +01:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
b9f4dee801
Merge pull request #1893 from Aergwyn/preview-volume
...
Remove volume reduction on song preview
2018-01-13 02:52:56 +09:00
Dean Herbert
2507ec2ef8
Merge branch 'master' into preview-volume
2018-01-13 02:32:46 +09:00
Dean Herbert
7ecb49c1f9
Merge pull request #1889 from peppy/catch-overall-fixing
...
Fixes to catching fruit
2018-01-13 01:18:17 +09:00
Aergwyn
1c5b3d009c
remove volume reduction on preview
...
it doubles with global reduction
2018-01-12 17:09:57 +01:00
Dean Herbert
b4b15b7dd0
Apply review fixes
2018-01-13 00:51:20 +09:00
Dean Herbert
9e10854840
Fix banannanananana showers not exploding enough
2018-01-12 22:30:35 +09:00
Dean Herbert
7b19353ed8
Fix weird fruit not fading out
2018-01-12 22:30:35 +09:00
Dean Herbert
f03b8206da
Make banana showers always last in combo (explodey)
2018-01-12 22:30:35 +09:00
Dean Herbert
20c6f84efa
Fix banana test regression
2018-01-12 22:30:35 +09:00
Dean Herbert
93c4d58b69
Make catch plate fruit again
2018-01-12 22:30:35 +09:00
Dan Balasescu
4ef23a8ee8
Merge pull request #1884 from peppy/catch-autoplay
...
Add very basic osu!catch replay/autoplay handling
2018-01-12 20:58:41 +09:00
