mirror of
https://github.com/Cesarus85/ringfall-mjolnir-vr.git
synced 2026-10-17 14:00:25 +02:00
Stefan MaierandClaude Opus 5.5
74bdffb957
Conflicts: - render_objects.c: upstream's first-person legs and our VR body share one node_matrices (ours no longer shadowed it); upstream's legs never in VR (first_person_legs_wanted: set back behind a flat view's eye, they would stand behind the player; the VR body is vr.body "full"). - AndroidManifest.xml: upstream's ':game' process left out (the Steam Frame's Lepton waits for the app's process to end; the headsets have no Java heap over the Xbox window); HaloApplication kept, idle without it. - xinput_sdl.c: the touch controls and the web port's, never in VR; the controllers' rumble in VR before the phone's. - d3d8_gl.c: multiview's uniforms and upstream's blend constant, both. - build.yml: Android only; upstream's web and pages jobs off. - README.md: ours; upstream's in docs/OPENCE_README.md. - menu_tags.c: our VR pause-list fit dropped: upstream now spaces the rows 30 apart and moves the button hints below them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>