Merge commit 'db02b50d2ecdfbbc21e19aadc57253c353069f77'

Merged beta 5.0-15445

CMakeLists.txt

@@ -59,7 +59,6 @@ option(ENCODE_FRAMEDUMPS "Encode framedumps in AVI format" ON)
 
 option(ENABLE_GPROF "Enable gprof profiling (must be using Debug build)" OFF)
 option(FASTLOG "Enable all logs" OFF)
-option(GDBSTUB "Enable gdb stub for remote debugging." ON)
 option(OPROFILING "Enable profiling" OFF)
 
 # TODO: Add DSPSpy
@@ -389,10 +388,6 @@ if(FASTLOG)
   add_definitions(-DDEBUGFAST)
 endif()
 
-if(GDBSTUB)
-  add_definitions(-DUSE_GDBSTUB)
-endif()
-
 if(ENABLE_VTUNE)
   set(VTUNE_DIR "/opt/intel/vtune_amplifier")
   add_definitions(-DUSE_VTUNE)
@@ -488,8 +483,14 @@ if(ENCODE_FRAMEDUMPS)
   if(WIN32 AND _M_X86_64)
     set(FFMPEG_DIR Externals/ffmpeg)
   endif()
-  find_package(FFmpeg COMPONENTS avcodec avformat avutil swscale)
+  find_package(FFmpeg COMPONENTS avcodec avformat avutil swresample swscale)
   if(FFmpeg_FOUND)
+    if(APPLE) 
+      find_library(COREMEDIA_LIBRARY CoreMedia)
+      find_library(VIDEOTOOLBOX_LIBRARY VideoToolbox)
+      find_library(COREVIDEO_LIBRARY CoreVideo)
+      find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
+    endif()
     message(STATUS "libav/ffmpeg found, enabling AVI frame dumps")
     add_definitions(-DHAVE_FFMPEG)
   else()
@@ -925,6 +926,10 @@ set(CPACK_RPM_PACKAGE_LICENSE GPL-2.0)
 # TODO: CPACK_NSIS_*
 # TODO: Use CPack components for DSPSpy, etc => cpack_add_component
 
