Skip to content

Commit

Permalink
Add scoring mechanics and UI (#129)
Browse files Browse the repository at this point in the history
* Isolated scoring mechanic code from Post-Play screen development

* restore BASS lib meta files

* add star-tracking for vocals (no harmonies yet)

* add star animations

* add star sounds

* correct gold star's path name

* star sfx switch and balancing, start on gold star meter

* begin gold star progress meter

* Squashed commit of the following:

commit be9eb5f
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 19:07:48 2023 -0400

    Fixed pause bug

commit 0e50024
Author: Raphael Goulart <contact@raphaelgoul.art>
Date:   Thu Apr 20 19:50:43 2023 -0300

    Minor held note fret animation bugfix (#148)

commit ea3bc47
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 18:38:57 2023 -0400

    Fixed install script

commit 1b1bd0f
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 18:32:03 2023 -0400

    Moved libraries to plugins

commit 7c588ce
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 18:20:37 2023 -0400

    Fixed fret aligning

commit 85610de
Author: RileyTheFox <jacobchambers@hotmail.co.uk>
Date:   Thu Apr 20 22:38:36 2023 +0100

    Cleanup of audio code to make it more manageable (#146)

commit 7a250dd
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 17:37:01 2023 -0400

    Optimized models

commit 74604eb
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 17:19:15 2023 -0400

    Track FOV setting

commit ba46138
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 16:42:25 2023 -0400

    Changed particles a little

commit 90aa6a1
Author: Kadu Waengertner <87105274+kaduwaengertner@users.noreply.github.com>
Date:   Thu Apr 20 17:12:59 2023 -0300

    New Animations + Fret Positions (#145)

    * Sustain Particles

    * Particles and Animations

    + Added particles for Guitar (We need to add a diferent particle effect for Drums, I'm gonna need some help to include that)
    + Added a simple animation for song start with the highways appearing
    + Changed the song name/artist at the start (Might be good option to have in the settings to keep always on/same for song progress)
    + Fixed the frets positioning, is now closer to the camera so we have less blank space on it

    * Frets Particles

    + Changed particle animation for Hit
    + Changed particle animation for Sustain

commit 6463d64
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Thu Apr 20 15:58:31 2023 -0400

    Fixed bass muting

commit b13538c
Author: Narrik Synthfox <80410683+NarrikSynthfox@users.noreply.github.com>
Date:   Thu Apr 20 15:45:03 2023 -0400

    Coop Guitar/Rhythm again (#143)

    * Coop Guitar and Rhythm.

    * Coop Guitar and Rhythm.

    * update icons

* refine gold star progress meter

* repair merge oddity, scale down score box

* refactor solo box slightly, add solo bonus scoring

* refactoring, implement score saving

* add saving of stars, add score saving for MicPlayer

* add score stats to ScoreSection

* Squashed commit of the following:

commit 3bcfe3d
Author: Raphael Goulart <contact@raphaelgoul.art>
Date:   Fri Apr 21 18:54:18 2023 -0300

    FIve-fret Anti-ghosting (#160)

    * WIP anti-ghosting (pending hopo chords)

    * WIP anti-ghosting (pending hopo chords)

    * make anti-ghosting take taps into account

    * Take chord hopos/taps into account

    * ^

    * Make anti-ghosting togglable

commit 084647e
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 17:53:00 2023 -0400

    Reverted setlists

commit b110571
Merge: 356904b 442bb4b
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 17:19:34 2023 -0400

    Merge branch 'master' of https://github.com/EliteAsian123/YARG

commit 356904b
Merge: 70a2ac4 83992fc
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 17:19:16 2023 -0400

    Merge branch 'EscapeNumber001-drum_sp'

commit 83992fc
Merge: 70a2ac4 d86e245
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 17:18:43 2023 -0400

    Merge branch 'drum_sp' of https://github.com/EscapeNumber001/YARG into EscapeNumber001-drum_sp

commit 442bb4b
Author: Rayden Thompson (DD) <89052168+thoudankeykang@users.noreply.github.com>
Date:   Fri Apr 21 17:12:15 2023 -0400

    added sources for some projects (#159)

commit 70a2ac4
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 16:34:58 2023 -0400

    Fixed up brutal checkbox

commit 45d109c
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Fri Apr 21 16:25:46 2023 -0400

    Brutal mode (#149)

    * Brutal mode implemented

    * Make (Max)Multiplier public

    * Fixed some formatting

    * Added UI for brutal mode

    * Minor bugfix

    ---------

    Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>

commit 0977fcf
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 16:20:15 2023 -0400

    Fixed small tap note issues

commit 768ae85
Author: Narrik Synthfox <80410683+NarrikSynthfox@users.noreply.github.com>
Date:   Fri Apr 21 15:50:39 2023 -0400

    Taps (#144)

    * Taps work kinda

    * tap logic, ignore force strum/hopo if sysex tap

    * Merge branch 'EliteAsian123:master' into taps

    * Start implementing tap model

    * Fully implement tap note model.

commit 0e381e0
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 15:49:21 2023 -0400

    Fixed some stuff up

commit 7cff167
Author: EliteAsian <lavasnakegaming@gmail.com>
Date:   Fri Apr 21 15:27:14 2023 -0400

    Update README.md

commit 26fe1ad
Author: Nathan <nathanhurst03@gmail.com>
Date:   Fri Apr 21 13:26:07 2023 -0600

    Update HIDrogen; add it and PlasticBand-Unity to External Assets/Libraries section of readme (#150)

    * Update HIDrogen to v0.1.5

    * Add PlasticBand-Unity and HIDrogen to readme

commit b878849
Author: Kadu Waengertner <87105274+kaduwaengertner@users.noreply.github.com>
Date:   Fri Apr 21 16:25:49 2023 -0300

    Notes Update! (#151)

    * New Notes

    + Tweaked HOPO Note to be more visible during intense songs
    + Added Tap Model (Need help with this cause the model its not imported properly I think?)

    * Notes Update!

    + Updated HOPO Model
    + Added Tap Model

    * Update Note.prefab

    * Update Note.prefab

    * Updated CurrentSong.txt Code

    + Added more song information in the TXT, JSON still would be really good, but its already possible to do a lot with the .txt and some crops in the Text Source
    --- Album
    --- Genre
    --- Year
    --- Source
    --- Charter
    + Changed the way the code works to just empty the files when its not in a song, this avoids some errors in OBS if you open the software and its not in a song for example

commit 19a41c6
Author: Kadu Waengertner <87105274+kaduwaengertner@users.noreply.github.com>
Date:   Fri Apr 21 16:24:05 2023 -0300

    Updated CurrentSong.txt (#152)

    + Added more song information in the TXT, JSON still would be really good, but its already possible to do a lot with the .txt and some crops in the Text Source
    --- Album
    --- Genre
    --- Year
    --- Source
    --- Charter
    + Changed the way the code works to just empty the files when its not in a song, this avoids some errors in OBS if you open the software and its not in a song for example

commit a233eda
Author: Nathan <nathanhurst03@gmail.com>
Date:   Fri Apr 21 13:23:14 2023 -0600

    Some various fixes (#153)

    * Fix calibration menu breaking the game when entered

    * Fix pause menu MissingReferenceException

    * Resume instead of exiting when pressing back in the pause menu

    * Clean up PauseMenu

    * Fix index out of range exception in DifficultyView

commit 03ea5b1
Author: Nathan <nathanhurst03@gmail.com>
Date:   Fri Apr 21 13:22:14 2023 -0600

    Disable Quickplay if no players are added (#154)

commit 50f242b
Author: eckerj <joe@jenixstudios.com>
Date:   Fri Apr 21 14:21:29 2023 -0500

    Minor cleanup, eliminating unused variable messages for defaultSmallImage and defaultSmallText (#155)

    Co-authored-by: Joseph Ecker <joe.ecker@nexenta.com>

commit 521603f
Author: RileyTheFox <jacobchambers@hotmail.co.uk>
Date:   Fri Apr 21 20:21:12 2023 +0100

    Fix stem volume settings while paused (#156)

    * Fix stems not adjusting volumes correctly after editing settings while paused

    * Adjusted localisation of some volume settings

commit d86e245
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 15:43:38 2023 -0400

    Fixed potential memory leak

commit 7986b37
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 15:14:30 2023 -0400

    Bug fix

    Selecting an instrument and exiting without selecting a difficulty will no longer break setlistInstruments or setlistDifficulties.

commit 96cf745
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 14:28:53 2023 -0400

    Setlist bug fixes

commit fca3728
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 14:24:11 2023 -0400

    Update .gitignore

commit 8fe646d
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 14:21:47 2023 -0400

    Activators are no longer obscured by SP

    Rearranged the code so that if an activator also happens be an SP note, it will always display purple.

commit 143ed74
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 13:47:39 2023 -0400

    Fixed DrumsTrack.cs

commit e099d63
Merge: b654cb8 45a30ca
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Wed Apr 19 13:12:52 2023 -0400

    Merge remote-tracking branch 'upstream/master' into drum_sp

commit b654cb8
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Tue Apr 18 12:45:26 2023 -0400

    Bugfix: Activators are now colored correctly

commit e8454cf
Merge: c1e2a19 e72c92e
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 21:09:28 2023 -0400

    Fixed merge conflicts

commit c1e2a19
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 20:23:08 2023 -0400

    Bug fixes

    Fixes:

    * Hitting any drums on an activator will activate SP, even if they aren't the right ones

    * SP activators appear even when it's already active if starpowerCharge >= 50%

    * hitChartIndex was not getting incremented for activators.

commit 19f53aa
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 19:11:29 2023 -0400

    Disabled auto-SP on 5-lane

commit addf138
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 18:40:20 2023 -0400

    starpowerCharge no longer needs to be public

commit 93c7fc8
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 18:36:18 2023 -0400

    Non-activator notes are no longer purple

    * Non-activator notes in a fill segment are no longer highlighted purple.

    * To allow for this, a new overload for NoteComponent.SetInfo has been created.

commit bfdde33
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 18:25:31 2023 -0400

    Only the last note of a fill is an activator

    * Only the last note of a fill segment activates star power now.

    * Made starpowerCharge accessor public for NoteComponent colors.

commit 1f91d12
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 18:09:45 2023 -0400

    Implemented activator notes

commit 538433f
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Mon Apr 17 16:21:14 2023 -0400

    Implemented fill parsing and re-enabled star power on drums

commit 379ccbd
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Sun Apr 16 17:56:20 2023 -0400

    Drum fills are now parsed

commit 807d4fa
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Sun Apr 16 17:36:11 2023 -0400

    Star power now appears on drum charts

commit 4ada28a
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Sun Apr 16 14:53:26 2023 -0400

    Implemented speed changes into setlists

commit 5df9cd6
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Sun Apr 16 14:30:51 2023 -0400

    Setlist now clears correctly

    * Setlist now properly clears on finish
    * Added "next up" text to results screen if there is more than one song remaining in the setlist
    * Moved a few setlist-related methods around

commit dbf53d5
Author: EscapeNumber001 <willloganmiller@gmail.com>
Date:   Sun Apr 16 12:51:05 2023 -0400

    Implement setlist system and basic UI

    * The players' chosen instruments and difficulties are now stored in queues. At the beginning of every song, index 0 is popped from both queues and stored in the currentInstrument and currentDifficulty variables respectively. This allows for various instruments and difficulties to be selected for different songs in a setlist.

    * There is now rudimentary UI for playing setlists.

* fix score formatting for PostSong

* add harmony scoring

* make harmony scoring based on parts filled

---------

Co-authored-by: EliteAsian <lavasnakegaming@gmail.com>
  • Loading branch information
muskit and EliteAsian123 authored Apr 23, 2023
1 parent 53c4e32 commit 2e1b9ef
Show file tree
Hide file tree
Showing 74 changed files with 7,986 additions and 81 deletions.
12 changes: 12 additions & 0 deletions Assets/Animations/UI.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Animations/UI/Star.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 116 additions & 0 deletions Assets/Animations/UI/Star/GoldMeter.anim
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GoldMeter
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -2
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: -2
outSlope: 0
tangentMode: 5
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Alpha
path:
classID: 225
script: {fileID: 0}
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 1574349066
script: {fileID: 0}
typeID: 225
customType: 0
isPPtrCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.5
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: -2
tangentMode: 69
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.5
value: 0
inSlope: -2
outSlope: 0
tangentMode: 5
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
attribute: m_Alpha
path:
classID: 225
script: {fileID: 0}
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
8 changes: 8 additions & 0 deletions Assets/Animations/UI/Star/GoldMeter.anim.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions Assets/Animations/UI/Star/GoldMeter.controller
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1102 &-3747766426833576191
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GoldMeter
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 5284036329390507100}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &151067664682043667
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GoldMeter
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 38080e5a92c4110408d86d0dc81b047f, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &5284036329390507100
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 151067664682043667}
m_Position: {x: 120, y: 260, z: 0}
- serializedVersion: 1
m_State: {fileID: -3747766426833576191}
m_Position: {x: 320, y: 110, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: -3747766426833576191}
8 changes: 8 additions & 0 deletions Assets/Animations/UI/Star/GoldMeter.controller.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2e1b9ef

Please sign in to comment.