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

Merge to official STK #1

Merged
merged 40 commits into from
Dec 22, 2021
Merged

Merge to official STK #1

merged 40 commits into from
Dec 22, 2021

Conversation

STK-Waldlaubsaengernest
Copy link
Collaborator

Agreement

By creating a pull request in stk-code, you hereby agree to dual-license your contribution as
GNU General Public License version 3 or any later version and
Mozilla Public License version 2 or any later version.

This includes your previous contribution(s) under the same name of contributor.

Keep the above statement in the pull request comment for agreement.

lokpro and others added 30 commits October 23, 2021 00:03
@lokpro
fix 1734d74 - only use ranks in GP, else use row number.
550458b
@heuchi
add configuration for item return times in stk_config.xml
e110948
@fmesnier
correction of the implementation.txt file (#4655)
8f79b24
@qwertychouskie
Delete implementation.txt
ce19c93 
I didn't realize this file still existed, looks like all this is from the TuxKart days (2000-2004) and has no relevancy anymore.
@lokpro
add UserConfigParams: m_gp_reverse, random-gp-num-tracks for GPInfoSc…
1fd18c8 
…reen (#4656)
@Benau
Fix possible crash in discord rpc
1470eb3
@qwertychouskie @Benau
Remove ugly font/skin loading hack
9ca2c2e 
font_manager->loadFonts() needs data from the GUI skin.  Move this initialization to after we naturally have the data, instead of doing an extra dummy initialization just to get this data.
@qwertychouskie @Benau
Remove dead code block
14c1f7b 
The way this code was written, it would never be triggered in any real scenario (confirmed by running STK with a Log::fatal before the return)
@qwertychouskie @Benau
Use getThemedIcon instead of duplicated code
aee11c6
@qwertychouskie @Benau
Allow specifying a base skin
8b5b685 
Anything not provided or defined by a skin will be used from the defined base skin, if specified.

For example, if a skin provides a base_theme of "cartoon", any icons/buttons/etc. not provided by the skin will be pulled from "cartoon".
@mrkubax10
Add Lap Trial mode (#4663)
3623fa8
@mrkubax10
Lap Trial improvements (#4664)
0d8b01b
@BryanQuigley
Update Angelscript from 2.32.0 to 2.35.1
73c94f5 
Didn't require any changes except dos2unix.
@BryanQuigley
STK modifications to angelscript to let Windows/Apple builds
b710fab 
(and 3 forgotten source files)
@BryanQuigley
Always AS_MAX_PORTABILITY on AArch
bee1c22
@Benau
Update Noto Emoji to support Unicode 14
4d08ea2
@Benau
Update download assets size
712822a
@Benau
Update target SDK to 30 due to google play requirement
7582a00
@dlrudfh
Revised email issue and some kr translation (#4673)
1a11da0
@Benau
Fix #4671
c26b3c9
@Benau
Add track searching to network track screen
dfd1912
@Benau
Improve description for lap trial mode
844d97e
@Benau
Update translation source
d064f8d
@Benau
Update localized language names and use tsv file for them
33e6110
@Benau
Add missing country code to language selection
571366a
@Benau
Remove useless translation po files
3842530
@Varro33
Fix irrlicht error indent (#4676)
6b02236
@Benau
Fix #4677
b4411b1
@Benau
Fix server name missing in title when leaving live join kart selectio…
ea5aabd 
…n screen
@Benau
Fix #4653
d1c0aca
@STK-Waldlaubsaengernest STK-Waldlaubsaengernest merged commit 9636e23 into STK-TheRocker:master Dec 22, 2021
STK-TheRocker pushed a commit that referenced this pull request Sep 21, 2022
Moderation Features #1
1f35036
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.