mirror of
https://github.com/libretro/parallel-n64.git
synced 2026-11-07 23:02:26 -10:00
Matt Pharoah
0d83ebb78c
MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brings the 'rebase' branch (52fc98dde, 163 commits, 11 authors) onto current master (08ec54708) as a single squashed change. Authorship of the underlying commits — predominantly Matt Pharoah (105), aglab2 (44), plus smaller contributions from Denis Kopyrin, mudlord, devwizard, Mr-Wiseguy, zoltanvb, twinaphex, libretroadmin, LibretroAdmin, and Eric Warmenhoven — is recorded in the upstream 'rebase' branch (libretro/parallel-n64). Resolves conflicts in 6 files: .gitlab-ci.yml Kept linux-aarch64 + webOS jobs from master alongside osx-arm64, macOS HAVE_THR_AL, and iOS-disabled stanza from rebase HEAD. libretro/libretro.c Kept rebase's retro_core_options_v2 setup_variables; forward-ported astick_snap_active / astick_snap_max_angle / astick_snap_min_displacement_percent globals and their update_variables reads from PR #794, aligned to the registration key parallel-n64-astick-snap-max-angle (fixes the latent typo in #794 where the read key omitted '-max-' and the option had no effect). libretro/libretro_core_options.h Added entries for astick-snap-angle-active, astick-snap-max-angle, and astick-snap-min-displacement-percent so the snap options surface under the v2 options system. mupen64plus-core/src/pi/pi_controller.c Kept both extern blocks: g_rom_size (master, security fix) and AllowUnalignedDMA / AllowLargeRoms / SdCardEmulationEnabled (rebase). mupen64plus-core/src/plugin/emulate_game_controller_via_libretro.c Added M_PI guard, snap externs, and the snap-angle math from PR #794 into scale_joystick (refactored helper on rebase) rather than inputGetKeys_reuse. mupen64plus-core/src/rsp/rsp_core.c In read_rsp_regs2/write_rsp_regs2, combined SP_REGS2_COUNT bounds check (master) with SP_PC_REG masking (rebase). mupen64plus-rsp-paraLLEl/rsp_disasm.hpp Kept <stdint.h> rather than <cstdint> for consistency with the other headers in the paraLLEl-RSP module. Also fixes a pre-existing inconsistency in the rebase branch that strict GCC rejects under -Wincompatible-pointer-types: mupen64plus-core/src/si/game_controller.h Changed the get_gcn_input struct field's analogMode parameter from uint8_t to int, matching init_game_controller's parameter type, game_controller_gcn_get_input's signature, and the egcvip_get_gcn_input implementation (all three already used int).