Skip to content

Commit

Permalink
Merge branch 'TASEmulators:master' into add-gameboy-memory-callback-v…
Browse files Browse the repository at this point in the history
…alues
  • Loading branch information
roydmerkel authored Dec 1, 2024
2 parents 9e824f8 + 6f0ae71 commit 5487b83
Show file tree
Hide file tree
Showing 1,655 changed files with 34,267 additions and 19,300 deletions.
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ csharp_new_line_before_open_brace = all
csharp_new_line_before_else = true
csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_space_after_cast = true
csharp_indent_switch_labels = true
csharp_indent_case_contents = true
csharp_indent_labels = one_less_than_current
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ assignees: ''
[//]: # "This description supports Markdown syntax. There's a cheatsheet here: https://guides.github.com/features/mastering-markdown/"
[//]: # "These lines are comments, for letting you know what you should be writing. You can delete them or leave them in."
[//]: # "Also, please don't waste your time writing until you've checked for similar Issues. Remember to check closed Issues too!"
[//]: # "One more thing: if you're on Linux, please comment on #1430 instead of opening an issue so we don't annoy the other devs."

### Summary
[//]: # "Briefly describe what's broken. Include relevant details: loaded core, loaded rom's hash, open tools, running scripts... You can embed a screenshot if it's easier to show the bug, but if you need more than one please put them at the end."
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@ contact_links:
- name: "BEFORE OPENING AN ISSUE: Search for duplicates"
url: "https://github.com/TASVideos/BizHawk/issues?q=is:issue+<search+terms>"
about: "Use `is:issue <search terms>` to find open or closed issues that might be similar to your problem. (Clicking this option takes you back to the issue tracker index.)"
- name: "Report issues with the Linux port"
url: "https://github.com/TASVideos/BizHawk/issues/1430"
about: "Linux users: please comment here, on #1430, instead of opening a new issue."
- name: "Chat with us on IRC"
url: "https://matrix.to/#/#bizhawk:libera.chat"
about: "Joins #bizhawk on Libera Chat with your browser. Please be patient as there isn't always somebody online."
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
[//]: # "Apart from the mandatory license signature, these tasks are optional, but doing them could save reviewers some time and get the PR merged sooner."
Check if completed:
- [ ] I have run any relevant test suites
- [ ] I, the committer, have read the [licensing terms for contributors](https://github.com/TASEmulators/BizHawk/blob/master/contributing.md#copyrights-and-licensing) (last updated 2024-03-20) and am compliant
- [ ] I, the committer, have read the [licensing terms for contributors](https://github.com/TASEmulators/BizHawk/blob/master/contributing.md#copyrights-and-licensing) (last updated 2024-06-22) and am compliant
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
matrix:
os:
- { prettyname: Windows, fullname: windows-latest }
- { prettyname: Linux, fullname: ubuntu-latest }
- { prettyname: Linux, fullname: ubuntu-22.04 } # newer ubuntu versions don't ship with mono, so we need to pin for now, see https://github.com/actions/runner-images/issues/10636
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/make.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
git submodule update --init gpgx/Genesis-Plus-GX;
git submodule update --init ../submodules/sameboy/libsameboy;
git submodule update --init uae/libretro-uae;
git submodule update --init stella/core;
- name: Download compiled waterbox
uses: actions/download-artifact@v4
with:
Expand Down Expand Up @@ -100,6 +101,7 @@ jobs:
Assets/dll/turbo.wbx.zst
Assets/dll/uzem.wbx.zst
Assets/dll/vb.wbx.zst
Assets/dll/stella.wbx.zst
Assets/dll/virtualjaguar.wbx.zst
build-mame:
Expand Down
11 changes: 9 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,15 @@
[submodule "waterbox/gpgx/Genesis-Plus-GX"]
path = waterbox/gpgx/Genesis-Plus-GX
url = https://github.com/TASEmulators/Genesis-Plus-GX.git
branch = tasvideos-2.1
branch = tasvideos-2.2
[submodule "waterbox/stella/core"]
path = waterbox/stella/core
url = https://github.com/TASEmulators/stella.git
branch = tasvideos-1
[submodule "waterbox/uae/libretro-uae"]
path = waterbox/uae/libretro-uae
url = https://github.com/TASEmulators/libretro-uae.git
branch = wbx
branch = wbx-1
[submodule "ExternalProjects/FlooohChips/chips"]
path = ExternalProjects/FlooohChips/chips
url = https://github.com/floooh/chips.git
86 changes: 68 additions & 18 deletions .global.editorconfig.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
is_global = true

# Obsolete member 'memberA' overrides non-obsolete member 'memberB' (this simply doesn't work, see https://learn.microsoft.com/en-us/dotnet/csharp/misc/cs0809#methods-recognized-as-obsolete)
dotnet_diagnostic.CS0809.severity = error

## BizHawk internal rules

# Do not use anonymous delegates
Expand All @@ -14,6 +17,8 @@ dotnet_diagnostic.BHI1004.severity = error
dotnet_diagnostic.BHI1005.severity = error
# Do not discard local variables
dotnet_diagnostic.BHI1006.severity = error
# Don't use target-typed new for throw expressions
dotnet_diagnostic.BHI1007.severity = error
# Don't call this.GetType() in sealed type, use typeof operator
dotnet_diagnostic.BHI1100.severity = error
# Don't call this.GetType(), use typeof operator (or replace subtype check with better encapsulation)
Expand All @@ -22,18 +27,34 @@ dotnet_diagnostic.BHI1101.severity = error
dotnet_diagnostic.BHI1102.severity = error
# Don't call typeof(T).ToString(), use nameof operator or typeof(T).FullName
dotnet_diagnostic.BHI1103.severity = error
# Don't use ^= (XOR-assign) for inverting the value of booleans
dotnet_diagnostic.BHI1104.severity = error
# Use unambiguous decimal<=>float/double conversion methods
dotnet_diagnostic.BHI1105.severity = error
# Brackets of collection expression should be separated with spaces
dotnet_diagnostic.BHI1110.severity = warning
# Expression-bodied member should be flowed to next line correctly
dotnet_diagnostic.BHI1120.severity = silent
# Record type declaration missing class (or struct) keyword
dotnet_diagnostic.BHI1130.severity = error

# Check result of IDictionary.TryGetValue, or discard it if default(T) is desired
dotnet_diagnostic.BHI1200.severity = error
# Inferred type of branches of ternary expression in interpolation don't match
dotnet_diagnostic.BHI1210.severity = error

# Call to FirstOrDefault when elements are of a value type; FirstOrNull may have been intended
dotnet_diagnostic.BHI3100.severity = error
# Use .Order()/.OrderDescending() shorthand
dotnet_diagnostic.BHI3101.severity = warning
# Throw NotImplementedException from methods/props marked [FeatureNotImplemented]
dotnet_diagnostic.BHI3300.severity = error

## Design rules

# Do not declare static members on generic types
dotnet_diagnostic.CA1000.severity = error

## Globalization rules

# Specify IFormatProvider
Expand Down Expand Up @@ -136,8 +157,6 @@ dotnet_diagnostic.MA0015.severity = error
dotnet_diagnostic.MA0016.severity = silent
# Abstract types should not have public or internal constructors
dotnet_diagnostic.MA0017.severity = silent
# Do not declare static members on generic types
dotnet_diagnostic.MA0018.severity = error
# Use EventArgs.Empty
dotnet_diagnostic.MA0019.severity = error
# Use direct methods instead of LINQ methods
Expand Down Expand Up @@ -179,15 +198,15 @@ dotnet_diagnostic.MA0038.severity = silent
# Do not write your own certificate validation method
dotnet_diagnostic.MA0039.severity = error
# Flow the cancellation token
dotnet_diagnostic.MA0040.severity = silent
dotnet_diagnostic.MA0040.severity = error
# Make property static
dotnet_diagnostic.MA0041.severity = silent
# Do not use blocking calls in an async method
dotnet_diagnostic.MA0042.severity = error
# Use nameof operator in ArgumentException
dotnet_diagnostic.MA0043.severity = error
# Remove useless ToString call
dotnet_diagnostic.MA0044.severity = silent
dotnet_diagnostic.MA0044.severity = warning
# Do not use blocking call in a sync method (need to make containing method async)
dotnet_diagnostic.MA0045.severity = silent
# Use EventHandler<T> to declare events
Expand All @@ -213,13 +232,13 @@ dotnet_diagnostic.MA0055.severity = silent
# Do not call overridable members in constructor
dotnet_diagnostic.MA0056.severity = silent
# Class name should end with 'Attribute'
dotnet_diagnostic.MA0057.severity = silent
dotnet_diagnostic.MA0057.severity = error
# Class name should end with 'Exception'
dotnet_diagnostic.MA0058.severity = error
# Class name should end with 'EventArgs'
dotnet_diagnostic.MA0059.severity = silent
# The value returned by Stream.Read/Stream.ReadAsync is not used
dotnet_diagnostic.MA0060.severity = silent
dotnet_diagnostic.MA0060.severity = error
# Method overrides should not change parameter defaults
dotnet_diagnostic.MA0061.severity = silent
# Non-flags enums should not be marked with "FlagsAttribute"
Expand All @@ -239,7 +258,7 @@ dotnet_diagnostic.MA0068.severity = error
# Non-constant static fields should not be visible
dotnet_diagnostic.MA0069.severity = silent
# Obsolete attributes should include explanations
dotnet_diagnostic.MA0070.severity = silent
dotnet_diagnostic.MA0070.severity = warning
# Avoid using redundant else
dotnet_diagnostic.MA0071.severity = silent
# Do not throw from a finally block
Expand All @@ -255,7 +274,7 @@ dotnet_diagnostic.MA0076.severity = silent
# A class that provides Equals(T) should implement IEquatable<T>
dotnet_diagnostic.MA0077.severity = error
# Use 'Cast' instead of 'Select' to cast
dotnet_diagnostic.MA0078.severity = silent
dotnet_diagnostic.MA0078.severity = error
# Flow the cancellation token using .WithCancellation()
dotnet_diagnostic.MA0079.severity = error
# Use a cancellation token using .WithCancellation()
Expand All @@ -279,9 +298,9 @@ dotnet_diagnostic.MA0088.severity = error
# Optimize string method usage
dotnet_diagnostic.MA0089.severity = error
# Remove empty else/finally block
dotnet_diagnostic.MA0090.severity = silent
dotnet_diagnostic.MA0090.severity = warning
# Sender should be 'this' for instance events
dotnet_diagnostic.MA0091.severity = silent
dotnet_diagnostic.MA0091.severity = error
# Sender should be 'null' for static events
dotnet_diagnostic.MA0092.severity = error
# EventArgs should not be null
Expand All @@ -307,7 +326,7 @@ dotnet_diagnostic.MA0102.severity = silent
# Use SequenceEqual instead of equality operator
dotnet_diagnostic.MA0103.severity = error
# Do not create a type with a name from the BCL
dotnet_diagnostic.MA0104.severity = silent
dotnet_diagnostic.MA0104.severity = error
# Use the lambda parameters instead of using a closure
dotnet_diagnostic.MA0105.severity = error
# Avoid closure by using an overload with the 'factoryArgument' parameter
Expand All @@ -320,6 +339,28 @@ dotnet_diagnostic.MA0108.severity = error
dotnet_diagnostic.MA0109.severity = silent
# Use the Regex source generator
dotnet_diagnostic.MA0110.severity = error
# Use 'Count > 0' instead of 'Any()'
dotnet_diagnostic.MA0112.severity = silent
# Raw String contains an implicit end of line character (if you compile on Windows you may get CRLFs in string literals)
dotnet_diagnostic.MA0136.severity = warning
# Both if and else branch have identical code
dotnet_diagnostic.MA0140.severity = warning
# Use pattern matching instead of inequality operators for null check
dotnet_diagnostic.MA0141.severity = silent
# Use pattern matching instead of equality operators for null check
dotnet_diagnostic.MA0142.severity = silent
# Use pattern matching instead of equality operators for discrete value
dotnet_diagnostic.MA0148.severity = silent
# Use pattern matching instead of inequality operators for discrete value
dotnet_diagnostic.MA0149.severity = silent
# Do not use async void methods
dotnet_diagnostic.MA0155.severity = error
# Use 'Async' suffix when a method returns IAsyncEnumerable<T>
dotnet_diagnostic.MA0156.severity = error
# Do not use 'Async' suffix when a method does not return IAsyncEnumerable<T>
dotnet_diagnostic.MA0157.severity = error
# Use ContainsKey instead of TryGetValue
dotnet_diagnostic.MA0160.severity = warning

## Menees.Analyzers rules

Expand Down Expand Up @@ -347,6 +388,15 @@ dotnet_diagnostic.MEN013.severity = silent
dotnet_diagnostic.MEN014.severity = warning
# Use Preferred Terms
dotnet_diagnostic.MEN015.severity = silent
# Use object-oriented methods instead of top-level statements
dotnet_diagnostic.MEN016.severity = silent
# Use Digit Separators
dotnet_diagnostic.MEN018.severity = warning

## Microsoft.CodeAnalysis.BannedApiAnalyzers rules

# Do not use banned APIs
dotnet_diagnostic.RS0030.severity = error

## StyleCop spacing rules

Expand Down Expand Up @@ -438,7 +488,7 @@ dotnet_diagnostic.SA1134.severity = silent
# Enum values should be on separate lines
dotnet_diagnostic.SA1136.severity = silent
# Elements should have the same indentation
dotnet_diagnostic.SA1137.severity = error
dotnet_diagnostic.SA1137.severity = warning

## StyleCop ordering rules

Expand Down Expand Up @@ -518,7 +568,7 @@ dotnet_diagnostic.SA1503.severity = silent
# Opening braces should not be followed by blank line
dotnet_diagnostic.SA1505.severity = silent
# Element documentation headers should not be followed by blank line
dotnet_diagnostic.SA1506.severity = silent
dotnet_diagnostic.SA1506.severity = warning
# Code should not contain multiple blank lines in a row
dotnet_diagnostic.SA1507.severity = silent
# Closing braces should not be preceded by blank line
Expand All @@ -532,13 +582,13 @@ dotnet_diagnostic.SA1512.severity = silent
# Closing brace should be followed by blank line
dotnet_diagnostic.SA1513.severity = silent
# Element documentation header should be preceded by blank line
dotnet_diagnostic.SA1514.severity = silent
dotnet_diagnostic.SA1514.severity = warning
# Single-line comment should be preceded by blank line
dotnet_diagnostic.SA1515.severity = silent
# Elements should be separated by blank line
dotnet_diagnostic.SA1516.severity = silent
# Code should not contain blank lines at start of file
dotnet_diagnostic.SA1517.severity = silent
dotnet_diagnostic.SA1517.severity = warning
# Use line endings correctly at end of file
dotnet_diagnostic.SA1518.severity = silent
# Braces should not be omitted from multi-line child statement
Expand All @@ -555,11 +605,11 @@ dotnet_diagnostic.SA1610.severity = silent
# Element parameter documentation should match element parameters
dotnet_diagnostic.SA1612.severity = silent
# Element parameter documentation should have text
dotnet_diagnostic.SA1614.severity = silent
dotnet_diagnostic.SA1614.severity = warning
# Element return value documentation should have text
dotnet_diagnostic.SA1616.severity = silent
dotnet_diagnostic.SA1616.severity = warning
# Generic type parameter documentation should have text
dotnet_diagnostic.SA1622.severity = silent
dotnet_diagnostic.SA1622.severity = warning
# Property summary documentation should match accessors
dotnet_diagnostic.SA1623.severity = silent
# Element documentation should not be copied and pasted
Expand Down
3 changes: 1 addition & 2 deletions Assets/EmuHawkMono.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ libpath=""
if [ "$(command -v lsb_release)" ]; then
case "$(lsb_release -i | head -n1 | cut -c17- | tr A-Z a-z)" in
"arch"|"artix"|"manjarolinux") libpath="/usr/lib";;
"fedora"|"gentoo"|"opensuse") libpath="/usr/lib64";;
"fedora"|"gentoo"|"nobaralinux"|"opensuse") libpath="/usr/lib64";;
"nixos") libpath="/usr/lib"; printf "Running on NixOS? Why aren't you using the Nix expr?\n";;
"debian"|"linuxmint"|"pop"|"ubuntu") libpath="/usr/lib/x86_64-linux-gnu";;
esac
Expand All @@ -18,7 +18,6 @@ fi
export LD_LIBRARY_PATH="$PWD/dll:$PWD:$libpath"
export MONO_CRASH_NOFILE=1
export MONO_WINFORMS_XIM_STYLE=disabled # see https://bugzilla.xamarin.com/show_bug.cgi?id=28047#c9
export BIZHAWK_INT_SYSLIB_PATH="$libpath"
if [ "$1" = "--mono-no-redirect" ]; then
# printf "(passing --mono-no-redirect is no longer necessary)\n" #TODO uncomment later
shift
Expand Down
Loading

0 comments on commit 5487b83

Please sign in to comment.