Merge pull request #220 from nkrapivin/release/1.1

Update the GameController DB, preprocess with alynne's script.
overbound · Jan 25, 2022 · 221b913 · 221b913
2 parents 0fdc3b8 + 61baee1
commit 221b913
Show file tree

Hide file tree

Showing 3 changed files with 1,361 additions and 927 deletions.
diff --git a/README.md b/README.md
@@ -3,4 +3,5 @@ Source Code for a Sonic Fan Game Made in Game Maker Studio 1
 
 Note:
  - The soundtrack, "Dueling Ages" by Hinchy et al. is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/.
- - The Linux port includes a gamepad mapping database from the SDL_GameControllerDB project: https://github.com/gabomdq/SDL_GameControllerDB. To view a copy of the project's license, visit https://github.com/gabomdq/SDL_GameControllerDB/blob/master/LICENSE.
+ - The Linux and Windows builds include a gamepad mapping database from the SDL_GameControllerDB project: https://github.com/gabomdq/SDL_GameControllerDB. To view a copy of the project's license, visit https://github.com/gabomdq/SDL_GameControllerDB/blob/master/LICENSE.
+ - The database has also been preprocessed with a script by @offalynne https://gist.github.com/offalynne/e0a887556e8120390fc86c944e6861bf to make it compatible with Studio 1.4.9999.
diff --git a/SonicTimeTwisted.gmx/SonicTimeTwisted.project.gmx b/SonicTimeTwisted.gmx/SonicTimeTwisted.project.gmx
@@ -1928,25 +1928,25 @@
       <store>0</store>
       <ConfigOptions>
         <Config name="Default">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="AndroidSmartphone">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="AndroidConsole">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="MacOS">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="Linux">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="PlayStation">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
         <Config name="Browser">
-          <CopyToMask>134217856</CopyToMask>
+          <CopyToMask>135266496</CopyToMask>
         </Config>
       </ConfigOptions>
       <filename>gamecontrollerdb.txt</filename>