Skip to content

feat(scoreboard): Scoreboard rewrite. - #159

Open
The-Neco wants to merge 4 commits into
citizenfx:masterfrom
The-Neco:feat-scoreboard
Open

feat(scoreboard): Scoreboard rewrite.#159
The-Neco wants to merge 4 commits into
citizenfx:masterfrom
The-Neco:feat-scoreboard

Conversation

@The-Neco

@The-Neco The-Neco commented Mar 19, 2021

Copy link
Copy Markdown

Full scoreboard rewrite and redesign with a column API allowing for resources to add custom columns to the scoreboard on the fly.

image

New events added in this commit:

scoreboard:addColumn

Adds a column to the scoreboard in the specified position with a default value.

scoreboard:removeColumn

Removes the specified column.

scoreboard:updateColumnValue

Updates the specified column value for the specified player.

Co-Authored-By: Christopher Gjelten 59088889+itschip@users.noreply.github.com

Co-Authored-By: Christopher Gjelten <59088889+itschip@users.noreply.github.com>
@blattersturm

Copy link
Copy Markdown
Contributor

Egh.

@itschip

itschip commented Mar 19, 2021

Copy link
Copy Markdown

@blattersturm Anything you'd like to see changed?

@blattersturm blattersturm left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh.

-- Altering or recreating for local use only is strongly discouraged.

version '1.0.0'
author 'Chip & Neco'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bundled assets should be a generic name since we're not using the fxports system at this time.

}

game 'gta5'
fx_version 'adamant'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Meh. Is this compliant to any newer versions' stuff?

@@ -0,0 +1,74 @@
@import url('https://fonts.googleapis.com/css2?family=Rubik:wght@400;500;600&display=swap');

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remote dependencies are a no.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you'd like me to download the font instead?

}

.content-table tbody tr:nth-child(2n) {
color: #fff;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these both the exact same?

html
node_modules
.yarn.installed
yarn.lock

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't ignore yarn.lock.

document.getElementById('root')
);

// If you want to start measuring performance in your app, pass a function

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, good old CRA comment. Can delete it.

@@ -0,0 +1,15 @@
import { ReportHandler } from 'web-vitals';

const reportWebVitals = (onPerfEntry?: ReportHandler) => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, we can honestly delete both this and the test file....

**/
const defaultOptions = {};

export const useNuiEvent = <S = Record<string, unknown>>(

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cute. Where'd this get copied from?

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


module: {
rules: [
{

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

THE INDENTATION

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will be fixed.

DisableControlAction(0, 2, true)
DisableControlAction(0, 16, true)
DisableControlAction(0, 17, true)
end

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No re-request for users who hold it for >1 second either? :(

@The-Neco
The-Neco requested a review from blattersturm March 21, 2021 18:12
@blattersturm

blattersturm commented Mar 21, 2021 via email

Copy link
Copy Markdown
Contributor

The-Neco added a commit to The-Neco/cfx-server-data that referenced this pull request Mar 25, 2021
Free for All gamemode witch integrates with mapmanger and spawnmanager. Also requires new scoreboard in PR citizenfx#159.

Co-Authored-By: Christopher Gjelten <59088889+itschip@users.noreply.github.com>
@blattersturm

Copy link
Copy Markdown
Contributor

Sorry for the delay - I'm still intending to merge it next time I make a pass at this repo.

Comment thread resources/[system]/scoreboard/client.lua
Added additional disabled keys as mentioned by @RockySouthpaw.
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.

4 participants