Initial Settings Functionality

.gitignore

@@ -1,5 +1,3 @@
-cmake-build-release/
-cmake-build-debug/
-.idea/
+.vs/
 build/
-/.vs
+out/

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "dep/imgui"]
+	path = dep/imgui
+	url = https://github.com/ocornut/imgui.git
+[submodule "dep/libmcc"]
+	path = dep/libmcc
+	url = https://github.com/SpringContingency/libmcc.git
+[submodule "dep/spdlog"]
+	path = dep/spdlog
+	url = https://github.com/gabime/spdlog.git
+[submodule "dep/json"]
+	path = dep/json
+	url = https://github.com/nlohmann/json.git

CMakeLists.txt

@@ -22,27 +22,28 @@ include_directories(${CMAKE_SOURCE_DIR}/lib/json/include)
 # imgui
 add_library(imgui SHARED IMPORTED)
 include_directories(${CMAKE_SOURCE_DIR}/lib/imgui/inc)
-set_target_properties(imgui PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/imgui/lib/${CMAKE_BUILD_TYPE}/imgui.lib")
+set_target_properties(imgui PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/imgui/lib/release/imgui.lib")
 
 # lua
 add_library(lua SHARED IMPORTED)
 include_directories(${CMAKE_SOURCE_DIR}/lib/lua/inc)
-set_target_properties(lua PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/lua/lib/${CMAKE_BUILD_TYPE}/lua.lib")
+set_target_properties(lua PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/lua/lib/release/lua.lib")
 
 # spdlog
 add_library(spdlog SHARED IMPORTED)
 include_directories(${CMAKE_SOURCE_DIR}/lib/spdlog/inc)
-set_target_properties(spdlog PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/spdlog/lib/${CMAKE_BUILD_TYPE}/spdlog.lib")
+set_target_properties(spdlog PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/spdlog/lib/release/spdlog.lib")
 
 # tinyxml2
 add_library(tinyxml2 SHARED IMPORTED)
 include_directories(${CMAKE_SOURCE_DIR}/lib/tinyxml2/inc)
-set_target_properties(tinyxml2 PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/tinyxml2/lib/${CMAKE_BUILD_TYPE}/tinyxml2.lib")
+set_target_properties(tinyxml2 PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/tinyxml2/lib/release/tinyxml2.lib")
 
 # minhook
 add_library(minhook SHARED IMPORTED)
 include_directories(${CMAKE_SOURCE_DIR}/lib/minhook/inc)
-set_target_properties(minhook PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/minhook/lib/${CMAKE_BUILD_TYPE}/libMinhook.x64.lib")
+# set_target_properties(minhook PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/minhook/lib/${CMAKE_BUILD_TYPE}/libMinHook.x64.lib")
+set_target_properties(minhook PROPERTIES IMPORTED_IMPLIB "${CMAKE_SOURCE_DIR}/lib/minhook/lib/release/libMinHook.x64.lib")
 
 # utils
 file(GLOB_RECURSE UTILS_SRC ${CMAKE_SOURCE_DIR}/lib/utils/src/*.cpp)
@@ -75,4 +76,4 @@ else ()
 endif()
 
 install(TARGETS ${WRAPPER_NAME} DESTINATION "${MCC_DIR}/mcc/binaries/win64")
-install(DIRECTORY "${CMAKE_SOURCE_DIR}/res/" DESTINATION "${MCC_DIR}/alpha_ring")
+install(DIRECTORY "${CMAKE_SOURCE_DIR}/res/" DESTINATION "${MCC_DIR}/alpha_ring")

README.md

@@ -1,4 +1,47 @@
-## Alpha Ring
+# AlphaRing - thejackbitt fork
+
+>
+> **Based on:** JackBitt's AlphaRing v1.2.1 (commit `bdad7eb`)
+>
+> For the original project, see [WinterSquire/AlphaRing](https://github.com/WinterSquire/AlphaRing)
+
+---
+
+## What's New in This Fork
+
+### Features Added
+
+#### 1. Controller-to-Player Binding (Splitscreen)
+- Each player now has a **"Bind" button** next to the controller dropdown
+- Click "Bind" → Press any button on a controller → Automatically assigns that controller to the player
+- No more guessing which controller is "Controller 1" vs "Controller 2"
+
+#### 2. Button-to-Action Binding (Gamepad Mapping)
+- Each action in the Gamepad Mapping section has a **"Bind" button**
+- Click "Bind" → Press a button → That button is assigned to the action
+
+#### 3. Fixed Default Gamepad Mappings
+- **Bug fixed:** Previously, all actions defaulted to "Left Trigger" due to uninitialized memory
+- **Now:** New profiles initialize with standard Xbox Halo controls:
+
+| Action | Button |
+|--------|--------|
+| Jump | A |
+| Melee | B |
+| Action/Interact | X |
+| Change Weapon | Y |
+| Reload | RB |
+| Switch Grenades | LB |
+| Shoot | RT |
+| Throw Grenade | LT |
+| Flashlight | D-pad Up |
+| Crouch | Left Stick Click |
+| Zoom | Right Stick Click |
+
+---
+
+## Original Alpha Ring
+
 A Modding Tool for MCC
 
 [![Build status](https://ci.appveyor.com/api/projects/status/o3qbtc7jirw81xmb?svg=true)](https://ci.appveyor.com/project/WinterSquire/alpharing)
@@ -19,26 +62,69 @@ A Modding Tool for MCC
 ### Installation
 Make sure you have the latest [Microsoft Visual C++ Redistributable](https://aka.ms/vs/17/release/vc_redist.x64.exe) installed.
 
-Download the latest stable build from the [Releases](https://github.com/WinterSquire/AlphaRing/releases) page.
+Download the latest stable build from the [Releases](https://github.com/kirklandsig/AlphaRing/releases) page.
 
 Place the DLL into the "Halo The Master Chief Collection\mcc\binaries\win64" directory and launch the game with EAC off.
 
 For Running on Steam Deck/Linux, add the following command in the Steam Game Launch Options:
-``` 
+```
 WINEDLLOVERRIDES="WTSAPI32=n,b" %command%
 ```
 
+#### Batocera Linux / Steam Deck
+
+Works with **any Proton version** (Proton 9.0, Proton Experimental, Proton GE, etc.)
+
+1. **Configure the game**:
+   - Right-click MCC → Properties → Compatibility
+   - Enable "Force the use of a specific Steam Play compatibility tool"
+   - Select any Proton version (Proton 9.0, Experimental, or Proton GE all work)
+
+2. **Set launch options**: Add the following to Steam Launch Options:
+   ```
+   WINEDLLOVERRIDES="WTSAPI32=n,b" %command%
+   ```
+
+3. **Controller Setup (Important for non-Xbox controllers)**:
+   - For 8BitDo and other third-party controllers, enable **Steam Input** for the controller
+   - Go to Steam → Settings → Controller → Enable "Xbox Configuration Support"
+   - This allows Steam to translate your controller inputs to XInput, which MCC and AlphaRing expect
+   - Without this, some buttons (like A or stick clicks) may not be detected
+
+> **Note:** Tested on Batocera Linux with the unofficial Batocera add-ons Steam client.
+
 ### Usage
 Toggle menu: `F4` or `Controller Back` + `Controller Start`
 
 To navigate using Controller use the `Right Stick` to move the mouse and `RB` to click.
 
 When the menu is open, game input is disabled.
 
-### Bugs Report
-Submit it in the [Issues](https://github.com/WinterSquire/AlphaRing/issues) page.
+---
+
+## Building from Source
+
+### Prerequisites
+- Visual Studio 2022 Build Tools
+- CMake 3.27+
+
+### Build Commands
+```bash
+# First time setup
+mkdir build && cd build
+cmake .. -G "Visual Studio 17 2022" -A x64
+
+# Build
+"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" WTSAPI32.vcxproj -p:Configuration=Release -p:Platform=x64
+```
+
+Output: `build/Release/WTSAPI32.dll`
+
+---
 
-### Credits
+## Credits
+- **Original AlphaRing:** [WinterSquire](https://github.com/WinterSquire/AlphaRing)
+- **Controller Binding and Proton Fixes Fork:** [kirklandsig](https://github.com/kirklandsig/AlphaRing)
 - [Assembly](https://github.com/XboxChaos/Assembly) for the tag group research.
 - [Blender](https://github.com/blender/blender) for the bezier curve calculation.
 - [Priception](https://github.com/Priception) for adding UI controller support and helping with the interface and crash issue.