+# Debian Specific. Install dpkg-dev for automatic deps generation
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_SECTION "Games")
+
 set(CPACK_SET_DESTDIR ON)
 set(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;ZIP")
 set(CPACK_SOURCE_IGNORE_FILES  "\\\\.#;/#;.*~;\\\\.swp;/\\\\.git")

Data/Sys/GameSettings/G2C.ini

@@ -0,0 +1,4 @@
+# G2CD52, G2CE52, G2CP52, G2CX52 - True Crime: New York City
+
+[Core]
+DivByZeroExceptions = True

Data/Sys/GameSettings/GCO.ini

@@ -0,0 +1,4 @@
+# GCOD52, GCOE52, GCOF52, GCOP52 - Call of Duty: Finest Hour
+
+[Core]
+DivByZeroExceptions = True

Data/Sys/GameSettings/GMPE01.ini

@@ -119,6 +119,10 @@ c2073c7c 00000002
 60000000 00000000
 *Fixes a bug where only analog inputs work while using the triggers.
 
+$QOL - Automatically Advance Text Boxes [gamemasterplc]
+04044A90 60000000
+*Automatically scrolls the text boxes without pushing A
+
 $QOL - Faster Boot Time [Ralf]
 04056168 38607FFF
 *Automatically advance through the initial cutscences.
@@ -154,6 +158,10 @@ $QOL - Instant Text Display [gamemasterplc]
 04044808 38600000
 *Text is displayed instantly.
 
+$QOL - Rumble Always Off [gamemasterplc]
+0018FDDC 00000000
+*Rumble is always disabled
+
 $QOL - Show Controller Port Number of Who Paused in Mini-Games [gamemasterplc]
 c203e9b4 00000002
 807f0050 906d0000
@@ -212,13 +220,6 @@ $Board: Bowser's Gnarly Party - Bridges Fall After One Cross [gamemasterplc]
 e2000001 80008000
 *Bridges fall after one crossing instead of three in the board Bowser's Gnarly Party.
 
-$Board: Goomba's Greedy Gala - Free Roulette [gamemasterplc]
-2043b934 2c1f0005
-0443b92c 386003e7
-0443bb08 38800000
-e2000001 80008000
-*Goomba does not need to be bribed at the roulette in the board Goomba's Greedy Gala.
-
 $Board: Goomba's Greedy Gala - Never Go Back To Start [gamemasterplc]
 20432D5C 3860000A
 04432D60 38600009
@@ -237,6 +238,7 @@ $Board - Toad's Midway Madness: Teacups are Normal Junctions [gamemasterplc]
 044352f4 4e800020
 e2000001 80008000
 *Replaces the teacup junctions with normal junctions in Toad's Midway Madness.
+*Top left junction only goes to the right.
 
 $Extra - 30Hz Gameplay [gamemasterplc]
 041D3B00 40000000
@@ -259,7 +261,15 @@ $Extra - Disable Music
 041d3d1c 00000001
 *Disables all in-game music.
 
-$Game Mechanics - Event Accessibility Doesn't Depend on Mini/Mega Status [Celerizer]
+$Mechanics - Double the Amount of Turns [Airsola]
+C205BEF8 00000004
+2C000032 4182000C
+7C000214 48000008
+38000063 98030005
+60000000 00000000
+*50 turns becomes 99 due to integer cap.
+
+$Mechanics - Event Accessibility Doesn't Depend on Mini/Mega Status [Celerizer]
 04075ff0 38600000
 040a50a4 38600000
 04077c50 38600000
@@ -285,13 +295,20 @@ e2000001 80008000
 e2000001 80008000
 *Access all board events regardless of Mega / Mini Mushrooms.
 
-$Game Mechanics - Free Lottery Game [Celerizer]
+$Mechanics - Free Lottery Game [Celerizer]
 0407b28c 38600005
 0407bd04 38800000
 *Makes the lottery cost nothing instead of the usual 5 coins.
 *You need to have 5 coins but you do not lose them.
 
-$Game Mechanics - Item Deletion [Rain]
+$Mechanics - Free Stars [gamemasterplc]
+040843cc 2c030000
+04084590 2c030000
+040845cc 2c030000
+04084720 38800000
+*Stars cost nothing instead of the usual 20 coins.
+
+$Mechanics - Item Deletion [Rain]
 c208d424 00000002
 987d0001 3c608000
 93a30010 00000000
@@ -330,36 +347,29 @@ c208a07c 0000001f
 *Item Deletion is now a thing.
 *Press B to view your items, then delete the item with R.
 
-$Game Mechanics - Free Stars [gamemasterplc]
-040843cc 2c030000
-04084590 2c030000
-040845cc 2c030000
-04084720 38800000
-*Stars cost nothing instead of the usual 20 coins.
-
-$Game Mechanics - Mega Status No Longer Steals Coins [gamemasterplc]
+$Mechanics - Mega Status No Longer Steals Coins [gamemasterplc]
 0406be70 38600000
 0406beac 38600000
 0406be1c 38600000
 *Mega Mushroom no longer steal coins when you pass players.
 
-$Game Mechanics - Mini Pipes Work at Normal Size [gamemasterplc]
+$Mechanics - Mini Pipes Work at Normal Size [gamemasterplc]
 04066348 60000000
 04064ed0 60000000
 04065114 60000000
 *Mini Pipes do not require a Mini Mushroom to pass.
 
-$Game Mechanics - Mini Status Rolls 1-10 [gamemasterplc]
+$Mechanics - Mini Status Rolls 1-10 [gamemasterplc]
 04085d74 3800000a
 *Mini Mushroom rolls a 1-10 dice instead of a 1-5 dice.
 
-$Minigame - Bowser's Bigger Blast [gamemasterplc]
+$Minigame: Bowser's Bigger Blast - Infinite Time [gamemasterplc]
 20431174 3803FFFF
 04431174 38030000
 E2000001 80008000
 *Infinite time is given in the minigame Bowser's Bigger Blast
 
-$Minigame - Domination: More Thwomps [UnclePunch]
+$Minigame: Domination - More Thwomps [UnclePunch]
 C203220C 0000001F
 A0610008 2C03000F
 408200E8 807F0004
@@ -394,7 +404,7 @@ A0A40000 7CA00734
 38600000 00000000
 *Increases the limit from 160 to 300 Thwomps per player in the minigame Dominiation
 
-$Minigame - Take a Breather: Mash Only L [gamemasterplc]
+$Minigame: Take a Breather - Mash Only L [gamemasterplc]
 20420834 408209b8
 04420818 38a00000
 044207f0 38600000

Data/Sys/GameSettings/GP5E01.ini

@@ -466,7 +466,7 @@ $Press L+X: Player Stops Moving [Datel]
 
 [Gecko]
 # Add gecko cheats here.
-$QOL - Auto Scrolling Text Boxes [gamemasterplc]
+$QOL - Automatically Advance Text Boxes [gamemasterplc]
 F6000001 80008180
 A81F019C 7C001838
 1400000C 60000000
@@ -594,6 +594,13 @@ $Mechanics - Battle Minigames Don't Affect Mini-Game Star [gamemasterplc]
 e2000001 80008000
 *Battle Minigames do not count towards the Mini-Game Star.
 
+$Mechanics - Disable Bonus Stars [gamemasterplc]
+20484E0C 40820020
+04484E0C 48000020
+04484E44 4800001C
+E2000001 80008000
+*Disables the Bonus Stars
+
 $Mechanics - Disable Capsules [gamemasterplc]
 F6000001 80008180
 3BC50005 887E0000
@@ -604,6 +611,14 @@ E0000000 80008000
 *Disables all usage of Capsules.
 *Capsules already on spaces will continue to exist.
 
+$Mechanics - Double the Amount of Turns [Airsola]
+C208DA0C 00000004
+2C000032 4182000C
+7C000214 48000008
+38000063 98030005
+60000000 00000000
+*50 turns becomes 99 due to integer cap.
+
 $Mechanics - Free Stars [gamemasterplc]
 f6000001 80008180
 4080002c 386002f0
@@ -649,6 +664,7 @@ C20C8FA0 0000001B
 7C0803A6 38210010
 4E800020 00000000
 *Improves the RNG of what items are received.
+*Null items can be retrieved. To Dispose of throw on any space.
 
 $Mechanics - Last 5 Turns is x3 Coins on Spaces [gamemasterplc]
 20288860 00000076
@@ -721,6 +737,12 @@ $Minigame: Bound of Music - No Bricks [gamemasterplc]
 e2000001 80008000
 *Bricks are removed in the minigame Bound of Music.
 
+$Minigame: Curvy Curves - 1 Player is Slower [Airsola]
+20464124 416f5c06
+04464124 41400000
+e2000001 00000000
+*1 Player is slower in Curvy Curves.
+
 $Minigame: Ground Pound Down - No Rocks Until End [gamemasterplc]
 2046FCC4 4180FF6C
 0446FCC4 60000000
@@ -743,7 +765,7 @@ C245D2AC 00000004
 E2000001 80008000
 *Multiplication is only present in the minigame Mathletes.
 
-$Minigame: Pop Star Piranhas - Halved Time to Pick [gamemasterplc]
+$Minigame: Pop Star Piranhas - Halved Time to Pick [Airsola]
 20288860 00000016
 28541d52 0000012b
 02541d52 000000b3
@@ -759,57 +781,57 @@ D3FF0014 00000000
 E2000001 80008000
 *Flowers rise more per button press in the minigame Will Flower.
 
-$Minigame Replacement - Big Top Drop ➜ Squared Away [Nora]
+$Minigame Replacement - Big Top Drop ➜ Squared Away [gamemasterplc]
 2822A4C4 00000018
 0222A4C4 00000011
 E2000001 80008000
 
-$Minigame Replacement - Curvy Curbs ➜ Tube It or Lose It [Nora]
+$Minigame Replacement - Curvy Curbs ➜ Tube It or Lose It [gamemasterplc]
 2822A4C4 0000004C
 0222A4C4 00000043
 E2000001 80008000
 
-$Minigame Replacement - Get a Rope ➜ Piece Out [Nora]
+$Minigame Replacement - Get a Rope ➜ Piece Out [gamemasterplc]
 2822A4C4 0000002D
 0222A4C4 00000033
 E2000001 80008000
 
-$Minigame Replacement - Lucky Lineup ➜ Astro-Logical [Nora]
+$Minigame Replacement - Lucky Lineup ➜ Astro-Logical [gamemasterplc]
 2822A4C4 00000026
 0222A4C4 00000022
 E2000001 80008000
 
-$Minigame Replacement - Replace Mathletes ➜ Flatiator [Nora]
+$Minigame Replacement - Mathletes ➜ Flatiator [gamemasterplc]
 2822a4c4 00000044
 0222a4c4 00000010
 e2000001 80008000
 
-$Minigame Replacement - Replace Pound Peril ➜ Sky Survivor [Nora]
+$Minigame Replacement - Pound Peril ➜ Sky Survivor [gamemasterplc]
 2822a4c4 00000032
 0222a4c4 00000036
 e2000001 80008000
 
-$Minigame Replacement - Replace Random Ride ➜ Twist 'n' Out [Nora]
+$Minigame Replacement - Random Ride ➜ Twist 'n' Out [gamemasterplc]
 2822a4c4 00000027
 0222a4c4 00000025
 e2000001 80008000
 
-$Minigame Replacement - Replace Rumble Fumble ➜ Fish Upon a Star [Nora]
+$Minigame Replacement - Rumble Fumble ➜ Fish Upon a Star [gamemasterplc]
 2822a4c4 00000041
 0222a4c4 00000040
 e2000001 80008000
 
-$Minigame Replacement - Replace Scaldin' Cauldron ➜ Rain of Fire [Nora]
+$Minigame Replacement - Scaldin' Cauldron ➜ Rain of Fire [gamemasterplc]
 2822A4C4 0000003C
 0222A4C4 0000003A
 E2000001 80008000
 
-$Minigame Replacement - Replace Vicious Vending ➜ Coin Cache [Nora]
+$Minigame Replacement - Vicious Vending ➜ Coin Cache [gamemasterplc]
 2822a4c4 00000017
 0222a4c4 0000000f
 e2000001 80008000
 
-$Minigame Replacement - Replace Whomp Maze ➜ Shock Absorbers [Nora]
+$Minigame Replacement - Whomp Maze ➜ Shock Absorbers [gamemasterplc]
 2822a4c4 0000002a
 0222a4c4 00000028
 e2000001 80008000