Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into refactor/core-move
Browse files Browse the repository at this point in the history
  • Loading branch information
warriorstar-orion committed Nov 23, 2024
2 parents fb699d9 + 3a5bfaa commit f82bdb9
Show file tree
Hide file tree
Showing 507 changed files with 11,073 additions and 6,306 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ _build_dependencies.sh @AffectedArc07
# Executables that need to be security-cleared
dreamchecker.exe @AffectedArc07
rustlibs.dll @AffectedArc07
rustlibs_prod.dll @AffectedArc07
rust_g.dll @AffectedArc07

### S34NW
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build_rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ jobs:
cp target/i686-unknown-linux-gnu/release/librustlibs.so ../tools/ci/librustlibs_ci.so
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs.dll
# Build the para-specific version
RUSTFLAGS='-C target-cpu=raptorlake' cargo build --release --target=i686-pc-windows-gnu
cp target/i686-pc-windows-gnu/release/rustlibs.dll ../rustlibs_prod.dll
git commit -a -m "Build Rust library" --allow-empty
git push origin
Expand Down
1 change: 1 addition & 0 deletions SQL/paradise_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,7 @@ CREATE TABLE `player` (
`server_region` VARCHAR(32) NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`muted_adminsounds_ckeys` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
`viewrange` VARCHAR(5) NOT NULL DEFAULT '19x15' COLLATE 'utf8mb4_general_ci',
`map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`),
KEY `lastseen` (`lastseen`),
Expand Down
6 changes: 6 additions & 0 deletions SQL/updates/60-61.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Updates the DB from 60 to 61 ~Qwertytoforty
# Makes a table for map picks

# Adds the table for it.
ALTER TABLE `player`
ADD COLUMN `map_vote_pref_json` MEDIUMTEXT NULL DEFAULT NULL AFTER `viewrange`;

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit f82bdb9

Please sign in to comment.