Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

add usemodelpack to menus #126

Merged
edotdot merged 4 commits into from
Mar 1, 2025
Merged

add usemodelpack to menus #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b9bde4
add usemodelpack to menus
bitten2up Jan 18, 2025
94b6077
e
bitten2up Feb 2, 2025
04aa5ca
oopies, forgot to update shit
bitten2up Feb 2, 2025
bb935f7
maybe??
bitten2up Feb 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
cache: gradle
- name: Build with Gradle
run: cd android && ./gradlew assemblegameNoAssets
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: srb2
path: android/app/build/outputs/apk/gameNoAssets/
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ else {
}

android {
compileSdkVersion 26
compileSdkVersion 31
defaultConfig {
if (buildAsApplication) {
applicationId "org.stjr.srb2"
Expand Down
1 change: 1 addition & 0 deletions src/m_menu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,6 +1794,7 @@ static menuitem_t OP_OpenGLOptionsMenu[] =
{IT_STRING|IT_CVAR, NULL, "Models", &cv_glmodels, 6},
{IT_STRING|IT_CVAR, NULL, "Frame interpolation", &cv_glmodelinterpolation, 11},
{IT_STRING|IT_CVAR, NULL, "Ambient lighting", &cv_glmodellighting, 16},
{IT_STRING|IT_CVAR, NULL, "Use modelpacks", &cv_usemodelpack, 21},

{IT_HEADER, NULL, "General", NULL, 25},
{IT_STRING|IT_CVAR, NULL, "Shaders", &cv_glshaders, 31},
Expand Down