Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MusicWheelItem] Call SetMessage during CurrentSteps/Difficulty Changed #1361

Merged
merged 1 commit into from May 7, 2017
Merged

Conversation

sillybear
Copy link
Contributor

This fixes a bug where player difficulty meter and/or color inside MusicWheelItem don't update when switching between difficulties.

This fixes a bug where player difficulty meter and/or color inside MusicWheelItem don't update when switching between difficulties.
@sillybear sillybear changed the title [ScreenSelectMusic] Call SetMessage during CurrentSteps/Difficulty Changed [MusicWheelItem] Call SetMessage during CurrentSteps/Difficulty Changed Nov 30, 2016
@sillybear
Copy link
Contributor Author

Closed this because nobody cares.

@sillybear sillybear closed this Feb 9, 2017
@shakesoda
Copy link
Member

sorry about that, I do care about these PR's. I just haven't been making time to review patches. they're not unwanted or forgotten, it's just a matter of making time to check things.

@sillybear sillybear reopened this Feb 18, 2017
@shakesoda shakesoda merged commit 31e99dc into stepmania:5_1-new May 7, 2017
@sillybear sillybear deleted the patch-1 branch September 8, 2017 10:31
Rychard pushed a commit to Rychard/stepmania that referenced this pull request Sep 17, 2018
Added PlayerOptions:FromString.

Fix NOTESKIN:GetMetric()

update version info. why are there so many of these

Don't use static temp state for actor effects

because actors are nested

Merge pull request stepmania#1302 from dguzek/macOS-10-12

fix compilation on macOS 10.12

Allow WITH_FFMPEG to work when disabled for Mac.

Add nITG's new Confusion modifiers (stepmania#1395)

* Implemented nITG's Confusion modifiers.

Modifiers added:
ConfusionOffset
ConfusionX
ConfusionXOffset
ConfusionY
ConfusionYOffset

* Documented new Confusion modifiers.

* Make ConfusionX mods apply to hold heads

