Skip to content

Commit

Permalink
add some missing settings
Browse files Browse the repository at this point in the history
  • Loading branch information
Sisah2 committed Aug 3, 2024
1 parent e8f8841 commit 77a8db3
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 9 deletions.
4 changes: 3 additions & 1 deletion app/src/main/java/ui/activity/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,6 @@ class MainActivity : AppCompatActivity() {
}

// Game Mechanics
writeSetting("Game", "toggle sneak", if(prefs.getBoolean("gs_toggle_sneak", true)) "true" else "false")
writeSetting("Game", "uncapped damage fatigue", if(prefs.getBoolean("gs_uncapped_damage_fatigue", false)) "true" else "false")

writeSetting("Game", "rebalance soul gem values", if(prefs.getBoolean("gs_soulgem_values_rebalance", false)) "true" else "false")
Expand Down Expand Up @@ -571,6 +570,7 @@ class MainActivity : AppCompatActivity() {
writeSetting("Shaders", "auto use terrain normal maps", if(prefs.getBoolean("gs_auto_use_terrain_normal_maps", false)) "true" else "false")
writeSetting("Shaders", "auto use terrain specular maps", if(prefs.getBoolean("gs_auto_use_terrain_specular_maps", false)) "true" else "false")
writeSetting("Shaders", "apply lighting to environment maps", if(prefs.getBoolean("gs_bump_map_local_lighting", false)) "true" else "false")
writeSetting("Shaders", "weather particle occlusion", if(prefs.getBoolean("gs_weather_particle_occlusion", false)) "true" else "false")

// Visuals fog
writeSetting("Fog", "radial fog", if(prefs.getBoolean("gs_radial_fog", false)) "true" else "false")
Expand Down Expand Up @@ -603,13 +603,15 @@ class MainActivity : AppCompatActivity() {
}

// Animations
writeSetting("Game", "player movement ignores animation", if(prefs.getBoolean("gs_player_movement_ignores_animation", false)) "true" else "false")
writeSetting("Game", "use magic item animations", if(prefs.getBoolean("gs_use_magic_item_animation", false)) "true" else "false")
writeSetting("Game", "use additional anim sources", if(prefs.getBoolean("gs_use_additional_animation_sources", false)) "true" else "false")
writeSetting("Game", "weapon sheathing", if(prefs.getBoolean("gs_weapon_sheating", false)) "true" else "false")
writeSetting("Game", "shield sheathing", if(prefs.getBoolean("gs_shield_sheating", false)) "true" else "false")
writeSetting("Game", "graphic herbalism", if(prefs.getBoolean("gs_enable_graphics_herbalism", true)) "true" else "false")
writeSetting("Game", "smooth movement", if(prefs.getBoolean("gs_smooth_movement", false)) "true" else "false")
writeSetting("Game", "turn to movement direction", if(prefs.getBoolean("gs_turn_to_movement_direction", false)) "true" else "false")
writeSetting("Game", "smooth animation transitions", if(prefs.getBoolean("gs_smooth_animation_transitions", false)) "true" else "false")

// Interface
writeSetting("Game", "show owned", prefs.getString("gs_show_owned", "0").toString())
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/xml/gs_animations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<PreferenceCategory android:title="Animations">
<CheckBoxPreference
android:key="gs_player_movement_ignores_animation"
android:title="Player Movement Ignores Animation"
android:summary="In third person, the camera will sway along with the movement animations of the player. Enabling this option disables this swaying by having the player character move independently of its animation. This was the default behavior of OpenMW 0.48 and earlier."/>

<CheckBoxPreference
android:key="gs_use_magic_item_animation"
Expand Down Expand Up @@ -39,5 +43,10 @@
android:title="Turn to Movement Direction"
android:summary="Affects side and diagonal movement. Enabling this setting makes movement more realistic. If disabled then the whole character's body is pointed to the direction of view. Diagonal movement has no special animation and causes sliding. If enabled then the character turns lower body to the direction of movement. Upper body is turned partially. Head is always pointed to the direction of view. In combat mode it works only for diagonal movement. In non-combat mode it changes straight right and straight left movement as well. Also turns the whole body up or down when swimming according to the movement direction."/>

<CheckBoxPreference
android:key="gs_smooth_animation_transitions"
android:title="Smooth Animation Transitions"
android:summary="If enabled - makes transitions between different animations/poses much smoother. Also allows to load animation blending config YAML files that can be bundled with animations in order to customise blending styles."/>
</PreferenceCategory>

</PreferenceScreen>
6 changes: 0 additions & 6 deletions app/src/main/res/xml/gs_game_mechanics.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

<CheckBoxPreference
android:key="gs_toggle_sneak"
android:title="Toggle Sneak"
android:defaultValue="true"
android:summary="This setting causes the behavior of the sneak key (bound to Ctrl by default) to toggle sneaking on and off rather than requiring the key to be held down while sneaking. Players that spend significant time sneaking may find the character easier to control with this option enabled."/>

<CheckBoxPreference
android:key="gs_uncapped_damage_fatigue"
android:title="Uncapped Damage Fatigue"
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/xml/gs_visuals.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,11 @@
android:title="Bump/Reflect Map Local Lighting"
android:summary="Normally environment map reflections aren't affected by lighting, which makes environment-mapped (and thus bump-mapped objects) glow in the dark. Morrowind Code Patch includes an option to remedy that by doing environment-mapping before applying lighting, this is the equivalent of that option. Affected objects will use shaders."/>

<CheckBoxPreference
android:key="gs_weather_particle_occlusion"
android:title="Weather Particle Occlusion"
android:summary="EXPERIMENTAL: Stop rain and snow from falling through overhangs and roofs."/>

<!--
<CheckBoxPreference
android:key="gs_soft_particles"
Expand Down
4 changes: 2 additions & 2 deletions buildscripts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ set(MYGUI_VERSION 3.4.3)
set(MYGUI_HASH SHA256=d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42)

# https://github.com/sisah2/gl4es/releases
set(GL4ES_VERSION 8b6c0418dabe3410fc53918b66285588cde9a7e7)
set(GL4ES_VERSION 238eb8f698323eea0de5b1b41fa607112a6fdb8b)
set(GL4ES_HASH SHA256=b565e717c7d192e936bda25f3cb90ad8db398af56414ec08294b6716574c1a6d)

# https://github.com/openscenegraph/OpenSceneGraph/releases
Expand All @@ -56,7 +56,7 @@ set(LIBICU_VERSION 70-1)
set(LIBICU_HASH SHA256=4013d7aff8a34bae410664bdb16554d7eda03654b22627b9284ab55a685492d4)

# https://github.com/OpenMW/openmw/commits/master
set(OPENMW_VERSION 9fc2de33818c2c04cb660b92a67ab03d494a9f0a)
set(OPENMW_VERSION 0ff29b3da4996742e8a4cfe971d6aa11c550df4b)
set(OPENMW_HASH SHA256=44d044ad0a5546216fe611fe92c37065bb07e2efeeeaac4f049dae03df313186)

# End of configurable options
Expand Down

0 comments on commit 77a8db3

Please sign in to comment.