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.

Sign up for GitHub

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

Jump to bottom

Chinese icon #1081

Merged
merged 5 commits into from
Apr 13, 2021
Merged

Chinese icon #1081

merged 5 commits into from
Apr 13, 2021

Conversation

DaEgi01
Copy link
Contributor

@DaEgi01 DaEgi01 commented Apr 12, 2021

Got those changes from 田七不甜 into our repo and created a new pull request.
Please check that I did not mess it up :)

TianQiBuTian and others added 4 commits August 30, 2020 15:34
@TianQiBuTian
Add Schinese icon
c489626
@TianQiBuTian
Merge branch 'master' into schinese-icon
b684109
@DaEgi01
Merge branch 'master' into schinese-icon
92d6a6a 
# Conflicts:
#	TLM/TLM/UI/Textures/RoadUI.cs
#	TLM/TLM/UI/Textures/TrafficLightTextures.cs
@DaEgi01
fixed merge bug.
01ac7bf
@DaEgi01 DaEgi01 mentioned this pull request Apr 12, 2021
Closed
krzychu124
krzychu124 approved these changes Apr 12, 2021
View reviewed changes
Copy link
Member

@krzychu124 krzychu124 left a comment

Choose a reason for hiding this comment

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

👍

kvakvs
kvakvs approved these changes Apr 13, 2021
View reviewed changes
Copy link
Collaborator

@kvakvs kvakvs left a comment

Choose a reason for hiding this comment

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

This does not introduce new set of speed limits signs or a new theme. Can be merged.

@DaEgi01 DaEgi01 merged commit 738e9f2 into master Apr 13, 2021
@DaEgi01 DaEgi01 deleted the schinese-icon branch April 13, 2021 01:32
@originalfoo originalfoo added Localisation Localised text and features UI User interface updates labels Dec 23, 2021
@originalfoo originalfoo changed the title Schinese icon Chinese icon Jan 18, 2022
@originalfoo originalfoo added PRIORITY SIGNS Feature: Stop / Yield / Priority signs TRAFFIC LIGHTS Feature: Traffic lights - toggle, timed, etc labels Jan 18, 2022
@originalfoo originalfoo added this to the 11.6.0 milestone Jan 18, 2022
@krzychu124 krzychu124 mentioned this pull request Apr 5, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvakvs kvakvs kvakvs approved these changes

@krzychu124 krzychu124 krzychu124 approved these changes

@chameleon-tbn chameleon-tbn Awaiting requested review from chameleon-tbn

@kianzarrin kianzarrin Awaiting requested review from kianzarrin

Assignees
No one assigned
Labels
Localisation Localised text and features PRIORITY SIGNS Feature: Stop / Yield / Priority signs TRAFFIC LIGHTS Feature: Traffic lights - toggle, timed, etc UI User interface updates
Projects
None yet
Milestone
11.6.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@DaEgi01 @kvakvs @krzychu124 @originalfoo @TianQiBuTian