Skip to content

Commit

Permalink
Merge pull request #80 from RGLgg/more-formats
Browse files Browse the repository at this point in the history
  • Loading branch information
l-Aad-l committed Dec 1, 2023
2 parents 859e5f6 + 3cdf7a3 commit cc27a7f
Show file tree
Hide file tree
Showing 13 changed files with 68 additions and 442 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Expand Up @@ -126,7 +126,7 @@ jobs:

- name: Compile RGL Suite Plugins against SM ${{ steps.setup-sp.outputs.version }}
run: |
for plugin in "rglqol" "rglupdater" "tf2Halftime" "improved_match_timer" "disabled/roundtimer_override" "disabled/passthestats"
for plugin in "rglqol" "rglupdater" "tf2Halftime" "improved_match_timer" "disabled/roundtimer_override"
do
echo -e "\nCompiling $plugin.sp..."
spcomp -E -w234 -O2 -v2 -i $SCRIPTS_PATH/include $plugin.sp
Expand Down Expand Up @@ -155,8 +155,7 @@ jobs:
run: |
mv tf2Halftime.smx disabled/
mv roundtimer_override.smx disabled/
mv passthestats.smx disabled/
mv passtimecontrol.smx disabled/
mv p4sstime.smx disabled/
working-directory: ${{ env.PLUGINS_PATH }}/

- name: Rebuild updatefile.txt
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/pr.yml
Expand Up @@ -51,7 +51,7 @@ jobs:

- name: Compile RGL Suite Plugins against SM ${{ steps.setup-sp.outputs.version }}
run: |
for plugin in "rglqol" "rglupdater" "improved_match_timer" "disabled/roundtimer_override" "disabled/passthestats"
for plugin in "rglqol" "rglupdater" "improved_match_timer" "disabled/roundtimer_override"
do
echo -e "\nCompiling $plugin.sp..."
spcomp -E -w234 -O2 -v2 -i $SCRIPTS_PATH/include $plugin.sp
Expand All @@ -67,8 +67,7 @@ jobs:
- name: Disable optional plugins
run: |
mv roundtimer_override.smx disabled/
mv passthestats.smx disabled/
mv passtimecontrol.smx disabled/
mv p4sstime.smx disabled/
working-directory: ${{ env.PLUGINS_PATH }}/

- name: Rebuild updatefile.txt
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/release.yml
Expand Up @@ -89,7 +89,7 @@ jobs:

- name: Compile RGL Suite Plugins against SM ${{ steps.setup-sp.outputs.version }}
run: |
for plugin in "rglqol" "rglupdater" "tf2Halftime" "improved_match_timer" "disabled/roundtimer_override" "disabled/passthestats"
for plugin in "rglqol" "rglupdater" "tf2Halftime" "improved_match_timer" "disabled/roundtimer_override"
do
echo -e "\nCompiling $plugin.sp..."
spcomp -E -w234 -O2 -v2 -i $SCRIPTS_PATH/include $plugin.sp
Expand Down Expand Up @@ -118,8 +118,7 @@ jobs:
run: |
mv tf2Halftime.smx disabled
mv roundtimer_override.smx disabled/
mv passthestats.smx disabled/
mv passtimecontrol.smx disabled/
mv p4sstime.smx disabled/
working-directory: ${{ env.PLUGINS_PATH }}/

- name: Rebuild updatefile.txt
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -13,4 +13,4 @@ README.txt

# ignore smx builds
*.smx
!passtimecontrol.smx
!p4sstime.smx
42 changes: 42 additions & 0 deletions addons/sourcemod/gamedata/passtime-fixes.txt
@@ -0,0 +1,42 @@
/**
* Copyright (C) 2022 Mikusch
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

"Games"
{
"tf"
{
"Offsets"
{
"CBaseProjectile::CanCollideWithTeammates"
{
"library" "server"
"linux" "230"
"windows" "229"
}
}
"Functions"
{
"CBaseProjectile::CanCollideWithTeammates"
{
"offset" "CBaseProjectile::CanCollideWithTeammates"
"hooktype" "entity"
"return" "bool"
"this" "entity"
}
}
}
}
Binary file added addons/sourcemod/plugins/p4sstime.smx
Binary file not shown.
Binary file removed addons/sourcemod/plugins/passtimecontrol.smx
Binary file not shown.
213 changes: 0 additions & 213 deletions addons/sourcemod/scripting/disabled/passthestats.sp

This file was deleted.

0 comments on commit cc27a7f

Please sign in to comment.