Fix oitg_zoom_mode (stepmania#1383)

Online protocol improvements (stepmania#1393)

* Chartkey generation

* Simfile filehash generation

* Read filehash on NSCRSG. Add FLU packets and friendlist vectors. Add
getserverversion method. Send chartkey, filehash and rate on start request.

* Use filehash to find the selected song if it is not empty.

* Friendlist update broadcast.

* Send note row size if it's bigger than 1

* Used for chartkey generation

* Define the ReportScore function with numNotes when WITHOUT_NETWORKING is defined

NetRoom/SelectBase/Music lua objects. Scrolling with lua funcs and binded to ctrl+pg up/down. Show prev msgs, binded to pg up/down. Music wheel move, selectmusic screen's select current song, chatbox visibility, input en/disabling and UserList visibility lua functions. (stepmania#1394)

Instantiate MESSAGEMAN first. (stepmania#1399)

This fixes a well-formed warning, but does it break anything?

It's not clear off hand. Having this up for discussion.

(Matt McCutchen <matt@mattmccutchen.net>: Cherry picked from commit
a565a27 with a conflict resolution.
This commit fixes a crash on startup in MessageManager::Broadcast when I
build StepMania with -DCMAKE_BUILD_TYPE=Release and g++ 6.3.1 on Fedora
25.  Apparently g++ is optimizing out the "this != NULL" on the grounds
that calling a method on a null pointer has undefined behavior, so the
"m_Logging" is a null dereference.)

Persistent Coins (stepmania#1405)

On Coin Insert, a file Save/Coin.ini is created if it does not exist, which stores the number of coins currrently in m_iCoins. Whenever m_iCoins is update, the Coin.ini is updated.

On boot, Coin.ini is read and m_iCoins is set to that value. If coins in coin.ini file is greater then MAX_NUM_CREDITS then reset the value to 0.

Add nITG's new Move modifiers (stepmania#1411)

* Implemented NITG's MoveX/Y/Z modifiers

Added modifiers:
MoveX1-n: Moves a column in the x direction, 100% = move left one arrow size.
MoveY1-n: Moves a column in the y direction
MoveZ1-n: Moves a column in the z direction.

Added nITG's various sub-modifiers (stepmania#1419)

* Added nITG's Bumpy sub-mods and ...

reorganized PlayerOptions::FromOneModString's Confusion checks
This is to help avoid the nesting level of 128 under Windows

* Added nITG's Tipsy sub-mods

Modifiers added:
TipsySpeed
TipsyOffset

* Add nITG's Drunk sub-mods

Modifiers added:
DrunkSpeed
DrunkOffset
DrunkPeriod

* Added nITG's Wave & Expand sub-mods

Modifiers added:
WavePeriod
ExpandPeriod

* Added nITG's Tornado sub-mods

Modifiers Added:
TornadoPeriod
TornadoOffset

* Added nITG's Beat sub-mods

Modifiers added:
BeatOffset
BeatPeriod
BeatMult

* Documented the new sub-mods

Improve handling of errors in lua functions and speed up calls. (stepmania#1427)

Revert "Improve handling of errors in lua functions and speed up calls. (stepmania#1427)"

This reverts commit f10e3ae.

(it was a joke PR, do not fear)

Sprite:Load lua function can set additional texture hints by having a second argument.  Also, rec_count_children slipped in Utilities somehow. (stepmania#1426)

Call SetMessage during CurrentSteps / Difficulty Changed (stepmania#1361)

This fixes a bug where player difficulty meter and/or color inside MusicWheelItem don't update when switching between difficulties.

Add nITG's various path shape & other modifiers - V2 (stepmania#1435)

* Implemented nITG's Square modifiers

Modifiers added:
Square
SquareOffset
SquarePeriod
SquareZ
SquareZOffset
SquareZPeriod

* Implemented nITG's BumpyX Modifiers

Also fixes up some tiny bits pertaining to the square modifiers.
Modifiers Added:
BumpyX
BumpyXPeriod
BumpyXOffset

* Implemented nITG's TornadoZ Modifiers

Modifiers Added:
TornadoZ
TornadoZPeriod
TornadoZOffset

Another commit is needed to update fallback's metrics

* Update fallback's metrics to accommodate TornadoX

* Implemented nITG's Parabola Modifiers

Modifiers Added:
ParabolaX
ParabolaY
ParabolaZ

* Implemented nITG's Sawtooth Modifiers

Modifiers Added:
Sawtooth
SawtoothPeriod
SawtoothZ
SawtoothZPeriod

* Implemented nITG's Zigzag Modifiers

Modifiers Added:
Zigzag
ZigzagPeriod
ZigzagOffset
ZigzagZ
ZigzagZPeriod
ZigzagZOffset

* Implemented nITG's ModTimer modifiers

Modifiers Added:
ModTimer (Lua method name is ModTimerSetting (takes enums. Ex: 'ModTimerType_Song'). Can be activated with mod strings 'modtimer(song/beat/game/default)' )
ModTimerOffset
ModTimerMult

* Remove Log use from ArrowEffects::GetTime()

* Accidentally removed a CPY(m_BatteryLives)

* Implemented nITG's DrunkZ modifiers

Modifiers added:
drunkz
drunkzspeed
drunkzoffset
drunkzperiod

Another commit is needed to update fallback's metrics

* Update fallback's metrics to accommodate DrunkZ

* Implemented nITG's BeatY & BeatZ Modifers

Modifiers Added:
beaty
beatyoffset
beatyperiod
beatymult
beatz
beatzoffset
beatzperiod
beatzmult

Another commit is needed to update fallback's metrics

* Updated fallback's metrics to accommodate ...

the new Beat modifiers.

* Implemented nITG's Digital Modifiers

Modifers Added:
digital
digitalsteps
digitalperiod
digitaloffset
digitalz
digitalzsteps
digitalzperiod
digitalzoffset

* Removed duplicate zbuffer check.

* Updated Luadocs with the new modifiers

* Removed accidental duplicate Mini from Luadocs

* Split up long modifier lines.

Hopefully, this makes it a bit easier to read.

* Remove accidental commit to root of repo.

* Split up long modifier lines

Hopefully, this makes it easier to read.

* Redid Square functions to not use FastSin

This implementation is based off of 5.2's square_wave function from ModValue.

* Redid zigzag functions to not use FastSin

This implementation is based off of 5.2's triangle_wave function from ModValue.

* Moved square & zigzag calculation to RageMath.

New RageMath functions:
RageSquare
RageTriangle

* Made Square & Digital have the same period...

as Zigzag and Sawtooth.

* Deduplicate tornado calculations.

* Fixed typo in UpdateTornado, and moved UpdateTornado logic to ArrowEffects::Init because it doesn't depend on anything that changes every frame.  Tornado metrics are also loaded in ArrowEffects::Init.

* Deduplicated Beat mod update logic.

The logic is now placed into a function called UpdateBeat.
The m_fBeatFactor members are now a 1D array, similar to m_MaxTornado and m_MinTornado.

[ScreenEdit] Fixed Player NoteField bug when SCREEN_HEIGHT != 480 (stepmania#1357)

Fix up RageTriangle's fmod usage. (stepmania#1447)

This fixes the second argument of fmod to be a float, due to the original form not compiling under XCode.

broadcast temp

 remove windows namespace collision with rage sound component - uses
 windows function names and macros

 resolve windows namespace collisions in the screen files - uses windows
 names and macros

player side guids

custom songs backport

implement p3io driver
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants